[Emacs-diffs] master c817549: Allow more shell script defun forms

[Lars Ingebrigtsen]

branch: master
commit c817549b520ce3b10a949f00fcabf8a3a62697ae
Author: Carlos Pita <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>

    Allow more shell script defun forms
    
    * lisp/progmodes/sh-script.el (sh-mode): Allow more shell
    script defun forms, like function name () {...} (bug#19754).
---
 lisp/progmodes/sh-script.el |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 7f89ab2..5f29bb6 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -1661,7 +1661,12 @@ with your script for an edit-interpret-debug cycle."
   (setq-local skeleton-filter-function 'sh-feature)
   (setq-local skeleton-newline-indent-rigidly t)
   (setq-local defun-prompt-regexp
-             (concat "^\\(function[ \t]\\|[[:alnum:]]+[ \t]+()[ \t]+\\)"))
+              (concat
+               "^\\("
+               "\\(function[ \t]\\)?[ \t]*[[:alnum:]]+[ \t]*([ \t]*)"
+               "\\|"
+               "function[ \t]+[[:alnum:]]+[ \t]*\\(([ \t]*)\\)?"
+               "\\)[ \t]*"))
   (setq-local add-log-current-defun-function #'sh-current-defun-name)
   (add-hook 'completion-at-point-functions
             #'sh-completion-at-point-function nil t)