From 46e5c897b46c9bb6f443f3e947971f3db6f6edbc Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Thu, 3 Dec 2009 19:12:52 +0000 Subject: [PATCH] Limit the number of log entries displayed by default. * vc.el (vc-print-log-internal): Fix check for limit-unsupported. (vc-print-log, vc-print-root-log): Use vc-log-show-limit when not using a prefix argument. --- lisp/ChangeLog | 7 +++++++ lisp/vc.el | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9d370fa43dd..870883cf1d4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2009-12-03 Dan Nicolaescu + + Limit the number of log entries displayed by default. + * vc.el (vc-print-log-internal): Fix check for limit-unsupported. + (vc-print-log, vc-print-root-log): Use vc-log-show-limit when not + using a prefix argument. + 2009-12-03 Glenn Morris * progmodes/idlwave.el (class): Restore still useful declaration. diff --git a/lisp/vc.el b/lisp/vc.el index 9bd6e338f37..cd9f11bcf3a 100644 --- a/lisp/vc.el +++ b/lisp/vc.el @@ -1890,7 +1890,7 @@ Not all VC backends support short logs!") (vc-exec-after `(let ((inhibit-read-only t)) - (when (and ,limit (not (eq 'limit-unsupported pl-return))) + (when (and ,limit (not ,(eq 'limit-unsupported pl-return))) (goto-char (point-max)) (widget-create 'push-button :notify (lambda (&rest ignore) @@ -1931,7 +1931,7 @@ If WORKING-REVISION is non-nil, leave the point at that revision." (when (<= lim 0) (setq lim nil)) (list rev lim))) (t - (list nil nil)))) + (list nil (when (> vc-log-show-limit 0) vc-log-show-limit))))) (let* ((vc-fileset (vc-deduce-fileset t)) ;FIXME: Why t? --Stef (backend (car vc-fileset)) (files (cadr vc-fileset)) @@ -1952,7 +1952,7 @@ If WORKING-REVISION is non-nil, leave the point at that revision." (when (<= lim 0) (setq lim nil)) (list lim))) (t - (list nil)))) + (list (when (> vc-log-show-limit 0) vc-log-show-limit))))) (let ((backend (cond ((derived-mode-p 'vc-dir-mode) vc-dir-backend) ((derived-mode-p 'dired-mode) (vc-responsible-backend default-directory)) -- 2.39.5