aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2010-03-23 20:30:53 -0700
committerGlenn Morris2010-03-23 20:30:53 -0700
commit549f324afb7503a6fbbd441a065db71f25499c17 (patch)
tree5fbcca6228a143cb34cf36ee63cac22cc35983f9
parent495b517c6f0f9e7da4ada2efce2ddcd4a386b94a (diff)
downloademacs-549f324afb7503a6fbbd441a065db71f25499c17.tar.gz
emacs-549f324afb7503a6fbbd441a065db71f25499c17.zip
* vc-dispatcher.el (vc-start-logentry): Doc fix.
(log-view-process-buffer, log-edit-extra-flags): Declare.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/vc-dispatcher.el8
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b09b479b76d..b1b73612b3c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12010-03-24 Glenn Morris <rgm@gnu.org> 12010-03-24 Glenn Morris <rgm@gnu.org>
2 2
3 * vc-dispatcher.el (vc-start-logentry): Doc fix.
4 (log-view-process-buffer, log-edit-extra-flags): Declare.
5
3 * log-edit.el (log-edit-before-checkin-process): Doc fix. 6 * log-edit.el (log-edit-before-checkin-process): Doc fix.
4 7
5 * cedet/semantic/bovine/c.el (semantic-c-describe-environment): 8 * cedet/semantic/bovine/c.el (semantic-c-describe-environment):
diff --git a/lisp/vc-dispatcher.el b/lisp/vc-dispatcher.el
index 721bbb38fe5..80a0f5dddcd 100644
--- a/lisp/vc-dispatcher.el
+++ b/lisp/vc-dispatcher.el
@@ -539,8 +539,9 @@ contents of the log entry buffer. If COMMENT is a string and
539INITIAL-CONTENTS is nil, do action immediately as if the user had 539INITIAL-CONTENTS is nil, do action immediately as if the user had
540entered COMMENT. If COMMENT is t, also do action immediately with an 540entered COMMENT. If COMMENT is t, also do action immediately with an
541empty comment. Remember the file's buffer in `vc-parent-buffer' 541empty comment. Remember the file's buffer in `vc-parent-buffer'
542\(current one if no file). AFTER-HOOK specifies the local value 542\(current one if no file). Puts the log-entry buffer in major-mode
543for `vc-log-after-operation-hook'." 543MODE, defaulting to `log-edit-mode' if MODE is nil.
544AFTER-HOOK specifies the local value for `vc-log-after-operation-hook'."
544 (let ((parent 545 (let ((parent
545 (if (vc-dispatcher-browsing) 546 (if (vc-dispatcher-browsing)
546 ;; If we are called from a directory browser, the parent buffer is 547 ;; If we are called from a directory browser, the parent buffer is
@@ -569,6 +570,9 @@ for `vc-log-after-operation-hook'."
569 (vc-finish-logentry (eq comment t))))) 570 (vc-finish-logentry (eq comment t)))))
570 571
571(declare-function vc-dir-move-to-goal-column "vc-dir" ()) 572(declare-function vc-dir-move-to-goal-column "vc-dir" ())
573;; vc-finish-logentry is called from a log-edit buffer (see above).
574(declare-function log-view-process-buffer "log-edit" ())
575(defvar log-edit-extra-flags)
572 576
573(defun vc-finish-logentry (&optional nocomment) 577(defun vc-finish-logentry (&optional nocomment)
574 "Complete the operation implied by the current log entry. 578 "Complete the operation implied by the current log entry.