emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] trunk r115813: Fix infloop in indentation code


From: Daniel Colascione
Subject: [Emacs-diffs] trunk r115813: Fix infloop in indentation code
Date: Mon, 30 Dec 2013 23:19:10 +0000
User-agent: Bazaar (2.6b2)

------------------------------------------------------------
revno: 115813
revision-id: address@hidden
parent: address@hidden
committer: Daniel Colascione <address@hidden>
branch nick: trunk
timestamp: Mon 2013-12-30 15:16:34 -0800
message:
  Fix infloop in indentation code
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/progmodes/sh-script.el    shscript.el-20091113204419-o5vbwnq5f7feedwu-727
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-12-28 19:26:54 +0000
+++ b/lisp/ChangeLog    2013-12-30 23:16:34 +0000
@@ -1,3 +1,9 @@
+2013-12-30  Daniel Colascione  <address@hidden>
+
+       * 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  <address@hidden>
 
        * elec-pair.el (electric-pair-post-self-insert-function): Don't

=== modified file 'lisp/progmodes/sh-script.el'
--- a/lisp/progmodes/sh-script.el       2013-12-20 21:41:57 +0000
+++ b/lisp/progmodes/sh-script.el       2013-12-30 23:16:34 +0000
@@ -1844,7 +1844,7 @@
             ";")
         (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 @@
             ";")
         (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


reply via email to

[Prev in Thread] Current Thread [Next in Thread]