emacs/lisp/vc, branch scratch/tty-child-frames Emacs is the extensible, customizable, self-documenting real-time display editor. ; Insert "Stealing lock" at the beginning of a message 2024-11-08T16:29:41+00:00 Philip Kaludercic 2024-10-26T07:39:00+00:00 551d1a2cd73bb3df2cad0f1f5b5d1628bb138483 * lisp/vc/vc.el (vc-steal-lock): Use 'mail-text' instead of jumping to 'point-max', to avoid inserting the message after signatures. (Bug#74027) 
* lisp/vc/vc.el (vc-steal-lock): Use 'mail-text' instead of
jumping to 'point-max', to avoid inserting the message after
signatures.  (Bug#74027)
; * lisp/vc/smerge-mode.el: Fix typo in comment. 2024-10-31T15:28:44+00:00 Robert Pluim 2024-10-31T15:26:17+00:00 9fe7b8ca418002c6b253a8cb154edb1da24a8643 






; Revise improvements to vc-git-stash-read
2024-10-30T01:34:12+00:00

Sean Whitton

2024-10-30T01:34:12+00:00

679c0c7b940687a63937a361d0439c68b7bf4d51

* lisp/vc/vc-git.el (vc-git-stash-read): Use a keyword argument.
Abbreviate the prompt reference to the most recent stash.
(vc-git-stash-pop): Update call to vc-git-stash-read.





* lisp/vc/vc-git.el (vc-git-stash-read): Use a keyword argument.
Abbreviate the prompt reference to the most recent stash.
(vc-git-stash-pop): Update call to vc-git-stash-read.







; * lisp/vc/vc-git.el (vc-git-stash-read): Use string-empty-p.
2024-10-29T12:55:03+00:00

Sean Whitton

2024-10-29T12:54:59+00:00

6a2e49e53f1072bf1b41e113531627024d8b9845












; * lisp/vc/vc-git.el (vc-deduce-fileset): Declare.
2024-10-29T12:32:21+00:00

Sean Whitton

2024-10-29T12:32:14+00:00

4024c5db892b910ee66167479596131c8d64841f












Improve prompting for git stashes
2024-10-29T12:06:48+00:00

Sean Whitton

2024-10-29T11:55:08+00:00

90ffe8a36b16801eaf0ca9b0ffca07156cf3c26d

* lisp/vc/vc-git.el (vc-git-stash-read): New DEFAULT-MOST-RECENT
optional argument.  Use format-prompt.  Signal user-error
immediately if there are no stashes.  Rewrite docstring.
(vc-git-stash-show, vc-git-stash-apply, vc-git-stash-pop)
(vc-git-stash-delete): Drop trailing ": " from prompts.
(vc-git-stash-pop): Pass non-nil DEFAULT-MOST-RECENT to
vc-git-stash-read.





* lisp/vc/vc-git.el (vc-git-stash-read): New DEFAULT-MOST-RECENT
optional argument.  Use format-prompt.  Signal user-error
immediately if there are no stashes.  Rewrite docstring.
(vc-git-stash-show, vc-git-stash-apply, vc-git-stash-pop)
(vc-git-stash-delete): Drop trailing ": " from prompts.
(vc-git-stash-pop): Pass non-nil DEFAULT-MOST-RECENT to
vc-git-stash-read.







VC Git: Use vc-deduce-fileset to determine what to stash
2024-10-29T12:06:48+00:00

Sean Whitton

2024-10-29T11:25:31+00:00

4a49c50a4c351503a94c223da05888e5fd3d4fa1

* lisp/vc/vc-git.el (vc-git--deduce-files-for-stash): New function.
(vc-git-stash, vc-git-stash-snapshot): Use it to determine what
to stash.  Update and expand docstrings.
(vc-git-stash-snapshot): No longer unconditionally snapshot all
uncommitted changes across the whole working tree.





* lisp/vc/vc-git.el (vc-git--deduce-files-for-stash): New function.
(vc-git-stash, vc-git-stash-snapshot): Use it to determine what
to stash.  Update and expand docstrings.
(vc-git-stash-snapshot): No longer unconditionally snapshot all
uncommitted changes across the whole working tree.







; * lisp/vc/log-edit.el (log-edit-diff-function): Tweak formatting.
2024-10-29T04:58:08+00:00

Sean Whitton

2024-10-29T04:57:58+00:00

15b9d99cef63f6743e49d350136157bd42d362e9












* lisp/vc/log-edit.el (log-edit-diff-function): Document.
2024-10-29T04:56:06+00:00

Sean Whitton

2024-10-29T04:52:20+00:00

c7a1fafa992b217014430fb30fd09c8e037227e0












Fix window selection after log-edit-show-diff
2024-10-29T01:40:39+00:00

Sean Whitton

2024-10-29T01:40:02+00:00

40cf6f9009209b8c3363d057882611cd5d56f853

* lisp/vc/vc.el (vc-diff-patch-string): Use display-buffer, not
pop-to-buffer, for consistency with log-edit-diff-fileset.
(vc-modify-change-comment): Use save-selected-window around
vc-diff-internal to avoid leaving the *vc-diff* window selected,
for consistency with log-edit-diff-fileset.





* lisp/vc/vc.el (vc-diff-patch-string): Use display-buffer, not
pop-to-buffer, for consistency with log-edit-diff-fileset.
(vc-modify-change-comment): Use save-selected-window around
vc-diff-internal to avoid leaving the *vc-diff* window selected,
for consistency with log-edit-diff-fileset.