Mercurial > emacs
diff lisp/ChangeLog @ 108849:84f3cdac426c
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Thu, 27 May 2010 06:41:59 +0000 |
| parents | d674108e8753 |
| children | f1cd90ef7663 |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed May 26 22:43:08 2010 +0000 +++ b/lisp/ChangeLog Thu May 27 06:41:59 2010 +0000 @@ -1,3 +1,16 @@ +2010-05-27 Stefan Monnier <monnier@iro.umontreal.ca> + + * emacs-lisp/smie.el (smie-forward-token-function) + (smie-backward-token-function): New vars. + (smie-backward-sexp, smie-forward-sexp) + (smie-indent-hanging-p, smie-indent-calculate): Use them. + (smie-default-backward-token): Rename from smie-backward-token and + skip comments. + (smie-default-forward-token): Rename from smie-forward-token and + skip comments. + (smie-next-sexp): Handle nil results from next-token. + (smie-indent-calculate): Add a new case for special `fixindent' comments. + 2010-05-26 Stefan Monnier <monnier@iro.umontreal.ca> * progmodes/ada-xref.el (ada-gnat-parse-gpr):