Fix infloop in indentation code

e63ace37 · Daniel Colascione · 2db9da01 · e63ace37 · e63ace37
Commit e63ace37 authored Dec 30, 2013 by Daniel Colascione
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

lisp/ChangeLog lisp/ChangeLog +6 -0

lisp/progmodes/sh-script.el lisp/progmodes/sh-script.el +2 -2

No files found.
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
+2013-12-30  Daniel Colascione  <dancol@dancol.org>
+
+	* progmodes/sh-script.el
+	(sh-smie-sh-forward-token,sh-smie-rc-forward-token): Fix infloop
+	in indentation code.  (Bug#16233)
+
 2013-12-28  João Távora  <joaotavora@gmail.com>

 	* elec-pair.el (electric-pair-post-self-insert-function): Don't

--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -1844,7 +1844,7 @@ Does not preserve point."
            ";")
        (let ((semi (sh-smie--newline-semi-p)))
          (forward-line 1)
-          (if semi ";"
+          (if (or semi (eobp)) ";"
            (sh-smie-sh-forward-token))))
    (forward-comment (point-max))
    (cond
@@ -2070,7 +2070,7 @@ Point should be before the newline."
            ";")
        (let ((semi (sh-smie--rc-newline-semi-p)))
          (forward-line 1)
-          (if semi ";"
+          (if (or semi (eobp)) ";"
            (sh-smie-rc-forward-token))))
    (forward-comment (point-max))
    (cond