* lisp/progmodes/sh-script.el (sh-find-prev-matching): Disable SMIE's

forward-sexp-function while we redo its job.

Fixes: debbugs:15613

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 542a9108d320c9d5707ec0719fc5ceb6120a488d..bbff921661d584ee2eb9800cb095202007a66e6b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * 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  <jay.p.belanger@gmail.com>
 
        * calc/calc-comb.el (math-prime-test): Don't assume large integers are

diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index ec73a06955c6a37f1f61db662a4598af1ac20e50..f834d7f32177890972b5c6721fc6def9247148f3 100644 (file)
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -3097,6 +3097,7 @@ This takes into account that there may be nested open..close pairings.
 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

diff --git a/test/indent/shell.sh b/test/indent/shell.sh
index 790656501d1ceaa67af130a85bb8ee5527b5e3a1..e402398b99628759288f168d222fdbab28008163 100755 (executable)
--- a/test/indent/shell.sh
+++ b/test/indent/shell.sh
@@ -5,6 +5,12 @@ setlock -n /tmp/getmail.lock && echo getmail isn\'t running
 
 # adsgsdg
 
+if foo; then
+    if bar; then
+       toto
+    fi
+fi                              # bug#15613
+
 case $X in
     foo)
         do_something