diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/perl-mode.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3df4ba354eb..3d2cb34730d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-05-08 Ralph Schleicher <rs@ralph-schleicher.de> | ||
| 2 | |||
| 3 | * progmodes/perl-mode.el (perl-imenu-generic-expression): Only | ||
| 4 | match variables declared via `my' or `our' (Bug#8261). | ||
| 5 | |||
| 1 | 2011-05-08 Chong Yidong <cyd@stupidchicken.com> | 6 | 2011-05-08 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 7 | ||
| 3 | * progmodes/grep.el (grep-mode-font-lock-keywords): Remove | 8 | * progmodes/grep.el (grep-mode-font-lock-keywords): Remove |
diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el index ed628730fc1..8ca8c690f92 100644 --- a/lisp/progmodes/perl-mode.el +++ b/lisp/progmodes/perl-mode.el | |||
| @@ -166,7 +166,7 @@ The expansion is entirely correct because it uses the C preprocessor." | |||
| 166 | '(;; Functions | 166 | '(;; Functions |
| 167 | (nil "^sub\\s-+\\([-A-Za-z0-9+_:]+\\)" 1) | 167 | (nil "^sub\\s-+\\([-A-Za-z0-9+_:]+\\)" 1) |
| 168 | ;;Variables | 168 | ;;Variables |
| 169 | ("Variables" "^\\([$@%][-A-Za-z0-9+_:]+\\)\\s-*=" 1) | 169 | ("Variables" "^\\(?:my\\|our\\)\\s-+\\([$@%][-A-Za-z0-9+_:]+\\)\\s-*=" 1) |
| 170 | ("Packages" "^package\\s-+\\([-A-Za-z0-9+_:]+\\);" 1) | 170 | ("Packages" "^package\\s-+\\([-A-Za-z0-9+_:]+\\);" 1) |
| 171 | ("Doc sections" "^=head[0-9][ \t]+\\(.*\\)" 1)) | 171 | ("Doc sections" "^=head[0-9][ \t]+\\(.*\\)" 1)) |
| 172 | "Imenu generic expression for Perl mode. See `imenu-generic-expression'.") | 172 | "Imenu generic expression for Perl mode. See `imenu-generic-expression'.") |