Mercurial > emacs
changeset 110741:d90a3bc6b730
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.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Sun, 03 Oct 2010 14:05:47 -0700 |
| parents | ed9ff0bf7851 |
| children | f0f8f95b6535 |
| files | 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 |
| diffstat | 10 files changed, 32 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/etc/NEWS Sun Oct 03 15:54:31 2010 -0400 +++ b/etc/NEWS Sun Oct 03 14:05:47 2010 -0700 @@ -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
--- a/lisp/ChangeLog Sun Oct 03 15:54:31 2010 -0400 +++ b/lisp/ChangeLog Sun Oct 03 14:05:47 2010 -0700 @@ -1,3 +1,15 @@ +2010-10-03 Glenn Morris <rgm@gnu.org> + + * 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 <cyd@stupidchicken.com> * emacs-lisp/bytecomp.el (byte-compile-from-buffer): Remove
--- a/lisp/obsolete/vc-mcvs.el Sun Oct 03 15:54:31 2010 -0400 +++ b/lisp/obsolete/vc-mcvs.el Sun Oct 03 14:05:47 2010 -0700 @@ -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)
--- a/lisp/progmodes/cperl-mode.el Sun Oct 03 15:54:31 2010 -0400 +++ b/lisp/progmodes/cperl-mode.el Sun Oct 03 14:05:47 2010 -0700 @@ -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
--- a/lisp/vc/vc-cvs.el Sun Oct 03 15:54:31 2010 -0400 +++ b/lisp/vc/vc-cvs.el Sun Oct 03 14:05:47 2010 -0700 @@ -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)
--- a/lisp/vc/vc-hooks.el Sun Oct 03 15:54:31 2010 -0400 +++ b/lisp/vc/vc-hooks.el Sun Oct 03 14:05:47 2010 -0700 @@ -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
--- a/lisp/vc/vc-rcs.el Sun Oct 03 15:54:31 2010 -0400 +++ b/lisp/vc/vc-rcs.el Sun Oct 03 14:05:47 2010 -0700 @@ -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
--- a/lisp/vc/vc-sccs.el Sun Oct 03 15:54:31 2010 -0400 +++ b/lisp/vc/vc-sccs.el Sun Oct 03 14:05:47 2010 -0700 @@ -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
--- a/lisp/vc/vc-svn.el Sun Oct 03 15:54:31 2010 -0400 +++ b/lisp/vc/vc-svn.el Sun Oct 03 14:05:47 2010 -0700 @@ -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)
--- a/lisp/vc/vc.el Sun Oct 03 15:54:31 2010 -0400 +++ b/lisp/vc/vc.el Sun Oct 03 14:05:47 2010 -0700 @@ -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")))