[Emacs-diffs] Changes to emacs/lisp/progmodes/cperl-mode.el

[André Spiegel]

Index: emacs/lisp/progmodes/cperl-mode.el
diff -c emacs/lisp/progmodes/cperl-mode.el:1.64 
emacs/lisp/progmodes/cperl-mode.el:1.65
*** emacs/lisp/progmodes/cperl-mode.el:1.64     Mon May 16 11:26:54 2005
--- emacs/lisp/progmodes/cperl-mode.el  Tue May 24 20:03:58 2005
***************
*** 342,351 ****
    :type 'integer
    :group 'cperl-indentation-details)
  
! (defcustom cperl-vc-header-alist '((SCCS "($sccs) = ('%W\%' =~ 
/(\\d+(\\.\\d+)+)/) ;")
!                                  (RCS "($rcs) = (' $Id\$ ' =~ 
/(\\d+(\\.\\d+)+)/) ;"))
!   "*What to use as `vc-header-alist' in CPerl."
!   :type '(repeat (list symbol string))
    :group 'cperl)
  
  (defcustom cperl-clobber-mode-lists
--- 342,360 ----
    :type 'integer
    :group 'cperl-indentation-details)
  
! (defvar cperl-vc-header-alist nil)
! (make-obsolete-variable 
!  'cperl-vc-header-alist
!  "use cperl-vc-rcs-header or cperl-vc-sccs-header instead.")
! 
! (defcustom cperl-vc-sccs-header '("($sccs) = ('%W\%' =~ /(\\d+(\\.\\d+)+)/) 
;")
!   "*Special version of `vc-sccs-header' that is used in CPerl mode buffers."
!   :type '(repeat string)
!   :group 'cperl)
! 
! (defcustom cperl-vc-rcs-header '("($rcs) = (' $Id\$ ' =~ /(\\d+(\\.\\d+)+)/) 
;")
!   "*Special version of `vc-rcs-header' that is used in CPerl mode buffers."
!   :type '(repeat string)
    :group 'cperl)
  
  (defcustom cperl-clobber-mode-lists
***************
*** 1485,1492 ****
        (function cperl-imenu--create-perl-index))
    (make-local-variable 'imenu-sort-function)
    (setq imenu-sort-function nil)
!   (make-local-variable 'vc-header-alist)
!   (set 'vc-header-alist cperl-vc-header-alist) ; Avoid warning
    (make-local-variable 'font-lock-defaults)
    (setq       font-lock-defaults
        (cond
--- 1494,1503 ----
        (function cperl-imenu--create-perl-index))
    (make-local-variable 'imenu-sort-function)
    (setq imenu-sort-function nil)
!   (make-local-variable 'vc-rcs-header)
!   (set 'vc-rcs-header cperl-vc-rcs-header)
!   (make-local-variable 'vc-sccs-header)
!   (set 'vc-sccs-header cperl-vc-sccs-header)
    (make-local-variable 'font-lock-defaults)
    (setq       font-lock-defaults
        (cond