aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/progmodes
diff options
context:
space:
mode:
authorStefan Monnier2013-10-07 12:56:51 -0400
committerStefan Monnier2013-10-07 12:56:51 -0400
commitd2e0e79548df07e8e2f7a7cf2e5d9b353f547efd (patch)
tree0d7fbc9cdc70b190c00acc21cded7c93e13ace3e /lisp/progmodes
parentbdc6b4c8f6953c561317abf1bad7fc0c0cd069de (diff)
downloademacs-d2e0e79548df07e8e2f7a7cf2e5d9b353f547efd.tar.gz
emacs-d2e0e79548df07e8e2f7a7cf2e5d9b353f547efd.zip
* lisp/emacs-lisp/smie.el (smie-next-sexp): Refine last fix.
* lisp/progmodes/ruby-mode.el (ruby-smie-rules): Tweak handling of open braces.
Diffstat (limited to 'lisp/progmodes')
-rw-r--r--lisp/progmodes/ruby-mode.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index b8c24e8a690..6497fb6b7d0 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -414,7 +414,8 @@ Also ignores spaces after parenthesis when 'space."
414 (`(:before . ,(or `"(" `"[" `"{")) 414 (`(:before . ,(or `"(" `"[" `"{"))
415 ;; Treat purely syntactic block-constructs as being part of their parent, 415 ;; Treat purely syntactic block-constructs as being part of their parent,
416 ;; when the opening statement is hanging. 416 ;; when the opening statement is hanging.
417 (if (smie-rule-hanging-p) (smie-rule-parent))) 417 (when (smie-rule-hanging-p)
418 (smie-backward-sexp 'halfsexp) (smie-indent-virtual)))
418 (`(:after . "=") 2) 419 (`(:after . "=") 2)
419 (`(:before . "do") 420 (`(:before . "do")
420 (when (or (smie-rule-hanging-p) 421 (when (or (smie-rule-hanging-p)