summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Gutov <dgutov@yandex.ru>2016-03-16 15:58:21 +0200
committerDmitry Gutov <dgutov@yandex.ru>2016-03-16 16:16:50 +0200
commitee9a1f7ee9573b11a0e5f6ccf0258a290087f6a4 (patch)
tree6f6434388cc6c991f26b631f008792807c8f0990
parentc3ed95b1c57265138b7673ea37eef2d30204abcc (diff)
downloademacs-ee9a1f7ee9573b11a0e5f6ccf0258a290087f6a4.tar.gz
Support safe navigation operator in non-SMIE indentation code
* lisp/progmodes/ruby-mode.el (ruby-calculate-indent): Support safe navigation operator in non-SMIE indentation code. Cherry-picked from https://github.com/ruby/ruby/commit/68e16ddd7961b86e5013e62ae2954e88638de058.
-rw-r--r--lisp/progmodes/ruby-mode.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 60480d603c3..2389f742937 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -1374,7 +1374,7 @@ delimiter."
(goto-char ruby-indent-point)
(beginning-of-line)
(skip-syntax-forward " ")
- (if (looking-at "\\.[^.]")
+ (if (looking-at "\\.[^.]\\|&\\.")
(+ indent ruby-indent-level)
indent))))