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

[Eli Zaretskii]

Index: emacs/lisp/progmodes/cperl-mode.el
diff -c emacs/lisp/progmodes/cperl-mode.el:1.32 
emacs/lisp/progmodes/cperl-mode.el:1.33
*** emacs/lisp/progmodes/cperl-mode.el:1.32     Sat Mar 16 01:52:31 2002
--- emacs/lisp/progmodes/cperl-mode.el  Mon Apr  8 18:39:00 2002
***************
*** 84,96 ****
      (cond ((fboundp 'make-face)
           `(make-face (quote ,arg)))
          (t
!          `(defconst ,arg (quote ,arg) ,descr))))
    (defmacro cperl-force-face (arg descr) ; Takes unquoted arg
      `(progn
         (or (cperl-is-face (quote ,arg))
           (cperl-make-face ,arg ,descr))
         (or (boundp (quote ,arg))      ; We use unquoted variants too
!          (defconst ,arg (quote ,arg) ,descr))))
    (if cperl-xemacs-p
        (defmacro cperl-etags-snarf-tag (file line)
        `(progn
--- 84,96 ----
      (cond ((fboundp 'make-face)
           `(make-face (quote ,arg)))
          (t
!          `(defvar ,arg (quote ,arg) ,descr))))
    (defmacro cperl-force-face (arg descr) ; Takes unquoted arg
      `(progn
         (or (cperl-is-face (quote ,arg))
           (cperl-make-face ,arg ,descr))
         (or (boundp (quote ,arg))      ; We use unquoted variants too
!          (defvar ,arg (quote ,arg) ,descr))))
    (if cperl-xemacs-p
        (defmacro cperl-etags-snarf-tag (file line)
        `(progn
***************
*** 994,1000 ****
  (defvar cperl-syntax-state nil)
  (defvar cperl-syntax-done-to nil)
  (defvar cperl-emacs-can-parse (> (length (save-excursion
!                                          (parse-partial-sexp 1 1))) 9))
  
  ;; Make customization possible "in reverse"
  (defsubst cperl-val (symbol &optional default hairy)
--- 994,1000 ----
  (defvar cperl-syntax-state nil)
  (defvar cperl-syntax-done-to nil)
  (defvar cperl-emacs-can-parse (> (length (save-excursion
!                                          (parse-partial-sexp (point) 
(point)))) 9))
  
  ;; Make customization possible "in reverse"
  (defsubst cperl-val (symbol &optional default hairy)
***************
*** 3997,4003 ****
        ;; Looking at:
        ;; } foreach my $var ()    {
        (if (looking-at 
!            "[ \t]*\\(}[ 
\t]*\\)?\\<\\(\\els\\(e\\|if\\)\\|continue\\|if\\|unless\\|while\\|for\\(each\\)?\\(\\([
 t]+\\(my\\|local\\|our\\)\\)?[ \t]*\\$[_a-zA-Z0-9]+\\)?\\|until\\)\\>\\([ 
\t]*(\\|[ \t\n]*{\\)\\|[ \t]*{")
          (progn
            (setq ml (match-beginning 8))
            (re-search-forward "[({]")
--- 3997,4003 ----
        ;; Looking at:
        ;; } foreach my $var ()    {
        (if (looking-at 
!            "[ \t]*\\(}[ 
\t]*\\)?\\<\\(\\els\\(e\\|if\\)\\|continue\\|if\\|unless\\|while\\|for\\(each\\)?\\(\\([
 \t]+\\(my\\|local\\|our\\)\\)?[ \t]*\\$[_a-zA-Z0-9]+\\)?\\|until\\)\\>\\([ 
\t]*(\\|[ \t\n]*{\\)\\|[ \t]*{")
          (progn
            (setq ml (match-beginning 8))
            (re-search-forward "[({]")