[Emacs-diffs] /srv/bzr/emacs/trunk r101769: Remove vc-header-alist, obsolete since 21.1.

[Glenn Morris]

------------------------------------------------------------
revno: 101769
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2010-10-03 14:05:47 -0700
message:
  Remove vc-header-alist, obsolete since 21.1.
  
  * lisp/vc/vc-hooks.el (vc-header-alist): Remove obsolete variable.
  * lisp/vc/vc.el (vc-static-header-alist): Doc fix.
  * lisp/vc/vc-cvs.el (vc-cvs-header):
  * lisp/vc/vc-rcs.el (vc-rcs-header):
  * lisp/vc/vc-sccs.el (vc-sccs-header):
  * lisp/vc/vc-svn.el (vc-svn-header): Do not consult vc-header-alist.
  * lisp/obsolete/vc-mcvs.el (vc-mcvs-header):
  * lisp/progmodes/cperl-mode.el (cperl-mode): Only set vc-header-alist
  on XEmacs.
  
  * etc/NEWS: Mention above change.
modified:
  etc/NEWS
  lisp/ChangeLog
  lisp/obsolete/vc-mcvs.el
  lisp/progmodes/cperl-mode.el
  lisp/vc/vc-cvs.el
  lisp/vc/vc-hooks.el
  lisp/vc/vc-rcs.el
  lisp/vc/vc-sccs.el
  lisp/vc/vc-svn.el
  lisp/vc/vc.el

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2010-10-03 16:43:22 +0000
+++ b/etc/NEWS  2010-10-03 21:05:47 +0000
@@ -559,7 +559,7 @@
 
 ** 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

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-10-03 04:31:59 +0000
+++ b/lisp/ChangeLog    2010-10-03 21:05:47 +0000
@@ -1,3 +1,15 @@
+2010-10-03  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * emacs-lisp/bytecomp.el (byte-compile-from-buffer): Remove

=== modified file 'lisp/obsolete/vc-mcvs.el'
--- a/lisp/obsolete/vc-mcvs.el  2010-01-13 08:35:10 +0000
+++ b/lisp/obsolete/vc-mcvs.el  2010-10-03 21:05:47 +0000
@@ -102,10 +102,9 @@
   :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)
 

=== modified file 'lisp/progmodes/cperl-mode.el'
--- a/lisp/progmodes/cperl-mode.el      2010-09-10 23:13:42 +0000
+++ b/lisp/progmodes/cperl-mode.el      2010-10-03 21:05:47 +0000
@@ -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 @@
   (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

=== modified file 'lisp/vc/vc-cvs.el'
--- a/lisp/vc/vc-cvs.el 2010-08-29 16:17:13 +0000
+++ b/lisp/vc/vc-cvs.el 2010-10-03 21:05:47 +0000
@@ -92,9 +92,9 @@
   :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)
 

=== modified file 'lisp/vc/vc-hooks.el'
--- a/lisp/vc/vc-hooks.el       2010-09-30 12:44:25 +0000
+++ b/lisp/vc/vc-hooks.el       2010-10-03 21:05:47 +0000
@@ -49,9 +49,6 @@
 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

=== modified file 'lisp/vc/vc-rcs.el'
--- a/lisp/vc/vc-rcs.el 2010-08-29 16:17:13 +0000
+++ b/lisp/vc/vc-rcs.el 2010-10-03 21:05:47 +0000
@@ -77,10 +77,10 @@
   :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

=== modified file 'lisp/vc/vc-sccs.el'
--- a/lisp/vc/vc-sccs.el        2010-08-29 16:17:13 +0000
+++ b/lisp/vc/vc-sccs.el        2010-10-03 21:05:47 +0000
@@ -71,9 +71,10 @@
   :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

=== modified file 'lisp/vc/vc-svn.el'
--- a/lisp/vc/vc-svn.el 2010-08-29 16:17:13 +0000
+++ b/lisp/vc/vc-svn.el 2010-10-03 21:05:47 +0000
@@ -84,9 +84,9 @@
   :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)
 

=== modified file 'lisp/vc/vc.el'
--- a/lisp/vc/vc.el     2010-07-16 15:42:15 +0000
+++ b/lisp/vc/vc.el     2010-10-03 21:05:47 +0000
@@ -770,7 +770,7 @@
      "\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")))