aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorDmitry Gutov2013-03-06 22:56:29 +0400
committerDmitry Gutov2013-03-06 22:56:29 +0400
commitab89e9f9a594c30ce4c04e6d502bee3beaefe908 (patch)
tree1f41ac1aab95f08ab04f3ffb6210b5156d461e6b /lisp
parenta611149e46d0a6927e9c276d4cf2089b7cfb7e05 (diff)
downloademacs-ab89e9f9a594c30ce4c04e6d502bee3beaefe908.tar.gz
emacs-ab89e9f9a594c30ce4c04e6d502bee3beaefe908.zip
* lisp/progmodes/ruby-mode.el (ruby-syntax-propertize-function): Only
propertize regexp when not inside a string. Fixes: debbugs:13885
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/progmodes/ruby-mode.el6
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 18242539cca..cef47715dc0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12013-03-06 Dmitry Gutov <dgutov@yandex.ru>
2
3 * progmodes/ruby-mode.el (ruby-syntax-propertize-function): Only
4 propertize regexp when not inside a string (Bug#13885).
5
12013-03-06 Alan Mackenzie <acm@muc.de> 62013-03-06 Alan Mackenzie <acm@muc.de>
2 7
3 Correct the position of point in some line-up functions. 8 Correct the position of point in some line-up functions.
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 9b007c0063a..6e471d1aa2a 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -1276,8 +1276,10 @@ It will be properly highlighted even when the call omits parens."))
1276 "\\)\\s *" 1276 "\\)\\s *"
1277 ;; The regular expression itself. 1277 ;; The regular expression itself.
1278 "\\(/\\)[^/\n\\\\]*\\(?:\\\\.[^/\n\\\\]*\\)*\\(/\\)") 1278 "\\(/\\)[^/\n\\\\]*\\(?:\\\\.[^/\n\\\\]*\\)*\\(/\\)")
1279 (2 (string-to-syntax "\"/")) 1279 (3 (unless (nth 3 (syntax-ppss (match-beginning 2)))
1280 (3 (string-to-syntax "\"/"))) 1280 (put-text-property (match-beginning 2) (match-end 2)
1281 'syntax-table (string-to-syntax "\"/"))
1282 (string-to-syntax "\"/"))))
1281 ("^=en\\(d\\)\\_>" (1 "!")) 1283 ("^=en\\(d\\)\\_>" (1 "!"))
1282 ("^\\(=\\)begin\\_>" (1 "!")) 1284 ("^\\(=\\)begin\\_>" (1 "!"))
1283 ;; Handle here documents. 1285 ;; Handle here documents.