[Emacs-diffs] feature/gnus-select 3b5438f 148/218: Revert "Support all perl variable declarators and prefixes"

[Andrew G Cohen]

branch: feature/gnus-select
commit 3b5438f388dfdc6e4903e706aec401a3261a7f53
Author: Noam Postavsky <address@hidden>
Commit: Andrew G Cohen <address@hidden>

    Revert "Support all perl variable declarators and prefixes"
    
    It highlights normal variable names in perl programs (Bug#30812).
    * lisp/progmodes/perl-mode.el (perl-imenu-generic-expression)
    (perl-font-lock-keywords-2): Restore values prior to Bug#27613 fix.
    
    Don't merge to master, we will fix Bug#27613 properly there (it's too
    close to release to do that on emacs-26).
---
 lisp/progmodes/perl-mode.el | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el
index b96aad7..aec4ddc 100644
--- a/lisp/progmodes/perl-mode.el
+++ b/lisp/progmodes/perl-mode.el
@@ -137,7 +137,7 @@
   '(;; Functions
     (nil "^[ \t]*sub\\s-+\\([-[:alnum:]+_:]+\\)" 1)
     ;;Variables
-    ("Variables" "^[ 
\t]*\\(?:anon\\|argument\\|has\\|local\\|my\\|our\\|state\\|supersede\\)\\s-+\\(address@hidden:alnum:]+_:]+\\)\\s-*="
 1)
+    ("Variables" 
"^\\(?:my\\|our\\)\\s-+\\(address@hidden:alnum:]+_:]+\\)\\s-*=" 1)
     ("Packages" "^[ \t]*package\\s-+\\([-[:alnum:]+_:]+\\);" 1)
     ("Doc sections" "^=head[0-9][ \t]+\\(.*\\)" 1))
   "Imenu generic expression for Perl mode.  See `imenu-generic-expression'.")
@@ -181,9 +181,8 @@
                             "BEGIN" "END" "return" "exec" "eval") t)
               "\\>")
      ;;
-     ;; Fontify declarators and prefixes as types.
-     
("\\<\\(anon\\|argument\\|has\\|local\\|my\\|our\\|state\\|supersede\\)\\>" . 
font-lock-type-face) ; declarators
-     ("\\<\\(let\\|temp\\)\\>" . font-lock-type-face) ; prefixes
+     ;; Fontify local and my keywords as types.
+     ("\\<\\(local\\|my\\)\\>" . font-lock-type-face)
      ;;
      ;; Fontify function, variable and file name references.
      ("&\\(\\sw+\\(::\\sw+\\)*\\)" 1 font-lock-function-name-face)