[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r115437: * lisp/progmodes/ruby-mode.el (ruby-smie--i
From: |
Dmitry Gutov |
Subject: |
[Emacs-diffs] trunk r115437: * lisp/progmodes/ruby-mode.el (ruby-smie--implicit-semi-p): Return t |
Date: |
Mon, 09 Dec 2013 04:19:28 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 115437
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Gutov <address@hidden>
branch nick: trunk
timestamp: Mon 2013-12-09 06:19:16 +0200
message:
* lisp/progmodes/ruby-mode.el (ruby-smie--implicit-semi-p): Return t
after the end of a percent literal.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/progmodes/ruby-mode.el
rubymode.el-20091113204419-o5vbwnq5f7feedwu-8804
test/indent/ruby.rb ruby.rb-20120424165921-h044139hbrd7snvw-1
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-12-09 03:43:34 +0000
+++ b/lisp/ChangeLog 2013-12-09 04:19:16 +0000
@@ -1,3 +1,8 @@
+2013-12-09 Dmitry Gutov <address@hidden>
+
+ * progmodes/ruby-mode.el (ruby-smie--implicit-semi-p): Return t
+ after the end of a percent literal.
+
2013-12-09 Cameron Desautels <address@hidden> (tiny change)
* progmodes/ruby-mode.el (ruby-forward-string): Document. Handle
=== modified file 'lisp/progmodes/ruby-mode.el'
--- a/lisp/progmodes/ruby-mode.el 2013-12-09 03:43:34 +0000
+++ b/lisp/progmodes/ruby-mode.el 2013-12-09 04:19:16 +0000
@@ -362,8 +362,8 @@
(and (memq (char-before)
'(?\; ?- ?+ ?* ?/ ?: ?. ?, ?\[ ?\( ?\{ ?\\ ?& ?> ?< ?%
?~ ?^))
- ;; Make sure it's not the end of a regexp.
- (not (eq (car (syntax-after (1- (point)))) 7)))
+ ;; Not the end of a regexp or a percent literal.
+ (not (memq (car (syntax-after (1- (point)))) '(7 15))))
(and (eq (char-before) ?\?)
(equal (save-excursion (ruby-smie--backward-token)) "?"))
(and (eq (char-before) ?=)
=== modified file 'test/indent/ruby.rb'
--- a/test/indent/ruby.rb 2013-11-12 14:15:14 +0000
+++ b/test/indent/ruby.rb 2013-12-09 04:19:16 +0000
@@ -299,3 +299,6 @@
tee
end
end
+
+%^abc^
+ddd
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r115437: * lisp/progmodes/ruby-mode.el (ruby-smie--implicit-semi-p): Return t,
Dmitry Gutov <=