update packages

lisp/magit/magit-extras.el

@@ -1,9 +1,9 @@
 ;;; magit-extras.el --- Additional functionality for Magit  -*- lexical-binding:t -*-
 
-;; Copyright (C) 2008-2023 The Magit Project Contributors
+;; Copyright (C) 2008-2025 The Magit Project Contributors
 
-;; Author: Jonas Bernoulli <jonas@bernoul.li>
-;; Maintainer: Jonas Bernoulli <jonas@bernoul.li>
+;; Author: Jonas Bernoulli <emacs.magit@jonas.bernoulli.dev>
+;; Maintainer: Jonas Bernoulli <emacs.magit@jonas.bernoulli.dev>
 
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -64,7 +64,7 @@ alternative commands."
   ["Actions"
    (" m" "Invoke mergetool" magit-git-mergetool)]
   (interactive
-   (if (and (not (eq transient-current-prefix 'magit-git-mergetool))
+   (if (and (not (eq transient-current-command 'magit-git-mergetool))
             current-prefix-arg)
        (list nil nil t)
      (list (magit-read-unmerged-file "Resolve")
@@ -197,27 +197,13 @@ blame to center around the line point is on."
 (defun ido-enter-magit-status ()
   "Drop into `magit-status' from file switching.
 
-This command does not work in Emacs 26.1.
-See https://github.com/magit/magit/issues/3634
-and https://debbugs.gnu.org/cgi/bugreport.cgi?bug=31707.
-
 To make this command available use something like:
 
-  (add-hook \\='ido-setup-hook
-            (lambda ()
-              (keymap-set ido-completion-map
-                          \"C-x g\" \\='ido-enter-magit-status)))
-
-Starting with Emacs 25.1 the Ido keymaps are defined just once
-instead of every time Ido is invoked, so now you can modify it
-like pretty much every other keymap:
-
   (keymap-set ido-common-completion-map
               \"C-x g\" \\='ido-enter-magit-status)"
   (interactive)
   (setq ido-exit 'fallback)
-  (setq ido-fallback #'magit-status)                ; for Emacs >= 26.2
-  (with-no-warnings (setq fallback #'magit-status)) ; for Emacs 25
+  (setq ido-fallback #'magit-status)
   (exit-minibuffer))
 
 ;;;###autoload
@@ -235,10 +221,10 @@ well.  If you want to use another key, then you must set this
 to nil before loading Magit to prevent \"m\" from being bound.")
 
 (with-eval-after-load 'project
-  ;; Only more recent versions of project.el have `project-prefix-map' and
-  ;; `project-switch-commands', though project.el is available in Emacs 25.
   (when (and magit-bind-magit-project-status
+             ;; Added in Emacs 28.1.
              (boundp 'project-prefix-map)
+             (boundp 'project-switch-commands)
              ;; Only modify if it hasn't already been modified.
              (equal project-switch-commands
                     (eval (car (get 'project-switch-commands 'standard-value))
@@ -287,10 +273,7 @@ for a repository."
   (interactive (list (or (magit-toplevel)
                          (magit-read-repository t))
                      current-prefix-arg))
-  ;; 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"))))
+  (let ((files (dired-get-marked-files nil arg nil nil t)))
     (magit-status-setup-buffer repo)
     (magit-am-apply-patches files)))
 
@@ -392,32 +375,28 @@ in HEAD as well as staged changes in the diff to check."
   (require 'diff-mode) ; `diff-add-log-current-defuns'.
   (require 'vc-git)    ; `vc-git-diff'.
   (require 'add-log)   ; `change-log-insert-entries'.
-  (cond
-   ((and (fboundp 'change-log-insert-entries)
-         (fboundp 'diff-add-log-current-defuns))
-    (setq default-directory
-          (if (and (file-regular-p "gitdir")
-                   (not (magit-git-true "rev-parse" "--is-inside-work-tree"))
-                   (magit-git-true "rev-parse" "--is-inside-git-dir"))
-              (file-name-directory (magit-file-line "gitdir"))
-            (magit-toplevel)))
-    (let ((rev1 (if amending "HEAD^1" "HEAD"))
-          (rev2 nil))
-      ;; Magit may have updated the files without notifying vc, but
-      ;; `diff-add-log-current-defuns' relies on vc being up-to-date.
-      (mapc #'vc-file-clearprops (magit-staged-files))
-      (change-log-insert-entries
-       (with-temp-buffer
-         (vc-git-command (current-buffer) 1 nil
-                         "diff-index" "--exit-code" "--patch"
-                         (and (magit-anything-staged-p) "--cached")
-                         rev1 "--")
-         ;; `diff-find-source-location' consults these vars.
-         (defvar diff-vc-revisions)
-         (setq-local diff-vc-revisions (list rev1 rev2))
-         (setq-local diff-vc-backend 'Git)
-         (diff-add-log-current-defuns)))))
-   (t (user-error "`magit-generate-changelog' requires Emacs 27 or greater"))))
+  (setq default-directory
+        (if (and (file-regular-p "gitdir")
+                 (not (magit-git-true "rev-parse" "--is-inside-work-tree"))
+                 (magit-git-true "rev-parse" "--is-inside-git-dir"))
+            (file-name-directory (magit-file-line "gitdir"))
+          (magit-toplevel)))
+  (let ((rev1 (if amending "HEAD^1" "HEAD"))
+        (rev2 nil))
+    ;; Magit may have updated the files without notifying vc, but
+    ;; `diff-add-log-current-defuns' relies on vc being up-to-date.
+    (mapc #'vc-file-clearprops (magit-staged-files))
+    (change-log-insert-entries
+     (with-temp-buffer
+       (vc-git-command (current-buffer) 1 nil
+                       "diff-index" "--exit-code" "--patch"
+                       (and (magit-anything-staged-p) "--cached")
+                       rev1 "--")
+       ;; `diff-find-source-location' consults these vars.
+       (defvar diff-vc-revisions)
+       (setq-local diff-vc-revisions (list rev1 rev2))
+       (setq-local diff-vc-backend 'Git)
+       (diff-add-log-current-defuns)))))
 
 ;;;###autoload
 (defun magit-add-change-log-entry (&optional whoami file-name other-window)
@@ -550,7 +529,8 @@ list returned by `magit-rebase-arguments'."
      ((not rev)
       (when (and (magit-ref-p backup)
                  (not (magit-y-or-n-p
-                       (format "Backup ref %s already exists.  Override? " backup))))
+                       (format "Backup ref %s already exists.  Override? "
+                               backup))))
         (user-error "Abort"))
       (magit-log-select
         (lambda (rev)
@@ -744,8 +724,6 @@ the minibuffer too."
               (delete-char -1)))))
     (user-error "Revision stack is empty")))
 
-(keymap-set git-commit-mode-map "C-c C-w" #'magit-pop-revision-stack)
-
 ;;;###autoload
 (defun magit-copy-section-value (arg)
   "Save the value of the current section for later use.
@@ -914,6 +892,20 @@ patch application, a cherry-pick, a revert, or a bisect."
         ((magit-sequencer-in-progress-p) (magit-sequencer-abort))
         ((magit-bisect-in-progress-p)    (magit-bisect-reset))))
 
+;;;###autoload
+(defun magit-back-to-indentation ()
+  "Move point to the first non-whitespace character on this line.
+In Magit diffs, also skip over - and + at the beginning of the line."
+  (interactive "^")
+  (beginning-of-line 1)
+  (when (and (magit-section-match 'hunk)
+             (looking-at (if (oref (magit-current-section) combined)
+                             "^ ?[-+]+"
+                           "^[-+]")))
+    (goto-char (match-end 0)))
+  (skip-syntax-forward " " (line-end-position))
+  (backward-prefix-chars))
+
 ;;; _
 (provide 'magit-extras)
 ;;; magit-extras.el ends here