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/ChangeLog | |
| 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/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d6d96545165..7bce53d7caf 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,13 @@ | |||
| 1 | 2013-04-25 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * emacs-lisp/smie.el (smie-indent--hanging-p): Don't burp at EOB. | ||
| 4 | (smie-indent-keyword): Improve the check to ensure that the next | ||
| 5 | comment is really on the same line. | ||
| 6 | (smie-indent-comment): Don't align with a subsequent closer (or eob). | ||
| 7 | |||
| 8 | * progmodes/octave-mod.el (octave-smie-forward-token): Only emit | ||
| 9 | semi-colons if the line is not otherwise empty (bug#14218). | ||
| 10 | |||
| 1 | 2013-04-25 Glenn Morris <rgm@gnu.org> | 11 | 2013-04-25 Glenn Morris <rgm@gnu.org> |
| 2 | 12 | ||
| 3 | * vc/vc-bzr.el (vc-bzr-print-log): Tweak LIMIT = 1 case. | 13 | * vc/vc-bzr.el (vc-bzr-print-log): Tweak LIMIT = 1 case. |