[Emacs-diffs] /srv/bzr/emacs/trunk r104160: Handle "my" and "our" keywords in Perl imenu (Bug#8261).

[Chong Yidong]

------------------------------------------------------------
revno: 104160
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sun 2011-05-08 14:23:11 -0400
message:
  Handle "my" and "our" keywords in Perl imenu (Bug#8261).
  
  * progmodes/perl-mode.el (perl-imenu-generic-expression): Only match
  variables declared via `my' or `our'.
modified:
  lisp/ChangeLog
  lisp/progmodes/perl-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-05-08 05:17:17 +0000
+++ b/lisp/ChangeLog    2011-05-08 18:23:11 +0000
@@ -1,3 +1,8 @@
+2011-05-08  Ralph Schleicher  <address@hidden>
+
+       * progmodes/perl-mode.el (perl-imenu-generic-expression): Only
+       match variables declared via `my' or `our' (Bug#8261).
+
 2011-05-08  Chong Yidong  <address@hidden>
 
        * progmodes/grep.el (grep-mode-font-lock-keywords): Remove

=== modified file 'lisp/progmodes/perl-mode.el'
--- a/lisp/progmodes/perl-mode.el       2011-04-22 18:44:26 +0000
+++ b/lisp/progmodes/perl-mode.el       2011-05-08 18:23:11 +0000
@@ -166,7 +166,7 @@
   '(;; Functions
     (nil "^sub\\s-+\\([-A-Za-z0-9+_:]+\\)" 1)
     ;;Variables
-    ("Variables" "^\\(address@hidden:]+\\)\\s-*=" 1)
+    ("Variables" "^\\(?:my\\|our\\)\\s-+\\(address@hidden:]+\\)\\s-*=" 1)
     ("Packages" "^package\\s-+\\([-A-Za-z0-9+_:]+\\);" 1)
     ("Doc sections" "^=head[0-9][ \t]+\\(.*\\)" 1))
   "Imenu generic expression for Perl mode.  See `imenu-generic-expression'.")