aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2008-04-18 10:31:27 +0000
committerJuanma Barranquero2008-04-18 10:31:27 +0000
commitd9bb547b68dc7eda69f8c6dda853f51c0e95509e (patch)
treed5a9f1644203575e28bd721d4297abff02e3caff
parentd79f734ed64fcd8e8a1f10da6addd34c148843e7 (diff)
downloademacs-d9bb547b68dc7eda69f8c6dda853f51c0e95509e.tar.gz
emacs-d9bb547b68dc7eda69f8c6dda853f51c0e95509e.zip
(cvs-diff-ignore-marks, cvs-diff-buffer-name):
Add WHEN to obsolescence declaration.
-rw-r--r--lisp/pcvs-defs.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/pcvs-defs.el b/lisp/pcvs-defs.el
index a4e7fde0f51..5c2c77b6fa8 100644
--- a/lisp/pcvs-defs.el
+++ b/lisp/pcvs-defs.el
@@ -142,7 +142,8 @@ current line. See also `cvs-invert-ignore-marks'"
142 142
143(defvar cvs-diff-ignore-marks t) 143(defvar cvs-diff-ignore-marks t)
144(make-obsolete-variable 'cvs-diff-ignore-marks 144(make-obsolete-variable 'cvs-diff-ignore-marks
145 'cvs-invert-ignore-marks) 145 'cvs-invert-ignore-marks
146 "21.1")
146 147
147(defcustom cvs-invert-ignore-marks 148(defcustom cvs-invert-ignore-marks
148 (let ((l ())) 149 (let ((l ()))
@@ -179,7 +180,8 @@ If set to nil, `cvs-mode-add' will always prompt for a message."
179 180
180(defvar cvs-diff-buffer-name "*cvs-diff*") 181(defvar cvs-diff-buffer-name "*cvs-diff*")
181(make-obsolete-variable 'cvs-diff-buffer-name 182(make-obsolete-variable 'cvs-diff-buffer-name
182 'cvs-buffer-name-alist) 183 'cvs-buffer-name-alist
184 "21.1")
183 185
184(defcustom cvs-find-file-and-jump nil 186(defcustom cvs-find-file-and-jump nil
185 "Jump to the modified area when finding a file. 187 "Jump to the modified area when finding a file.