aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/vc/vc.el15
1 files changed, 8 insertions, 7 deletions
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 3689dcb9b27..1234424a8d9 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -2693,11 +2693,15 @@ Not all VC backends support short logs!")
2693(defun vc-print-log-setup-buttons (working-revision is-start-revision limit pl-return) 2693(defun vc-print-log-setup-buttons (working-revision is-start-revision limit pl-return)
2694 "Insert at the end of the current buffer buttons to show more log entries. 2694 "Insert at the end of the current buffer buttons to show more log entries.
2695In the new log, leave point at WORKING-REVISION (if non-nil). 2695In the new log, leave point at WORKING-REVISION (if non-nil).
2696LIMIT is the number of entries currently shown. 2696LIMIT is the current maximum number of entries shown. Does
2697Does nothing if IS-START-REVISION is non-nil, or if LIMIT is nil, 2697nothing if IS-START-REVISION is non-nil and LIMIT is 1, or if
2698or if PL-RETURN is `limit-unsupported'." 2698LIMIT is nil, or if PL-RETURN is `limit-unsupported'."
2699 ;; LIMIT=1 is set by vc-annotate-show-log-revision-at-line
2700 ;; or by vc-print-root-log with current-prefix-arg=1.
2701 ;; In either case only one revision is wanted, no buttons.
2699 (when (and limit (not (eq 'limit-unsupported pl-return)) 2702 (when (and limit (not (eq 'limit-unsupported pl-return))
2700 (not is-start-revision)) 2703 (not (and is-start-revision
2704 (= limit 1))))
2701 (let ((entries 0)) 2705 (let ((entries 0))
2702 (goto-char (point-min)) 2706 (goto-char (point-min))
2703 (while (re-search-forward log-view-message-re nil t) 2707 (while (re-search-forward log-view-message-re nil t)
@@ -2770,9 +2774,6 @@ Leave point at WORKING-REVISION, if it is non-nil.
2770If IS-START-REVISION is non-nil, start the log from WORKING-REVISION 2774If IS-START-REVISION is non-nil, start the log from WORKING-REVISION
2771\(not all backends support this); i.e., show only WORKING-REVISION and 2775\(not all backends support this); i.e., show only WORKING-REVISION and
2772earlier revisions. Show up to LIMIT entries (non-nil means unlimited)." 2776earlier revisions. Show up to LIMIT entries (non-nil means unlimited)."
2773 ;; As of 2013/04 the only thing that passes IS-START-REVISION non-nil
2774 ;; is vc-annotate-show-log-revision-at-line, which sets LIMIT = 1.
2775
2776 ;; Don't switch to the output buffer before running the command, 2777 ;; Don't switch to the output buffer before running the command,
2777 ;; so that any buffer-local settings in the vc-controlled 2778 ;; so that any buffer-local settings in the vc-controlled
2778 ;; buffer can be accessed by the command. 2779 ;; buffer can be accessed by the command.