diff options
| author | Glenn Morris | 2010-03-23 20:34:06 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-03-23 20:34:06 -0700 |
| commit | ebbe23ddbb3a2516a6c9d325f9c8f74bafb237c4 (patch) | |
| tree | 29a006e2bf4033f7d2693d484b8672150a2cc3e6 | |
| parent | 549f324afb7503a6fbbd441a065db71f25499c17 (diff) | |
| download | emacs-ebbe23ddbb3a2516a6c9d325f9c8f74bafb237c4.tar.gz emacs-ebbe23ddbb3a2516a6c9d325f9c8f74bafb237c4.zip | |
* vc-bzr.el, vc-hg.el (log-edit-mode): Declare.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/vc-bzr.el | 1 | ||||
| -rw-r--r-- | lisp/vc-hg.el | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b1b73612b3c..12de6f8876d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2010-03-24 Glenn Morris <rgm@gnu.org> | 1 | 2010-03-24 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * vc-bzr.el, vc-hg.el (log-edit-mode): Declare. | ||
| 4 | |||
| 3 | * vc-dispatcher.el (vc-start-logentry): Doc fix. | 5 | * vc-dispatcher.el (vc-start-logentry): Doc fix. |
| 4 | (log-view-process-buffer, log-edit-extra-flags): Declare. | 6 | (log-view-process-buffer, log-edit-extra-flags): Declare. |
| 5 | 7 | ||
diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el index 9e13ca6320d..046046055d5 100644 --- a/lisp/vc-bzr.el +++ b/lisp/vc-bzr.el | |||
| @@ -545,6 +545,7 @@ REV non-nil gets an error." | |||
| 545 | (goto-char (point-min))) | 545 | (goto-char (point-min))) |
| 546 | found))) | 546 | found))) |
| 547 | 547 | ||
| 548 | (declare-function log-edit-mode "log-edit" ()) | ||
| 548 | (defvar log-edit-extra-flags) | 549 | (defvar log-edit-extra-flags) |
| 549 | (defvar log-edit-before-checkin-process) | 550 | (defvar log-edit-before-checkin-process) |
| 550 | 551 | ||
diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el index 85d48ba0bcc..f28d6e75110 100644 --- a/lisp/vc-hg.el +++ b/lisp/vc-hg.el | |||
| @@ -279,6 +279,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." | |||
| 279 | ("^date: \\(.+\\)" (1 'change-log-date)) | 279 | ("^date: \\(.+\\)" (1 'change-log-date)) |
| 280 | ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message))))))) | 280 | ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message))))))) |
| 281 | 281 | ||
| 282 | (declare-function log-edit-mode "log-edit" ()) | ||
| 282 | (defvar log-edit-extra-flags) | 283 | (defvar log-edit-extra-flags) |
| 283 | (defvar log-edit-before-checkin-process) | 284 | (defvar log-edit-before-checkin-process) |
| 284 | 285 | ||
| @@ -286,7 +287,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." | |||
| 286 | "Mode for editing Hg commit logs. | 287 | "Mode for editing Hg commit logs. |
| 287 | If a line like: | 288 | If a line like: |
| 288 | Author: NAME | 289 | Author: NAME |
| 289 | is present in the log, it is removed, and | 290 | is present in the log, it is removed, and |
| 290 | --author NAME | 291 | --author NAME |
| 291 | is passed to the hg commit command." | 292 | is passed to the hg commit command." |
| 292 | (set (make-local-variable 'log-edit-extra-flags) nil) | 293 | (set (make-local-variable 'log-edit-extra-flags) nil) |