aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schwab2014-02-09 00:01:45 +0100
committerAndreas Schwab2014-02-09 00:01:45 +0100
commitc1b5900bc06f22bd6e8c94c72ca735402b225c04 (patch)
tree60a5a57174ca83e834a87f7a78882481c905c28f
parent429b93bd7bc5d2145afdc686416ccc7c817e5a33 (diff)
downloademacs-c1b5900bc06f22bd6e8c94c72ca735402b225c04.tar.gz
emacs-c1b5900bc06f22bd6e8c94c72ca735402b225c04.zip
Fixes: debbugs:16690
* vc/log-edit.el (log-edit-comment-to-change-log): Doc fix.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/vc/log-edit.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b17f6abfe0a..22e541fce3f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12014-02-08 Andreas Schwab <schwab@linux-m68k.org>
2
3 * vc/log-edit.el (log-edit-comment-to-change-log): Doc fix.
4 (Bug#16690)
5
12014-02-08 Michael Albinus <michael.albinus@gmx.de> 62014-02-08 Michael Albinus <michael.albinus@gmx.de>
2 7
3 * net/tramp-sh.el (tramp-sh-handle-start-file-process): 8 * net/tramp-sh.el (tramp-sh-handle-start-file-process):
diff --git a/lisp/vc/log-edit.el b/lisp/vc/log-edit.el
index e1ce247ac41..e6bd897f4ac 100644
--- a/lisp/vc/log-edit.el
+++ b/lisp/vc/log-edit.el
@@ -271,7 +271,7 @@ WHOAMI (interactive prefix) non-nil means prompt for user name
271and site. FILE-NAME is the name of the change log; if nil, use 271and site. FILE-NAME is the name of the change log; if nil, use
272`change-log-default-name'. 272`change-log-default-name'.
273 273
274This may be useful as a `log-edit-checkin-hook' to update change logs 274This may be useful as a `vc-checkin-hook' to update change logs
275automatically." 275automatically."
276 (interactive (if current-prefix-arg 276 (interactive (if current-prefix-arg
277 (list current-prefix-arg 277 (list current-prefix-arg