summaryrefslogtreecommitdiff
path: root/CONTRIBUTE
diff options
context:
space:
mode:
authorNoam Postavsky <npostavs@gmail.com>2019-07-04 20:32:39 -0400
committerNoam Postavsky <npostavs@gmail.com>2019-08-03 20:14:52 -0400
commit01661f33c11654d1fe5fe1013332db2500b7f449 (patch)
treed46bd831f134d495373c8eb389c11f95d7c6028a /CONTRIBUTE
parent2d47483e815979d0ae0edd6f878b7fbb85fd72fa (diff)
downloademacs-01661f33c11654d1fe5fe1013332db2500b7f449.tar.gz
Improved ChangeLog generation for vc log (Bug#16301)
* lisp/vc/diff-mode.el (diff-find-source-location): Fix docstring. * lisp/vc/add-log.el (change-log-unindented-file-names-re) (change-log-read-entries, change-log-read-defuns) (change-log-insert-entries): * lisp/vc/diff-mode.el (diff-add-log-current-defuns): * lisp/vc/log-edit.el (log-edit--insert-filled-defuns) (log-edit-fill-entry): New functions. (log-edit-mode): Set `log-edit-fill-entry' as `fill-paragraph-function'. (log-edit-generate-changelog-from-diff): New command. (log-edit-mode-map): Bind it to C-c C-w. * doc/emacs/maintaining.texi (Types of Log File, Log Buffer): * CONTRIBUTE: Document it. * etc/NEWS: Announce it. * test/lisp/vc/log-edit-tests.el (log-edit-fill-entry) (log-edit-fill-entry-joining): New tests.
Diffstat (limited to 'CONTRIBUTE')
-rw-r--r--CONTRIBUTE20
1 files changed, 12 insertions, 8 deletions
diff --git a/CONTRIBUTE b/CONTRIBUTE
index f257fc57f0f..f480ffec9b0 100644
--- a/CONTRIBUTE
+++ b/CONTRIBUTE
@@ -263,18 +263,22 @@ them right the first time, so here are guidelines for formatting them:
** Generating ChangeLog entries
-- You can use Emacs functions to write ChangeLog entries; see
+- If you use Emacs VC, you can use 'C-c C-w' to generate formatted
+ blank ChangeLog entries from the diff being committed, then use
+ 'M-q' to combine and fill them. See 'info "(emacs) Log Buffer"'.
+
+- Alternatively, you can use Emacs functions for ChangeLog files; see
https://www.gnu.org/software/emacs/manual/html_node/emacs/Change-Log-Commands.html
or run 'info "(emacs)Change Log Commands"'.
-- If you use Emacs VC, one way to format ChangeLog entries is to create
- a top-level ChangeLog file manually, and update it with 'C-x 4 a' as
- usual. Do not register the ChangeLog file under git; instead, use
- 'C-c C-a' to insert its contents into your *vc-log* buffer.
- Or if 'log-edit-hook' includes 'log-edit-insert-changelog' (which it
- does by default), they will be filled in for you automatically.
+ To format ChangeLog entries with Emacs VC, create a top-level
+ ChangeLog file manually, and update it with 'C-x 4 a' as usual. Do
+ not register the ChangeLog file under git; instead, use 'C-c C-a' to
+ insert its contents into your *vc-log* buffer. Or if
+ 'log-edit-hook' includes 'log-edit-insert-changelog' (which it does
+ by default), they will be filled in for you automatically.
-- Alternatively, you can use the vc-dwim command to maintain commit
+- Instead of Emacs VC, you can use the vc-dwim command to maintain commit
messages. When you create a source directory, run the shell command
'git-changelog-symlink-init' to create a symbolic link from
ChangeLog to .git/c/ChangeLog. Edit this ChangeLog via its symlink