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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9d370fa43ddaad4aa210de26d4abf33966efac6f..870883cf1d402c646ce1f95cfbad4bd692c7b628 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2009-12-03  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       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  <rgm@gnu.org>
 
        * progmodes/idlwave.el (class): Restore still useful declaration.

diff --git a/lisp/vc.el b/lisp/vc.el
index 9bd6e338f372be733737c81c5b4b684b968a85eb..cd9f11bcf3aecc708fe0a3685a68d4c72e270287 100644 (file)
--- 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))