aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/vc.el6
2 files changed, 7 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d2783845165..2d0d7309252 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12003-07-06 John Paul Wallington <jpw@gnu.org>
2
3 * vc.el (vc-annotate-offset): Move defvar up.
4
12003-07-06 Kim F. Storm <storm@cua.dk> 52003-07-06 Kim F. Storm <storm@cua.dk>
2 6
3 * info.el (Info-menu-entry-name-re): Add `:' to second [] part. 7 * info.el (Info-menu-entry-name-re): Add `:' to second [] part.
diff --git a/lisp/vc.el b/lisp/vc.el
index 8464b72aacc..491ff1f5da6 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -7,7 +7,7 @@
7;; Maintainer: Andre Spiegel <spiegel@gnu.org> 7;; Maintainer: Andre Spiegel <spiegel@gnu.org>
8;; Keywords: tools 8;; Keywords: tools
9 9
10;; $Id: vc.el,v 1.357 2003/06/30 10:34:26 rms Exp $ 10;; $Id: vc.el,v 1.358 2003/07/06 17:28:12 monnier Exp $
11 11
12;; This file is part of GNU Emacs. 12;; This file is part of GNU Emacs.
13 13
@@ -3029,6 +3029,8 @@ or OFFSET if present."
3029 "Return the current time, encoded as fractional days." 3029 "Return the current time, encoded as fractional days."
3030 (vc-annotate-convert-time (current-time))) 3030 (vc-annotate-convert-time (current-time)))
3031 3031
3032(defvar vc-annotate-offset nil)
3033
3032(defun vc-annotate-display (&optional color-map offset) 3034(defun vc-annotate-display (&optional color-map offset)
3033 "Highlight `vc-annotate' output in the current buffer. 3035 "Highlight `vc-annotate' output in the current buffer.
3034COLOR-MAP, if present, overrides `vc-annotate-color-map'. 3036COLOR-MAP, if present, overrides `vc-annotate-color-map'.
@@ -3038,8 +3040,6 @@ The annotations are relative to the current time, unless overridden by OFFSET."
3038 (set (make-local-variable 'vc-annotate-offset) offset) 3040 (set (make-local-variable 'vc-annotate-offset) offset)
3039 (font-lock-mode 1)) 3041 (font-lock-mode 1))
3040 3042
3041(defvar vc-annotate-offset nil)
3042
3043(defun vc-annotate-lines (limit) 3043(defun vc-annotate-lines (limit)
3044 (let (difference) 3044 (let (difference)
3045 (while (and (< (point) limit) 3045 (while (and (< (point) limit)