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

[Miles Bader]

Index: emacs/lisp/progmodes/cperl-mode.el
diff -c emacs/lisp/progmodes/cperl-mode.el:1.33.2.1 
emacs/lisp/progmodes/cperl-mode.el:1.33.2.2
*** emacs/lisp/progmodes/cperl-mode.el:1.33.2.1 Fri Apr  4 01:20:32 2003
--- emacs/lisp/progmodes/cperl-mode.el  Tue Oct 14 19:30:16 2003
***************
*** 38,44 ****
  
  ;; DO NOT FORGET to read micro-docs (available from `Perl' menu)   <<<<<<
  ;; or as help on variables `cperl-tips', `cperl-problems',         <<<<<<
! ;; `cperl-praise', `cperl-speed'.                                 <<<<<<
  
  ;; The mode information (on C-h m) provides some customization help.
  ;; If you use font-lock feature of this mode, it is advisable to use
--- 38,44 ----
  
  ;; DO NOT FORGET to read micro-docs (available from `Perl' menu)   <<<<<<
  ;; or as help on variables `cperl-tips', `cperl-problems',         <<<<<<
! ;; `cperl-praise', `cperl-speed'.                                <<<<<<
  
  ;; The mode information (on C-h m) provides some customization help.
  ;; If you use font-lock feature of this mode, it is advisable to use
***************
*** 584,590 ****
      (((class color) (background dark))
       (:foreground ,cperl-dark-foreground))
      (t (:weight bold :underline t)))
!   "Font Lock mode face used to highlight array names."
    :group 'cperl-faces)
  
  (defface cperl-array-face
--- 584,590 ----
      (((class color) (background dark))
       (:foreground ,cperl-dark-foreground))
      (t (:weight bold :underline t)))
!   "Font Lock mode face used non-overridable keywords and modifiers of 
regexps."
    :group 'cperl-faces)
  
  (defface cperl-array-face
***************
*** 1146,1152 ****
           ["Add tags for Perl files in (sub)directories"
            (cperl-write-tags nil nil t t) t]))
         ("Perl docs"
!         ["Define word at point" imenu-go-find-at-position 
           (fboundp 'imenu-go-find-at-position)]
          ["Help on function" cperl-info-on-command t]
          ["Help on function at point" cperl-info-on-current-command t]
--- 1146,1152 ----
           ["Add tags for Perl files in (sub)directories"
            (cperl-write-tags nil nil t t) t]))
         ("Perl docs"
!         ["Define word at point" imenu-go-find-at-position
           (fboundp 'imenu-go-find-at-position)]
          ["Help on function" cperl-info-on-command t]
          ["Help on function at point" cperl-info-on-current-command t]
***************
*** 1154,1160 ****
          ["Perldoc" cperl-perldoc t]
          ["Perldoc on word at point" cperl-perldoc-at-point t]
          ["View manpage of POD in this file" cperl-build-manpage t]
!         ["Auto-help on" cperl-lazy-install 
           (and (fboundp 'run-with-idle-timer)
                (not cperl-lazy-installed))]
          ["Auto-help off" cperl-lazy-unstall
--- 1154,1160 ----
          ["Perldoc" cperl-perldoc t]
          ["Perldoc on word at point" cperl-perldoc-at-point t]
          ["View manpage of POD in this file" cperl-build-manpage t]
!         ["Auto-help on" cperl-lazy-install
           (and (fboundp 'run-with-idle-timer)
                (not cperl-lazy-installed))]
          ["Auto-help off" cperl-lazy-unstall
***************
*** 1166,1172 ****
          ["Electric keywords" cperl-toggle-abbrev t]
          ["Fix whitespace on indent" cperl-toggle-construct-fix t]
          ["Auto-help on Perl constructs" cperl-toggle-autohelp t]
!         ["Auto fill" auto-fill-mode t]) 
         ("Indent styles..."
          ["CPerl" (cperl-set-style "CPerl") t]
          ["PerlStyle" (cperl-set-style "PerlStyle") t]
--- 1166,1172 ----
          ["Electric keywords" cperl-toggle-abbrev t]
          ["Fix whitespace on indent" cperl-toggle-construct-fix t]
          ["Auto-help on Perl constructs" cperl-toggle-autohelp t]
!         ["Auto fill" auto-fill-mode t])
         ("Indent styles..."
          ["CPerl" (cperl-set-style "CPerl") t]
          ["PerlStyle" (cperl-set-style "PerlStyle") t]
***************
*** 2912,2918 ****
                    (goto-char (1- cpoint)))))
              (setq stop-in t)          ; Finish
              (forward-char -1))
!         (setq stop-in t)))            ; Finish 
        (nth 4 state))))
  
  (defsubst cperl-1- (p)
--- 2912,2918 ----
                    (goto-char (1- cpoint)))))
              (setq stop-in t)          ; Finish
              (forward-char -1))
