daniel/emacs
1
2
Fork 0
Code Issues 7 Pull Requests Projects Releases Wiki Activity

update packages

Browse Source
This commit is contained in:
Daniel Weschke
2025-06-22 17:08:08 +02:00
parent 54e5633369
commit 16a0a6db93
558 changed files with 68349 additions and 26568 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lisp/magit/magit-stash.el
View File

@@ -173,14 +173,15 @@ while two prefix arguments are equivalent to `--all'."
The message that Git would have picked, is available as the
default (used when the user enters the empty string) and as
the next history element (which can be accessed with \
\\<minibuffer-local-map>\\[next-history-element])."
(read-string (format "Stash message (default: On%s:%s): "
(magit--ellipsis) (magit--ellipsis))
nil nil
(format "On %s: %s"
(or (magit-get-current-branch) "(no branch)")
(magit-rev-format "%h %s"))))
the first future history element. The second future history
element is just \"On BRANCH: \". Future history elements can
be accessed using \\<minibuffer-local-map>\\[next-history-element])."
(let ((branch (or (magit-get-current-branch) "(no branch)"))
(ellipsis (magit--ellipsis)))
(read-string (format "Stash message (default: On%s:%s): " ellipsis ellipsis)
nil nil
(list (format "On %s: %s" branch (magit-rev-format "%h %s"))
(format "On %s: " branch)))))
(defun magit-stash-read-message-traditional ()
"Read a message from the minibuffer, to be used for a stash.
@@ -330,7 +331,7 @@ want to fall back to using \"--3way\", without being prompted."
(concat
"Could not apply stash because of unstaged changes.\n\n"
"To do a tree-way merge, these files have to be staged\n"
(mapconcat (lambda (f) (format " %s" f)) conflicts "\n")
(mapconcat (##format " %s" %) conflicts "\n")
"\n")
nil
(?s (format
@@ -527,16 +528,12 @@ instead of \"Stashes:\"."
(magit-insert-section (stash autostash)
(insert (propertize "AUTOSTASH" 'font-lock-face 'magit-hash))
(insert " " msg "\n")
(save-excursion
(backward-char)
(magit-log-format-margin autostash author date)))))
(magit-log-format-margin autostash author date))))
(if verified
(magit-git-wash (apply-partially #'magit-log-wash-log 'stash)
"reflog" "--format=%gd%x00%aN%x00%at%x00%gs" ref)
(insert ?\n)
(save-excursion
(backward-char)
(magit-make-margin-overlay)))))))
(magit-make-margin-overlay))))))
;;; List Stashes
@@ -572,7 +569,8 @@ instead of \"Stashes:\"."
(defun magit-stashes-maybe-update-stash-buffer (&optional _)
"When moving in the stashes buffer, update the stash buffer.
If there is no stash buffer in the same frame, then do nothing."
If there is no stash buffer in the same frame, then do nothing.
See also info node `(magit)Section Movement'."
(when (derived-mode-p 'magit-stashes-mode)
(magit--maybe-update-stash-buffer)))