diff --git a/etc/NEWS b/etc/NEWS index 57da9338efb..ab43c2784dd 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -559,7 +559,7 @@ make-local-hook ** The following variables and aliases, obsolete since at least Emacs 21.1, have been removed: -checkdoc-minor-keymap +checkdoc-minor-keymap, vc-header-alist * Lisp changes in Emacs 24.1 diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 076c3ef3fac..741ef0d5e0c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,15 @@ +2010-10-03 Glenn Morris + + * vc/vc-hooks.el (vc-header-alist): Remove obsolete variable. + * vc/vc.el (vc-static-header-alist): Doc fix. + * vc/vc-cvs.el (vc-cvs-header): + * vc/vc-rcs.el (vc-rcs-header): + * vc/vc-sccs.el (vc-sccs-header): + * vc/vc-svn.el (vc-svn-header): Do not consult vc-header-alist. + * obsolete/vc-mcvs.el (vc-mcvs-header): + * progmodes/cperl-mode.el (cperl-mode): Only set vc-header-alist + on XEmacs. + 2010-10-03 Chong Yidong * emacs-lisp/bytecomp.el (byte-compile-from-buffer): Remove diff --git a/lisp/obsolete/vc-mcvs.el b/lisp/obsolete/vc-mcvs.el index fcfb566b4f2..8027ee62933 100644 --- a/lisp/obsolete/vc-mcvs.el +++ b/lisp/obsolete/vc-mcvs.el @@ -102,10 +102,9 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." :version "22.1" :group 'vc) -(defcustom vc-mcvs-header (or (cdr (assoc 'MCVS vc-header-alist)) - vc-cvs-header) +(defcustom vc-mcvs-header vc-cvs-header "Header keywords to be inserted by `vc-insert-headers'." - :version "22.1" + :version "24.1" ; no longer consult the obsolete vc-header-alist :type '(repeat string) :group 'vc) diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index d89e41b38fb..46002929791 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el @@ -1,8 +1,8 @@ ;;; cperl-mode.el --- Perl code editing commands for Emacs ;; Copyright (C) 1985, 1986, 1987, 1991, 1992, 1993, 1994, 1995, 1996, 1997, -;; 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -;; Free Software Foundation, Inc. +;; 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, +;; 2010 Free Software Foundation, Inc. ;; Author: Ilya Zakharevich ;; Bob Olson @@ -1802,13 +1802,12 @@ or as help on variables `cperl-tips', `cperl-problems', (set 'vc-rcs-header cperl-vc-rcs-header) (make-local-variable 'vc-sccs-header) (set 'vc-sccs-header cperl-vc-sccs-header) - ;; This one is obsolete... - (make-local-variable 'vc-header-alist) - (with-no-warnings - (set 'vc-header-alist (or cperl-vc-header-alist ; Avoid warning - `((SCCS ,(car cperl-vc-sccs-header)) - (RCS ,(car cperl-vc-rcs-header))))) - ) + (when (featurep 'xemacs) + ;; This one is obsolete... + (make-local-variable 'vc-header-alist) + (set 'vc-header-alist (or cperl-vc-header-alist ; Avoid warning + `((SCCS ,(car cperl-vc-sccs-header)) + (RCS ,(car cperl-vc-rcs-header)))))) (cond ((boundp 'compilation-error-regexp-alist-alist);; xemacs 20.x (make-local-variable 'compilation-error-regexp-alist-alist) (set 'compilation-error-regexp-alist-alist diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el index ad307d3a201..03ff1f555a1 100644 --- a/lisp/vc/vc-cvs.el +++ b/lisp/vc/vc-cvs.el @@ -92,9 +92,9 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." :version "21.1" :group 'vc) -(defcustom vc-cvs-header (or (cdr (assoc 'CVS vc-header-alist)) '("\$Id\$")) +(defcustom vc-cvs-header '("\$Id\$") "Header keywords to be inserted by `vc-insert-headers'." - :version "21.1" + :version "24.1" ; no longer consult the obsolete vc-header-alist :type '(repeat string) :group 'vc) diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el index 5007231d960..37426eb25f2 100644 --- a/lisp/vc/vc-hooks.el +++ b/lisp/vc/vc-hooks.el @@ -49,9 +49,6 @@ vc-BACKEND-master-templates. To enable or disable VC for a given BACKEND, use `vc-handled-backends'." "21.1") -(defvar vc-header-alist ()) -(make-obsolete-variable 'vc-header-alist 'vc-BACKEND-header "21.1") - (defcustom vc-ignore-dir-regexp ;; Stop SMB, automounter, AFS, and DFS host lookups. locate-dominating-stop-dir-regexp diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el index 1c3b4c00e32..6537c2b96f3 100644 --- a/lisp/vc/vc-rcs.el +++ b/lisp/vc/vc-rcs.el @@ -77,10 +77,10 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." :version "21.1" :group 'vc) -(defcustom vc-rcs-header (or (cdr (assoc 'RCS vc-header-alist)) '("\$Id\$")) +(defcustom vc-rcs-header '("\$Id\$") "Header keywords to be inserted by `vc-insert-headers'." :type '(repeat string) - :version "21.1" + :version "24.1" ; no longer consult the obsolete vc-header-alist :group 'vc) (defcustom vc-rcsdiff-knows-brief nil diff --git a/lisp/vc/vc-sccs.el b/lisp/vc/vc-sccs.el index cf7d97e483d..fb9cb3fc3f8 100644 --- a/lisp/vc/vc-sccs.el +++ b/lisp/vc/vc-sccs.el @@ -71,9 +71,10 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." :version "21.1" :group 'vc) -(defcustom vc-sccs-header (or (cdr (assoc 'SCCS vc-header-alist)) '("%W%")) +(defcustom vc-sccs-header '("%W%") "Header keywords to be inserted by `vc-insert-headers'." :type '(repeat string) + :version "24.1" ; no longer consult the obsolete vc-header-alist :group 'vc) ;;;###autoload diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el index 3af6842ab44..7718c4e5316 100644 --- a/lisp/vc/vc-svn.el +++ b/lisp/vc/vc-svn.el @@ -84,9 +84,9 @@ want to force an empty list of arguments, use t." :version "22.1" :group 'vc) -(defcustom vc-svn-header (or (cdr (assoc 'SVN vc-header-alist)) '("\$Id\$")) +(defcustom vc-svn-header '("\$Id\$") "Header keywords to be inserted by `vc-insert-headers'." - :version "22.1" + :version "24.1" ; no longer consult the obsolete vc-header-alist :type '(repeat string) :group 'vc) diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 20e56bbd42f..8b6fc602a2c 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -770,7 +770,7 @@ See `run-hooks'." "\n#ifndef lint\nstatic char vcid[] = \"\%s\";\n#endif /* lint */\n")) "Associate static header string templates with file types. A \%s in the template is replaced with the first string associated with -the file's version control type in `vc-header-alist'." +the file's version control type in `vc-BACKEND-header'." :type '(repeat (cons :format "%v" (regexp :tag "File Type") (string :tag "Header String")))