Mercurial > emacs
changeset 108912:c7e85ff4bca6
* lisp/emacs-lisp/smie.el (smie-indent-keyword): Remove special case that
can be handled with a ((:before "fn") (:prev "=>" parent)) rule.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Tue, 08 Jun 2010 22:58:26 -0400 |
| parents | a7f706d2c627 |
| children | c05344a913c8 |
| files | lisp/ChangeLog lisp/emacs-lisp/smie.el |
| diffstat | 2 files changed, 10 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Jun 08 15:05:11 2010 +0200 +++ b/lisp/ChangeLog Tue Jun 08 22:58:26 2010 -0400 @@ -1,3 +1,8 @@ +2010-06-09 Stefan Monnier <monnier@iro.umontreal.ca> + + * emacs-lisp/smie.el (smie-indent-keyword): Remove special case that + can be handled with a ((:before "fn") (:prev "=>" parent)) rule. + 2010-06-07 Martin Pohlack <mp26@os.inf.tu-dresden.de> * iimage.el: Remove images as soon as the underlying text is modified.
--- a/lisp/emacs-lisp/smie.el Tue Jun 08 15:05:11 2010 +0200 +++ b/lisp/emacs-lisp/smie.el Tue Jun 08 22:58:26 2010 -0400 @@ -45,7 +45,7 @@ ;; the parser's state; ;; - because of that locality, indentation also works just fine when earlier ;; parts of the buffer are syntactically incorrect since the indentation -;; looks at "as little as possible" of the buffer make an indentation +;; looks at "as little as possible" of the buffer to make an indentation ;; decision. ;; - they typically have no error handling and can't even detect a parsing ;; error, so we don't have to worry about what to do in case of a syntax @@ -58,8 +58,10 @@ ;; and Ceriel Jacobs (BookBody.pdf available at ;; http://www.cs.vu.nl/~dick/PTAPG.html). ;; -;; OTOH we had to kill many chickens, read many coffee grounds, and practiced -;; untold numbers of black magic spells. +;; OTOH we had to kill many chickens, read many coffee grounds, and practice +;; untold numbers of black magic spells, to come up with the indentation code. +;; Since then, some of that code has been beaten into submission, but the +;; smie-indent-keyword is still pretty obscure. ;;; Code: @@ -700,12 +702,6 @@ ;; -> d ;; So as to align with the earliest appropriate place. (smie-indent-virtual)) - ((equal token (save-excursion - (funcall smie-backward-token-function))) - ;; in cases such as "fn x => fn y => fn z =>", - ;; jump back to the very first fn. - ;; FIXME: should we only do that for special tokens like "=>"? - (smie-indent-virtual)) ((setq tmp (assoc (cons (caddr res) token) smie-indent-rules)) (goto-char (cadr res))