* bug#16233: sh-smie-sh-forward-toke recurses forever
@ 2013-12-23 23:07 Daniel Colascione
2013-12-23 23:30 ` Daniel Colascione
2013-12-30 23:23 ` bug#16233: Done Daniel Colascione
0 siblings, 2 replies; 3+ messages in thread
From: Daniel Colascione @ 2013-12-23 23:07 UTC (permalink / raw)
To: 16233
In latest trunk, sh-smie-sh-forward-token has started to recurse
forever. Here's the repro:
"if "
Create a buffer containing these three characters, put it in
shell-script-mode, goto-char 2, and eval (funcall show-paren-data-function)
^ permalink raw reply [flat|nested] 3+ messages in thread
* bug#16233: sh-smie-sh-forward-toke recurses forever
2013-12-23 23:07 bug#16233: sh-smie-sh-forward-toke recurses forever Daniel Colascione
@ 2013-12-23 23:30 ` Daniel Colascione
2013-12-30 23:23 ` bug#16233: Done Daniel Colascione
1 sibling, 0 replies; 3+ messages in thread
From: Daniel Colascione @ 2013-12-23 23:30 UTC (permalink / raw)
To: 16233
On 12/23/2013 03:07 PM, Daniel Colascione wrote:
> In latest trunk, sh-smie-sh-forward-token has started to recurse
> forever. Here's the repro:
>
> "if "
>
> Create a buffer containing these three characters, put it in
> shell-script-mode, goto-char 2, and eval (funcall show-paren-data-function)
This patch appears to be fix the problem. Okay to apply?
=== modified file 'lisp/progmodes/sh-script.el'
--- lisp/progmodes/sh-script.el 2013-12-20 21:41:57 +0000
+++ lisp/progmodes/sh-script.el 2013-12-23 23:29:31 +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
^ permalink raw reply [flat|nested] 3+ messages in thread
* bug#16233: Done
2013-12-23 23:07 bug#16233: sh-smie-sh-forward-toke recurses forever Daniel Colascione
2013-12-23 23:30 ` Daniel Colascione
@ 2013-12-30 23:23 ` Daniel Colascione
1 sibling, 0 replies; 3+ messages in thread
From: Daniel Colascione @ 2013-12-30 23:23 UTC (permalink / raw)
To: 16233-done
Pushed to trunk
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-12-30 23:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-23 23:07 bug#16233: sh-smie-sh-forward-toke recurses forever Daniel Colascione
2013-12-23 23:30 ` Daniel Colascione
2013-12-30 23:23 ` bug#16233: Done Daniel Colascione
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).