diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-10-22 11:45:56 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-10-22 11:45:56 -0400 |
| commit | 7790a27058bf9ec3dcdf31746853f125d6c84693 (patch) | |
| tree | d442063842db4cf1366fe6b33277c8695769de36 /lisp/emacs-lisp/smie.el | |
| parent | a034ece0661ca20229e69e134a31fd1501b391e9 (diff) | |
| download | emacs-7790a27058bf9ec3dcdf31746853f125d6c84693.tar.gz emacs-7790a27058bf9ec3dcdf31746853f125d6c84693.tar.bz2 emacs-7790a27058bf9ec3dcdf31746853f125d6c84693.zip | |
* lisp/emacs-lisp/smie.el (smie-rule-parent): Fix opener-test.
* lisp/progmodes/ruby-mode.el (ruby-smie-rules):
Remove corresponding workaround. Fix indentation rule of ";" so it
also applies when ";" is the parent.
Diffstat (limited to 'lisp/emacs-lisp/smie.el')
| -rw-r--r-- | lisp/emacs-lisp/smie.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el index ebb82f4bf54..f1ffdec5ec4 100644 --- a/lisp/emacs-lisp/smie.el +++ b/lisp/emacs-lisp/smie.el @@ -1242,7 +1242,8 @@ Only meaningful when called from within `smie-rules-function'." ;; rules-function, so it gives it a chance to tweak ;; indentation (e.g. by forcing indentation relative to ;; its own parent, as in fn a => fn b => fn c =>). - (if (or (listp (car smie--parent)) (smie-indent--hanging-p)) + (if (or (not (numberp (car smie--parent))) + (smie-indent--hanging-p)) (smie-indent-virtual) (current-column)))))) (defvar smie-rule-separator-outdent 2) |