[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r114693: * lisp/progmodes/sh-script.el (sh-find-prev
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] trunk r114693: * lisp/progmodes/sh-script.el (sh-find-prev-matching): Disable SMIE's |
Date: |
Thu, 17 Oct 2013 03:57:12 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 114693
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=15613
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2013-10-16 23:56:51 -0400
message:
* lisp/progmodes/sh-script.el (sh-find-prev-matching): Disable SMIE's
forward-sexp-function while we redo its job.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/progmodes/sh-script.el shscript.el-20091113204419-o5vbwnq5f7feedwu-727
test/indent/shell.sh shell.sh-20110209185043-iuyrh0is1gz0s4w6-1
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-10-17 03:37:05 +0000
+++ b/lisp/ChangeLog 2013-10-17 03:56:51 +0000
@@ -1,3 +1,8 @@
+2013-10-17 Stefan Monnier <address@hidden>
+
+ * progmodes/sh-script.el (sh-find-prev-matching): Disable SMIE's
+ forward-sexp-function while we redo its job (bug#15613).
+
2013-10-17 Jay Belanger <address@hidden>
* calc/calc-comb.el (math-prime-test): Don't assume large integers are
=== modified file 'lisp/progmodes/sh-script.el'
--- a/lisp/progmodes/sh-script.el 2013-10-13 23:21:56 +0000
+++ b/lisp/progmodes/sh-script.el 2013-10-17 03:56:51 +0000
@@ -3097,6 +3097,7 @@
OPEN and CLOSE are regexps denoting the tokens to be matched.
Optional parameter DEPTH (usually 1) says how many to look for."
(let ((parse-sexp-ignore-comments t)
+ (forward-sexp-function nil)
prev)
(setq depth (or depth 1))
(save-excursion
=== modified file 'test/indent/shell.sh'
--- a/test/indent/shell.sh 2013-01-04 02:53:48 +0000
+++ b/test/indent/shell.sh 2013-10-17 03:56:51 +0000
@@ -5,6 +5,12 @@
# adsgsdg
+if foo; then
+ if bar; then
+ toto
+ fi
+fi # bug#15613
+
case $X in
foo)
do_something
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r114693: * lisp/progmodes/sh-script.el (sh-find-prev-matching): Disable SMIE's,
Stefan Monnier <=