(sh-mode): Set defun-prompt-regexp.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 581dfd8423a59d943b43607d409cf241647a0a94..234d71a68bc7c52ae2fc3c23905190244f7fe4e2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-21  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * progmodes/sh-script.el (sh-mode): Set defun-prompt-regexp.
+
 2007-11-21  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
 
        * ps-print.el (ps-lpr-switches): Docstring fix.
@@ -33,8 +37,8 @@
 
 2007-11-21  Eli Zaretskii  <eliz@gnu.org>
 
-       * international/mule-cmds.el (set-locale-environment): Set
-       default-file-name-coding-system _after_ keyboard and terminal
+       * international/mule-cmds.el (set-locale-environment):
+       Set default-file-name-coding-system _after_ keyboard and terminal
        coding systems.  This fixes last change.
 
        * mail/rmail.el (rmail-current-subject-regexp): Allow more than
@@ -345,8 +349,7 @@
 2007-11-16  Jay Belanger  <jay.p.belanger@gmail.com>
 
        * calc/calc-aent.el (calc-last-user-lang-parse-table): New variable.
-       (math-build-parse-table): Get parse information from
-       `math-parse-table'.
+       (math-build-parse-table): Get parse information from math-parse-table.
 
 2007-11-16  Stefan Monnier  <monnier@iro.umontreal.ca>
 

diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 5314bb3b74521da315af7ab8f4fe57e1f9e80af9..1b0bbc14b65ddae96c19c7cf519abe4ae78751ba 100644 (file)
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -1524,6 +1524,8 @@ with your script for an edit-interpret-debug cycle."
        skeleton-filter-function 'sh-feature
        skeleton-newline-indent-rigidly t
        sh-indent-supported-here nil)
+  (set (make-local-variable 'defun-prompt-regexp)
+       (concat "^\\(function[ \t]\\|[[:alnum:]]+[ \t]+()[ \t]+\\)"))
   (set (make-local-variable 'parse-sexp-ignore-comments) t)
   ;; Parse or insert magic number for exec, and set all variables depending
   ;; on the shell thus determined.