summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorStefan Kangas <stefankangas@gmail.com>2022-12-15 21:13:16 +0100
committerStefan Kangas <stefankangas@gmail.com>2022-12-15 21:13:16 +0100
commit0d60579b6b6f2648a881572783322b1bcf931a73 (patch)
tree4886f89b34a7acfacdca36efb30e44ed6c4343db /lisp/emacs-lisp
parente17c1b01d8c096493f00f5b65ac2562cc348feb1 (diff)
parent99aa00e6e34b65169dd8328cb76cce648ba97e9d (diff)
downloademacs-0d60579b6b6f2648a881572783322b1bcf931a73.tar.gz
emacs-0d60579b6b6f2648a881572783322b1bcf931a73.tar.bz2
emacs-0d60579b6b6f2648a881572783322b1bcf931a73.zip
Merge from origin/emacs-29
99aa00e6e34 Revert 21b387c39bd with last-minute hasty changes (bug#60... 386d6e74d83 Replace an erroneous eq with an equal in cc-defs.el eb069470631 * lisp/tab-bar.el ([tab-bar]): Use 'make-sparse-keymap' i... 26243f7b65e compile.el: Fix regression with nb of errors in modeline 6e2923d80f8 Make tab-bar-tab-group-format-function backwards-compatib... b211a63455c Make tab-bar-tab-group-format-function also handle curren... 367022f316e Ensure package directories for source packages from check... 3a633bdd6df ; * etc/NEWS: Fix recent changes. 6aa5d16c643 * test/README (SELECTOR): Add eglot-tests.el to remote fi... bb27be36ddf Fix bug#60060 in Tramp d4c2aa4f913 ; * lisp/net/tramp-crypt.el: Fix comment. 8404253d17a * .gitignore: Ignore GDB history files. 12684c3a199 Mention 'tree-sitter' in user manual and NEWS 49d7e0cec6a ; * etc/NEWS: Rearrange entries for tree-sitter supported... 0ad2112a2f0 ; Announce 'toml-ts-mode' in NEWS. # Conflicts: # etc/NEWS
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/package-vc.el1
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index db54e0e130e..8f0eedd2f88 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -783,6 +783,7 @@ name from the base name of DIR."
(package-vc--unpack-1
(package-desc-create
:name (intern name)
+ :dir pkg-dir
:kind 'vc)
(file-name-as-directory pkg-dir))))