summaryrefslogtreecommitdiff
path: root/lisp/progmodes/cperl-mode.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2010-10-03 14:05:47 -0700
committerGlenn Morris <rgm@gnu.org>2010-10-03 14:05:47 -0700
commit67141a37c1e7151408cc109aac0d5944d43db146 (patch)
tree8655c70135f9bf0147325df87ff63276ff96a34b /lisp/progmodes/cperl-mode.el
parentd99a45914df3fe2d133e18c62615ad6a5a8ae278 (diff)
downloademacs-67141a37c1e7151408cc109aac0d5944d43db146.tar.gz
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.
Diffstat (limited to 'lisp/progmodes/cperl-mode.el')
-rw-r--r--lisp/progmodes/cperl-mode.el17
1 files changed, 8 insertions, 9 deletions
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