* lisp/progmodes/sh-script.el (sh-imenu-generic-expression): Handle

function names with a single character.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c46b9a5ceaba73a017c451245ec6979b393f39ea..4897aa0f30c626e1549d23e74e107a2af589d6ff 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-19 Masatake YAMATO  <yamato@redhat.com>
+
+       * progmodes/sh-script.el (sh-imenu-generic-expression): Handle
+       function names with a single character.
+
 2013-04-19  Dima Kogan  <dima@secretsauce.net>    (tiny change)
 
        * progmodes/gud.el (gud-perldb-marker-filter): Understand position info

diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index e197f9cfabe70837b1717476ba17d082ecbf8578..07e9bb85c4e98c20ccab69b09dc2ba136b18f5f2 100644 (file)
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -335,11 +335,11 @@ shell it really is."
      . ((nil
         ;; function FOO
         ;; function FOO()
-         "^\\s-*function\\s-+\\\([[:alpha:]_][[:alnum:]_]+\\)\\s-*\\(?:()\\)?"
+         "^\\s-*function\\s-+\\\([[:alpha:]_][[:alnum:]_]*\\)\\s-*\\(?:()\\)?"
          1)
        ;; FOO()
        (nil
-        "^\\s-*\\([[:alpha:]_][[:alnum:]_]+\\)\\s-*()"
+        "^\\s-*\\([[:alpha:]_][[:alnum:]_]*\\)\\s-*()"
         1)
        )))
   "Alist of regular expressions for recognizing shell function definitions.