diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-10-05 14:37:08 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-10-05 14:37:08 -0400 |
| commit | 34d1a1337df479908d6a7076a35d693050ae518d (patch) | |
| tree | 5dfb8d449d7f6ef5404e72a26c3c3ad5d94237fa /lisp/emacs-lisp/smie.el | |
| parent | aa0214dae5260f7523fc6d0aa0ca94eb5f46e09b (diff) | |
| download | emacs-34d1a1337df479908d6a7076a35d693050ae518d.tar.gz emacs-34d1a1337df479908d6a7076a35d693050ae518d.tar.bz2 emacs-34d1a1337df479908d6a7076a35d693050ae518d.zip | |
Get Ruby's SMIE code to pass the test suite.
* lisp/progmodes/ruby-mode.el (ruby-use-smie): Change default.
(ruby-comment-column): Follow the global default, by default.
(ruby-smie-grammar): Add assignment syntax.
(ruby-smie--implicit-semi-p): No implicit semi-colon after an
open-paren, a comma, or a \.
(ruby-smie--forward-token, ruby-smie--backward-token): Handle heredocs,
and line continuations.
(ruby-smie-rules): Adjust handling of open-paren, now that it's never
followed by implicit semi-colons. Add rule for string concatenation
and for indentation at BOB.
(ruby-forward-sexp, ruby-backward-sexp): Adjust for when smie is in use.
* lisp/emacs-lisp/smie.el (smie-next-sexp): Don't go back to pos before
calling next-sexp, since next-token may have skipped chars which
next-sexp doesn't know should be skipped!
* test/indent/ruby.rb: Port a few cases from automated/ruby-mode-tests.el.
Adjust indentation of continued line to the new SMIE behavior.
Diffstat (limited to 'lisp/emacs-lisp/smie.el')
| -rw-r--r-- | lisp/emacs-lisp/smie.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el index f9d0fd9366b..e35cb4a8fc2 100644 --- a/lisp/emacs-lisp/smie.el +++ b/lisp/emacs-lisp/smie.el @@ -707,7 +707,7 @@ Possible return values: ((null toklevels) (when (zerop (length token)) (condition-case err - (progn (goto-char pos) (funcall next-sexp 1) nil) + (progn (funcall next-sexp 1) nil) (scan-error (let ((pos (nth 2 err))) (throw 'return |