mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-25 07:40:40 -07:00
Code Issues Projects Releases Wiki Activity

Fix infloop in indentation code

Browse source
This commit is contained in:
Daniel Colascione 2013-12-30 15:16:34 -08:00
parent 2db9da01bd
commit e63ace374c
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -1,3 +1,9 @@
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

4
lisp/progmodes/sh-script.el
View file

@ -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