aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/progmodes/ruby-mode.el2
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0b08cd6bad9..2dbd981d8d5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
12013-10-22 Stefan Monnier <monnier@iro.umontreal.ca> 12013-10-23 Dmitry Gutov <dgutov@yandex.ru>
2
3 * progmodes/ruby-mode.el (ruby-smie--at-dot-call): Use
4 `following-char'.
2 5
62013-10-22 Stefan Monnier <monnier@iro.umontreal.ca>
3 7
4 * emacs-lisp/smie.el (smie-rule-parent): Fix opener-test. 8 * emacs-lisp/smie.el (smie-rule-parent): Fix opener-test.
5 * progmodes/ruby-mode.el (ruby-smie-rules): 9 * progmodes/ruby-mode.el (ruby-smie-rules):
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index fa681e5cde3..a9c4cf95700 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -355,7 +355,7 @@ explicitly declared in magic comment."
355 (memq (char-syntax (char-after pos)) '(?w ?\")))) 355 (memq (char-syntax (char-after pos)) '(?w ?\"))))
356 356
357(defun ruby-smie--at-dot-call () 357(defun ruby-smie--at-dot-call ()
358 (and (eq ?w (char-syntax (char-after))) 358 (and (eq ?w (char-syntax (following-char)))
359 (eq (char-before) ?.) 359 (eq (char-before) ?.)
360 (not (eq (char-before (1- (point))) ?.)))) 360 (not (eq (char-before (1- (point))) ?.))))
361 361