(perl-beginning-of-function): Skip anonymous subs.

2 files changed, 19 insertions, 16 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 626677de1d0..5c3c58767f7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-04  Karl Chen  <quarl@NOSPAM.quarl.org>
+
+        * progmodes/perl-mode.el (perl-beginning-of-function):
+        Skip anonymous subs.
+
 2006-05-04  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * ibuffer.el (ibuffer-compressed-file-name-regexp): Avoid loading
@@ -44,20 +49,17 @@
 
 2006-05-02  Chong Yidong  <cyd@mit.edu>
 
-        * msb.el (msb): If EVENT is a down event, read and discard the up
-        event.
+        * msb.el (msb): If EVENT is a down event, read and discard the up event.
 
 2006-05-02  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * startup.el (command-line-1): Refer to Lisp manual when
         pure-space-overflow occurs.
 
-        * files.el (byte-compile-dynamic)
-        (byte-compile-dynamic-docstrings, byte-compile-warnings)
-        (find-file-visit-truename, indent-tabs-mode, left-margin)
-        (no-byte-compile no-update-autoloads, truncate-lines)
-        (version-control): Don't use `t' for safe-local-variable
-        declarations.
+        * files.el (byte-compile-dynamic, byte-compile-dynamic-docstrings)
+        (byte-compile-warnings, find-file-visit-truename, indent-tabs-mode)
+        (left-margin, no-byte-compile, no-update-autoloads, truncate-lines)
+        (version-control): Don't use `t' for safe-local-variable declarations.
 
 2006-05-01  Richard Stallman  <rms@gnu.org>
 
@@ -91,10 +93,10 @@
         Returning "/" only doesn't need to be necessary any longer.
         (tramp-file-name-handler): Make special attention when in hostname
         completion mode.
-        (tramp-completion-file-name-handler): Revert patch from 2006-04-28.
-        (tramp-register-file-name-handlers): Register
-        `tramp-completion-file-name-handler' only when
-        `partial-completion-mode is enabled.
+        (tramp-completion-file-name-handler): Revert patch from 2006-04-28.
+        (tramp-register-file-name-handlers):
+        Register `tramp-completion-file-name-handler' only when
+        `partial-completion-mode' is enabled.
         (tramp-completion-handle-file-name-all-completions):
         Delete directory part from results.
         (tramp-get-completion-methods, tramp-get-completion-user-host):
@@ -108,8 +110,8 @@
 
 2006-05-01  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
-        * term/mac-win.el (mac-ae-open-documents, mac-drag-n-drop): Use
-        select-frame-set-input-focus instead of raise-frame.
+        * term/mac-win.el (mac-ae-open-documents, mac-drag-n-drop):
+        Use select-frame-set-input-focus instead of raise-frame.
         (global-map): Bind M-drag-n-drop to mac-drag-n-drop.
 
 2006-05-01  Nick Roberts  <nickrob@snap.net.nz>
diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el
index e92bb1053a6..950e0cba06f 100644
--- a/lisp/progmodes/perl-mode.el
+++ b/lisp/progmodes/perl-mode.el
@@ -923,8 +923,9 @@ Returns new value of point in all cases."
   (or arg (setq arg 1))
   (if (< arg 0) (forward-char 1))
   (and (/= arg 0)
-       (re-search-backward "^\\s(\\|^\\s-*sub\\b[^{]+{\\|^\\s-*format\\b[^=]*=\\|^\\."
-                           nil 'move arg)
+       (re-search-backward
+        "^\\s(\\|^\\s-*sub\\b[ \t\n]*\\_<[^{]+{\\|^\\s-*format\\b[^=]*=\\|^\\."
+        nil 'move arg)
        (goto-char (1- (match-end 0))))
   (point))