aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorStefan Monnier2007-11-21 20:23:26 +0000
committerStefan Monnier2007-11-21 20:23:26 +0000
commitb6ddf8d7735083c582d9c354c96ff15b670dd02f (patch)
treec2a0cf626b7a3395c7d9dc4564992acf7e1aeac0 /lisp
parent9b1d7c34454febbb02c879bd7caf7132da1e518f (diff)
downloademacs-b6ddf8d7735083c582d9c354c96ff15b670dd02f.tar.gz
emacs-b6ddf8d7735083c582d9c354c96ff15b670dd02f.zip
(sh-mode): Set defun-prompt-regexp.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog11
-rw-r--r--lisp/progmodes/sh-script.el2
2 files changed, 9 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 581dfd8423a..234d71a68bc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12007-11-21 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * progmodes/sh-script.el (sh-mode): Set defun-prompt-regexp.
4
12007-11-21 Vinicius Jose Latorre <viniciusjl@ig.com.br> 52007-11-21 Vinicius Jose Latorre <viniciusjl@ig.com.br>
2 6
3 * ps-print.el (ps-lpr-switches): Docstring fix. 7 * ps-print.el (ps-lpr-switches): Docstring fix.
@@ -33,8 +37,8 @@
33 37
342007-11-21 Eli Zaretskii <eliz@gnu.org> 382007-11-21 Eli Zaretskii <eliz@gnu.org>
35 39
36 * international/mule-cmds.el (set-locale-environment): Set 40 * international/mule-cmds.el (set-locale-environment):
37 default-file-name-coding-system _after_ keyboard and terminal 41 Set default-file-name-coding-system _after_ keyboard and terminal
38 coding systems. This fixes last change. 42 coding systems. This fixes last change.
39 43
40 * mail/rmail.el (rmail-current-subject-regexp): Allow more than 44 * mail/rmail.el (rmail-current-subject-regexp): Allow more than
@@ -345,8 +349,7 @@
3452007-11-16 Jay Belanger <jay.p.belanger@gmail.com> 3492007-11-16 Jay Belanger <jay.p.belanger@gmail.com>
346 350
347 * calc/calc-aent.el (calc-last-user-lang-parse-table): New variable. 351 * calc/calc-aent.el (calc-last-user-lang-parse-table): New variable.
348 (math-build-parse-table): Get parse information from 352 (math-build-parse-table): Get parse information from math-parse-table.
349 `math-parse-table'.
350 353
3512007-11-16 Stefan Monnier <monnier@iro.umontreal.ca> 3542007-11-16 Stefan Monnier <monnier@iro.umontreal.ca>
352 355
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 5314bb3b745..1b0bbc14b65 100644
--- 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."
1524 skeleton-filter-function 'sh-feature 1524 skeleton-filter-function 'sh-feature
1525 skeleton-newline-indent-rigidly t 1525 skeleton-newline-indent-rigidly t
1526 sh-indent-supported-here nil) 1526 sh-indent-supported-here nil)
1527 (set (make-local-variable 'defun-prompt-regexp)
1528 (concat "^\\(function[ \t]\\|[[:alnum:]]+[ \t]+()[ \t]+\\)"))
1527 (set (make-local-variable 'parse-sexp-ignore-comments) t) 1529 (set (make-local-variable 'parse-sexp-ignore-comments) t)
1528 ;; Parse or insert magic number for exec, and set all variables depending 1530 ;; Parse or insert magic number for exec, and set all variables depending
1529 ;; on the shell thus determined. 1531 ;; on the shell thus determined.