From 296b2f8973a57ac8968152b00ddf3555d9a47677 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sat, 26 Apr 2025 20:28:23 +0800 Subject: [PATCH] log-edit-insert-message-template: Reorder headers * lisp/vc/log-edit.el (log-edit-insert-message-template): Put Author before Summary when both are to be inserted. (cherry picked from commit 19b6c94566c6003cb7a056fce565ced2896acd4b) --- lisp/vc/log-edit.el | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/lisp/vc/log-edit.el b/lisp/vc/log-edit.el index 3c3288777c8..19cf1a5ae3d 100644 --- a/lisp/vc/log-edit.el +++ b/lisp/vc/log-edit.el @@ -914,12 +914,16 @@ different header separator appropriate for `log-edit-mode'." (interactive) (when (or (called-interactively-p 'interactive) (log-edit-empty-buffer-p)) - (dolist (header (append '("Summary") (and log-edit-setup-add-author - '("Author")))) - - (insert (log-edit--make-header-line header))) - (insert "\n") - (message-position-point))) + ;; Put Author first because then the user can immediately yank in a + ;; multiline log message, or use \\`C-c C-w' (probably because they + ;; know it will generate exactly one line), without thereby pushing + ;; Author out of the header and into the log message body. + ;; (Also note that `log-edit-set-header' inserts all other headers + ;; before Summary.) + (when log-edit-setup-add-author + (insert (log-edit--make-header-line "Author"))) + (insert (log-edit--make-header-line "Summary") "\n") + (end-of-line -1))) (defun log-edit-insert-cvs-template () "Insert the commit log template specified by the CVS administrator, if any. -- 2.39.5