diff options
| author | Stefan Monnier | 2013-04-24 23:25:34 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2013-04-24 23:25:34 -0400 |
| commit | ced3fc5d2f65236af6595db93b064b77a5cdedfd (patch) | |
| tree | 5561e1ba6f887b733499a1b4c1650158332cf1e4 /lisp/progmodes | |
| parent | 1c141dad8705e27c311a1c86436131c47f49dcc9 (diff) | |
| download | emacs-ced3fc5d2f65236af6595db93b064b77a5cdedfd.tar.gz emacs-ced3fc5d2f65236af6595db93b064b77a5cdedfd.zip | |
* lisp/progmodes/octave-mod.el (octave-smie-forward-token): Only emit
semi-colons if the line is not otherwise empty.
* lisp/emacs-lisp/smie.el (smie-indent--hanging-p): Don't burp at EOB.
(smie-indent-keyword): Improve the check to ensure that the next
comment is really on the same line.
(smie-indent-comment): Don't align with a subsequent closer (or eob).
Fixes: debbugs:14218
Diffstat (limited to 'lisp/progmodes')
| -rw-r--r-- | lisp/progmodes/octave-mod.el | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/progmodes/octave-mod.el b/lisp/progmodes/octave-mod.el index 4683186e603..d161754cad9 100644 --- a/lisp/progmodes/octave-mod.el +++ b/lisp/progmodes/octave-mod.el | |||
| @@ -482,6 +482,7 @@ Non-nil means always go to the next Octave code line after sending." | |||
| 482 | (forward-comment 1)) | 482 | (forward-comment 1)) |
| 483 | (cond | 483 | (cond |
| 484 | ((and (looking-at "$\\|[%#]") | 484 | ((and (looking-at "$\\|[%#]") |
| 485 | (not (smie-rule-bolp)) | ||
| 485 | ;; Ignore it if it's within parentheses. | 486 | ;; Ignore it if it's within parentheses. |
| 486 | (prog1 (let ((ppss (syntax-ppss))) | 487 | (prog1 (let ((ppss (syntax-ppss))) |
| 487 | (not (and (nth 1 ppss) | 488 | (not (and (nth 1 ppss) |