aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndré Spiegel2004-01-23 11:20:55 +0000
committerAndré Spiegel2004-01-23 11:20:55 +0000
commit64fa2c4f107cb5f4cc77199bae05d855ab45a9a2 (patch)
tree2d2ba0317747ee4c905b9fcd545de60db7ab0ba4
parentfe905025d02b1bea377447bd1282f7fcd32f918e (diff)
downloademacs-64fa2c4f107cb5f4cc77199bae05d855ab45a9a2.tar.gz
emacs-64fa2c4f107cb5f4cc77199bae05d855ab45a9a2.zip
(vc-annotate): Fix improper use of `make-local-variable' at the top
level of vc.el. (Patch by Benjamin Rutt.)
-rw-r--r--lisp/vc.el12
1 files changed, 5 insertions, 7 deletions
diff --git a/lisp/vc.el b/lisp/vc.el
index faf35f57228..a41a4808e8d 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.363 2004/01/21 11:05:51 uid65624 Exp $ 10;; $Id: vc.el,v 1.364 2004/01/22 23:34:33 uid65624 Exp $
11 11
12;; This file is part of GNU Emacs. 12;; This file is part of GNU Emacs.
13 13
@@ -2816,9 +2816,6 @@ Uses `rcs2log' which only works for RCS and CVS."
2816(defvar vc-annotate-parent-file nil) 2816(defvar vc-annotate-parent-file nil)
2817(defvar vc-annotate-parent-rev nil) 2817(defvar vc-annotate-parent-rev nil)
2818(defvar vc-annotate-parent-display-mode nil) 2818(defvar vc-annotate-parent-display-mode nil)
2819(make-local-variable 'vc-annotate-parent-file)
2820(make-local-variable 'vc-annotate-parent-rev)
2821(make-local-variable 'vc-annotate-parent-display-mode)
2822 2819
2823(defconst vc-annotate-font-lock-keywords 2820(defconst vc-annotate-font-lock-keywords
2824 ;; The fontification is done by vc-annotate-lines instead of font-lock. 2821 ;; The fontification is done by vc-annotate-lines instead of font-lock.
@@ -3038,9 +3035,10 @@ colors. `vc-annotate-background' specifies the background color."
3038 vc-annotate-version)) 3035 vc-annotate-version))
3039 (save-excursion 3036 (save-excursion
3040 (set-buffer temp-buffer-name) 3037 (set-buffer temp-buffer-name)
3041 (setq vc-annotate-parent-file bfn) 3038 (set (make-local-variable 'vc-annotate-parent-file) bfn)
3042 (setq vc-annotate-parent-rev vc-annotate-version) 3039 (set (make-local-variable 'vc-annotate-parent-rev) vc-annotate-version)
3043 (setq vc-annotate-parent-display-mode vc-annotate-display-mode)) 3040 (set (make-local-variable 'vc-annotate-parent-display-mode)
3041 vc-annotate-display-mode))
3044 3042
3045 ;; Don't use the temp-buffer-name until the buffer is created 3043 ;; Don't use the temp-buffer-name until the buffer is created
3046 ;; (only after `with-output-to-temp-buffer'.) 3044 ;; (only after `with-output-to-temp-buffer'.)