emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/git-commit 679ded808d: Revert "Use compat-dired-marked-fil


From: ELPA Syncer
Subject: [nongnu] elpa/git-commit 679ded808d: Revert "Use compat-dired-marked-files"
Date: Tue, 31 Jan 2023 08:37:35 -0500 (EST)

branch: elpa/git-commit
commit 679ded808d78358a6adccd9d6d78ebf173ee1c47
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>

    Revert "Use compat-dired-marked-files"
    
    This reverts commit 5f23a34a5f3c7eb12f15d05778aa5a152404c960.
---
 lisp/magit-extras.el | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lisp/magit-extras.el b/lisp/magit-extras.el
index b34cdab5cf..9d8ea836f7 100644
--- a/lisp/magit-extras.el
+++ b/lisp/magit-extras.el
@@ -263,9 +263,9 @@ is no file at point, then instead visit 
`default-directory'."
   (interactive "P")
   (if-let ((topdir (magit-toplevel default-directory)))
       (let ((args (car (magit-log-arguments)))
-            (files (compat-call dired-get-marked-files
-                                nil nil #'magit-file-tracked-p nil
-                                "No marked file is being tracked by Git")))
+            (files (dired-get-marked-files nil nil #'magit-file-tracked-p)))
+        (unless files
+          (user-error "No marked file is being tracked by Git"))
         (when (and follow
                    (not (member "--follow" args))
                    (not (cdr files)))
@@ -286,7 +286,10 @@ for a repository."
   (interactive (list (or (magit-toplevel)
                          (magit-read-repository t))
                      current-prefix-arg))
-  (let ((files (compat-call dired-get-marked-files nil arg nil nil t)))
+  ;; Note: The ERROR argument of `dired-get-marked-files' isn't
+  ;; available until Emacs 27.
+  (let ((files (or (dired-get-marked-files nil arg)
+                   (user-error "No files specified"))))
     (magit-status-setup-buffer repo)
     (magit-am-apply-patches files)))
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]