!         (setq stop-in t)))            ; Finish
        (nth 4 state))))
  
  (defsubst cperl-1- (p)
***************
*** 3570,3576 ****
                            ((and (eq (following-char) ?:)
                                  (eq b1 ?\{) ; Check for $ { s::bar }
                                  (looking-at "::[a-zA-Z0-9_:]*[ \t\n\f]*}")
!                                 (progn 
                                    (goto-char (1- go))
                                    (skip-chars-backward " \t\n\f")
                                    (memq (preceding-char)
--- 3570,3576 ----
                            ((and (eq (following-char) ?:)
                                  (eq b1 ?\{) ; Check for $ { s::bar }
                                  (looking-at "::[a-zA-Z0-9_:]*[ \t\n\f]*}")
!                                 (progn
                                    (goto-char (1- go))
                                    (skip-chars-backward " \t\n\f")
                                    (memq (preceding-char)
***************
*** 4882,4888 ****
          (defvar cperl-guessed-background nil
            "Display characteristics as guessed by cperl.")
          ;;      (or (fboundp 'x-color-defined-p)
!         ;;          (defalias 'x-color-defined-p 
          ;;            (cond ((fboundp 'color-defined-p) 'color-defined-p)
          ;;                  ;; XEmacs >= 19.12
          ;;                  ((fboundp 'valid-color-name-p) 
'valid-color-name-p)
--- 4882,4888 ----
          (defvar cperl-guessed-background nil
            "Display characteristics as guessed by cperl.")
          ;;      (or (fboundp 'x-color-defined-p)
!         ;;          (defalias 'x-color-defined-p
          ;;            (cond ((fboundp 'color-defined-p) 'color-defined-p)
          ;;                  ;; XEmacs >= 19.12
          ;;                  ((fboundp 'valid-color-name-p) 
'valid-color-name-p)
***************
*** 5198,5204 ****
  Chosing \"Current\" style will not change style, so this may be used for
  side-effect of memorizing only."
    (interactive
!    (let ((list (mapcar (function (lambda (elt) (list (car elt)))) 
                       cperl-style-alist)))
       (list (completing-read "Enter style: " list nil 'insist))))
    (or cperl-old-style
--- 5198,5204 ----
  Chosing \"Current\" style will not change style, so this may be used for
  side-effect of memorizing only."
    (interactive
!    (let ((list (mapcar (function (lambda (elt) (list (car elt))))
                       cperl-style-alist)))
       (list (completing-read "Enter style: " list nil 'insist))))
    (or cperl-old-style
***************
*** 5403,5409 ****
  MINSHIFT is the minimal amount of space to insert before the construction.
  STEP is the tabwidth to position constructions.
  If STEP is nil, `cperl-lineup-step' will be used
! \(or `cperl-indent-level', if `cperl-lineup-step' is `nil').
  Will not move the position at the start to the left."
    (interactive "r")
    (let (search col tcol seen b e)
--- 5403,5409 ----
  MINSHIFT is the minimal amount of space to insert before the construction.
  STEP is the tabwidth to position constructions.
  If STEP is nil, `cperl-lineup-step' will be used
! \(or `cperl-indent-level', if `cperl-lineup-step' is nil).
  Will not move the position at the start to the left."
    (interactive "r")
    (let (search col tcol seen b e)
***************
*** 5658,5664 ****
                         (string-match "^sub[ \t]+\\([_a-zA-Z]+\\)[^:_a-zA-Z]"
                                       (elt elt 3)))
                    ;; Need to insert the name without package as well
!                   (setq lst (cons (cons (substring (elt elt 3) 
                                                     (match-beginning 1)
                                                     (match-end 1))
                                          (cdr elt))
--- 5658,5664 ----
                         (string-match "^sub[ \t]+\\([_a-zA-Z]+\\)[^:_a-zA-Z]"
                                       (elt elt 3)))
                    ;; Need to insert the name without package as well
!                   (setq lst (cons (cons (substring (elt elt 3)
                                                     (match-beginning 1)
                                                     (match-end 1))
                                          (cdr elt))
***************
*** 5730,5736 ****
                        (setq cperl-unreadable-ok t
                              tm nil)   ; Return empty list
                      (error "Aborting: unreadable directory %s" file)))))))
!         (mapcar (function 
                   (lambda (file)
                     (cond
                      ((string-match cperl-noscan-files-regexp file)
--- 5730,5736 ----
                        (setq cperl-unreadable-ok t
                              tm nil)   ; Return empty list
                      (error "Aborting: unreadable directory %s" file)))))))
!         (mapcar (function
                   (lambda (file)
                     (cond
                      ((string-match cperl-noscan-files-regexp file)
***************
*** 6008,6019 ****
  (defvar cperl-bad-style-regexp
    (mapconcat 'identity
             '("[^-\n\t <>=+!.&|(*/'`\"#^][-=+<>!|&^]" ; char sign
!              "[-<>=+^&|]+[^- \t\n=+<>~]") ; sign+ char 
             "\\|")
    "Finds places such that insertion of a whitespace may help a lot.")
  
  (defvar cperl-not-bad-style-regexp
!   (mapconcat 
     'identity
     '("[^-\t <>=+]\\(--\\|\\+\\+\\)"   ; var-- var++
       "[a-zA-Z0-9_][|&][a-zA-Z0-9_$]"  ; abc|def abc&def are often used.
--- 6008,6019 ----
  (defvar cperl-bad-style-regexp
    (mapconcat 'identity
             '("[^-\n\t <>=+!.&|(*/'`\"#^][-=+<>!|&^]" ; char sign
!              "[-<>=+^&|]+[^- \t\n=+<>~]") ; sign+ char
             "\\|")
    "Finds places such that insertion of a whitespace may help a lot.")
  
  (defvar cperl-not-bad-style-regexp
!   (mapconcat
     'identity
     '("[^-\t <>=+]\\(--\\|\\+\\+\\)"   ; var-- var++
       "[a-zA-Z0-9_][|&][a-zA-Z0-9_$]"  ; abc|def abc&def are often used.
***************
*** 7271,7274 ****
--- 7271,7275 ----
  
  (provide 'cperl-mode)
  
+ ;;; arch-tag: 42e5b19b-e187-4537-929f-1a7408980ce6
  ;;; cperl-mode.el ends here