[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
scratch/package-vc-fixes cf39a432f9 14/16: Track 'default-directory' whi
From: |
Philip Kaludercic |
Subject: |
scratch/package-vc-fixes cf39a432f9 14/16: Track 'default-directory' while updating source packages |
Date: |
Thu, 10 Nov 2022 14:44:05 -0500 (EST) |
branch: scratch/package-vc-fixes
commit cf39a432f9731e7a507a500996e1ada1629f6138
Author: Philip Kaludercic <philipk@posteo.net>
Commit: Philip Kaludercic <philipk@posteo.net>
Track 'default-directory' while updating source packages
* lisp/emacs-lisp/package-vc.el (package-vc-update): Add the source
directory to the identifier list, in case the remaining
'vc-do-command' arguments are all read-time constants.
---
lisp/emacs-lisp/package-vc.el | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index 93a96abb68..d2ee63da87 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -544,19 +544,22 @@ installed package."
;;
;; If there is a better way to do this, it should be done.
(letrec ((pkg-dir (package-desc-dir pkg-desc))
- (empty (make-symbol empty))
- (args (list empty empty empty))
+ (empty (make-symbol "empty"))
+ (args (list empty empty empty empty))
(vc-filter-command-function
(lambda (command file-or-list flags)
(setf (nth 0 args) command
(nth 1 args) file-or-list
- (nth 2 args) flags)
+ (nth 2 args) flags
+ (nth 3 args) default-directory)
(list command file-or-list flags)))
(post-upgrade
(lambda (command file-or-list flags)
(when (and (memq (nth 0 args) (list command empty))
(memq (nth 1 args) (list file-or-list empty))
- (memq (nth 2 args) (list flags empty)))
+ (memq (nth 2 args) (list flags empty))
+ (or (eq (nth 3 args) empty)
+ (file-equal-p (nth 3 args) default-directory)))
(with-demoted-errors "Failed to activate: %S"
(package-vc--unpack-1 pkg-desc pkg-dir))
(remove-hook 'vc-post-command-functions post-upgrade)))))
- scratch/package-vc-fixes 6ba14d437b 10/16: Expand 'package-vc--unpack-1' documentation, (continued)
- scratch/package-vc-fixes 6ba14d437b 10/16: Expand 'package-vc--unpack-1' documentation, Philip Kaludercic, 2022/11/10
- scratch/package-vc-fixes 12a7853844 11/16: Remove references to internal symbols from public docstrings, Philip Kaludercic, 2022/11/10
- scratch/package-vc-fixes 9e4ef24033 15/16: Explain what "refreshing" a source package means, Philip Kaludercic, 2022/11/10
- scratch/package-vc-fixes a2be7f006a 16/16: Fix type error in package-vc prompt function, Philip Kaludercic, 2022/11/10
- scratch/package-vc-fixes cb6415a45a 01/16: ; Fix interactive spec for 'package-vc-refresh', Philip Kaludercic, 2022/11/10
- scratch/package-vc-fixes 61048ae3fa 02/16: Handle strings as keys in 'package-vc-ensure-packages', Philip Kaludercic, 2022/11/10
- scratch/package-vc-fixes fe4b9fbbd3 03/16: Rename '-ensure-packages' to -install-selected-packages', Philip Kaludercic, 2022/11/10
- scratch/package-vc-fixes ed0caa9032 04/16: Mark 'package-vc-install-selected-packages' as interactive, Philip Kaludercic, 2022/11/10
- scratch/package-vc-fixes 8956d833b3 12/16: Fix generation of documentation for source packages, Philip Kaludercic, 2022/11/10
- scratch/package-vc-fixes 1eeca3607e 13/16: Allow specifying a :lisp-dir for package descriptions, Philip Kaludercic, 2022/11/10
- scratch/package-vc-fixes cf39a432f9 14/16: Track 'default-directory' while updating source packages,
Philip Kaludercic <=