[Emacs-diffs] /srv/bzr/emacs/trunk r109141: * lisp/progmodes/sh-script.el (sh-imenu-generic-expression):

[Stefan Monnier]

------------------------------------------------------------
revno: 109141
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=11856
author: Masatake YAMATO <address@hidden>
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2012-07-18 09:40:57 -0400
message:
  * lisp/progmodes/sh-script.el (sh-imenu-generic-expression):
  Capture a function with `function' keyword and without parentheses
  like "function FOO".
modified:
  lisp/ChangeLog
  lisp/progmodes/sh-script.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-07-18 13:31:16 +0000
+++ b/lisp/ChangeLog    2012-07-18 13:40:57 +0000
@@ -1,3 +1,9 @@
+2012-07-18  Masatake YAMATO  <address@hidden>
+
+       * progmodes/sh-script.el (sh-imenu-generic-expression):
+       Capture a function with `function' keyword and without parentheses
+       like "function FOO" (bug#11856).
+
 2012-07-18  Tassilo Horn  <address@hidden>
 
        * window.el (split-window-sensibly): Make WINDOW argument
@@ -51,9 +57,10 @@
        * descr-text.el (describe-char): Fix format args.  (Bug#10129)
 
 2012-07-17  Fabián Ezequiel Gallina  <address@hidden>
+
        Final renames and doc fixes for movement commands (bug#11899).
-       * progmodes/python.el (python-nav-beginning-of-statement): Rename
-       from python-nav-statement-start.
+       * progmodes/python.el (python-nav-beginning-of-statement):
+       Rename from python-nav-statement-start.
        (python-nav-end-of-statement): Rename from
        python-nav-statement-end.
        (python-nav-beginning-of-block): Rename from
@@ -62,8 +69,8 @@
 
 2012-07-17  Fabián Ezequiel Gallina  <address@hidden>
 
-       * progmodes/python.el (python-shell-send-string-no-output): Allow
-       accept-process-output to quit, keeping shell process ready for
+       * progmodes/python.el (python-shell-send-string-no-output):
+       Allow accept-process-output to quit, keeping shell process ready for
        future interactions (Bug#11868).
 
 2012-07-17  Stefan Monnier  <address@hidden>

=== modified file 'lisp/progmodes/sh-script.el'
--- a/lisp/progmodes/sh-script.el       2012-07-17 11:52:00 +0000
+++ b/lisp/progmodes/sh-script.el       2012-07-18 13:40:57 +0000
@@ -327,8 +327,15 @@
 (defcustom sh-imenu-generic-expression
   `((sh
      . ((nil
-         "^\\s-*\\(function\\s-+\\)?\\([[:alpha:]_][[:alnum:]_]+\\)\\s-*()"
-         2))))
+        ;; function FOO
+        ;; function FOO()
+         "^\\s-*function\\s-+\\\([[:alpha:]_][[:alnum:]_]+\\)\\s-*\\(?:()\\)?"
+         1)
+       ;; FOO()
+       (nil
+        "^\\s-*\\([[:alpha:]_][[:alnum:]_]+\\)\\s-*()"
+        1)
+       )))
   "Alist of regular expressions for recognizing shell function definitions.
 See `sh-feature' and `imenu-generic-expression'."
   :type '(alist :key-type (symbol :tag "Shell")