diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/sh-script.el | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c46b9a5ceab..4897aa0f30c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-04-19 Masatake YAMATO <yamato@redhat.com> | ||
| 2 | |||
| 3 | * progmodes/sh-script.el (sh-imenu-generic-expression): Handle | ||
| 4 | function names with a single character. | ||
| 5 | |||
| 1 | 2013-04-19 Dima Kogan <dima@secretsauce.net> (tiny change) | 6 | 2013-04-19 Dima Kogan <dima@secretsauce.net> (tiny change) |
| 2 | 7 | ||
| 3 | * progmodes/gud.el (gud-perldb-marker-filter): Understand position info | 8 | * 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 e197f9cfabe..07e9bb85c4e 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el | |||
| @@ -335,11 +335,11 @@ shell it really is." | |||
| 335 | . ((nil | 335 | . ((nil |
| 336 | ;; function FOO | 336 | ;; function FOO |
| 337 | ;; function FOO() | 337 | ;; function FOO() |
| 338 | "^\\s-*function\\s-+\\\([[:alpha:]_][[:alnum:]_]+\\)\\s-*\\(?:()\\)?" | 338 | "^\\s-*function\\s-+\\\([[:alpha:]_][[:alnum:]_]*\\)\\s-*\\(?:()\\)?" |
| 339 | 1) | 339 | 1) |
| 340 | ;; FOO() | 340 | ;; FOO() |
| 341 | (nil | 341 | (nil |
| 342 | "^\\s-*\\([[:alpha:]_][[:alnum:]_]+\\)\\s-*()" | 342 | "^\\s-*\\([[:alpha:]_][[:alnum:]_]*\\)\\s-*()" |
| 343 | 1) | 343 | 1) |
| 344 | ))) | 344 | ))) |
| 345 | "Alist of regular expressions for recognizing shell function definitions. | 345 | "Alist of regular expressions for recognizing shell function definitions. |