aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2013-04-20 17:37:54 -0700
committerGlenn Morris2013-04-20 17:37:54 -0700
commit1b42ee4390648fa29ecc1243be6dbee4414d3d69 (patch)
tree42a49234c73d9c12f3d2e9b68183d82a1e84ffb5
parenta6d63d97cd7f213a87630ab86119b469a89caeeb (diff)
downloademacs-1b42ee4390648fa29ecc1243be6dbee4414d3d69.tar.gz
emacs-1b42ee4390648fa29ecc1243be6dbee4414d3d69.zip
vc.el doc fixes
* lisp/vc/vc.el (vc-print-log-setup-buttons, vc-print-log-internal): Add doc strings. (vc-print-log): Clarify interactive prompt.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/vc/vc.el18
2 files changed, 23 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 07a5bb9231d..c791affe2f2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12013-04-21 Glenn Morris <rgm@gnu.org>
2
3 * vc/vc.el (vc-print-log-setup-buttons, vc-print-log-internal):
4 Add doc strings.
5 (vc-print-log): Clarify interactive prompt.
6
12013-04-20 Glenn Morris <rgm@gnu.org> 72013-04-20 Glenn Morris <rgm@gnu.org>
2 8
3 * emacs-lisp/bytecomp.el (byte-compile-insert-header): 9 * emacs-lisp/bytecomp.el (byte-compile-insert-header):
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index a0ef6f9d6d7..7f03affb6b7 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -2084,6 +2084,11 @@ Not all VC backends support short logs!")
2084(defvar log-view-vc-fileset) 2084(defvar log-view-vc-fileset)
2085 2085
2086(defun vc-print-log-setup-buttons (working-revision is-start-revision limit pl-return) 2086(defun vc-print-log-setup-buttons (working-revision is-start-revision limit pl-return)
2087 "Insert at the end of the current buffer buttons to show more log entries.
2088In the new log, leave point at WORKING-REVISION (if non-nil).
2089LIMIT is the number of entries currently shown.
2090Does nothing if IS-START-REVISION is non-nil, or if LIMIT is nil,
2091or if PL-RETURN is 'limit-unsupported."
2087 (when (and limit (not (eq 'limit-unsupported pl-return)) 2092 (when (and limit (not (eq 'limit-unsupported pl-return))
2088 (not is-start-revision)) 2093 (not is-start-revision))
2089 (goto-char (point-max)) 2094 (goto-char (point-max))
@@ -2104,6 +2109,17 @@ Not all VC backends support short logs!")
2104 2109
2105(defun vc-print-log-internal (backend files working-revision 2110(defun vc-print-log-internal (backend files working-revision
2106 &optional is-start-revision limit) 2111 &optional is-start-revision limit)
2112 "For specified BACKEND and FILES, show the VC log.
2113Leave point at WORKING-REVISION, if it is non-nil.
2114If IS-START-REVISION is non-nil, start the log from WORKING-REVISION.
2115Show up to LIMIT entries (non-nil means unlimited).
2116\(IS-START-REVISION non-nil might not work correctly if LIMIT is not 1.)"
2117 ;; The parenthetical remark is based on the commentary of vc.el for
2118 ;; "print log": "At this point START-REVISION is only required to work
2119 ;; in conjunction with LIMIT = 1." The only thing that passes
2120 ;; IS-START-REVISION non-nil is vc-annotate-show-log-revision-at-line,
2121 ;; which sets LIMIT = 1.
2122
2107 ;; Don't switch to the output buffer before running the command, 2123 ;; Don't switch to the output buffer before running the command,
2108 ;; so that any buffer-local settings in the vc-controlled 2124 ;; so that any buffer-local settings in the vc-controlled
2109 ;; buffer can be accessed by the command. 2125 ;; buffer can be accessed by the command.
@@ -2189,7 +2205,7 @@ WORKING-REVISION and LIMIT."
2189 (interactive 2205 (interactive
2190 (cond 2206 (cond
2191 (current-prefix-arg 2207 (current-prefix-arg
2192 (let ((rev (read-from-minibuffer "Log from revision (default: last revision): " nil 2208 (let ((rev (read-from-minibuffer "Leave point at revision (default: last revision): " nil
2193 nil nil nil)) 2209 nil nil nil))
2194 (lim (string-to-number 2210 (lim (string-to-number
2195 (read-from-minibuffer 2211 (read-from-minibuffer