procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/progmodes/ruby-mode.el (ruby-syntax-propertize-heredoc): Leave

Browse source 
point at bol following the heredoc openers.
(ruby-syntax-propertize-expansions): Remove.
This commit is contained in:
Dmitry Gutov 2013-05-19 10:52:22 +04:00
parent 1a0a0a8a6a
commit 462388b673
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -16,11 +16,12 @@
call to `ruby-syntax-propertize-function'.
(ruby-syntax-propertize-expansion): Extracted from
`ruby-syntax-propertize-expansions'. Handles one expansion.
(ruby-syntax-propertize-heredoc): Explicitly call
`ruby-syntax-propertize-expansions'.
(ruby-syntax-propertize-percent-literal): Leave point right after
the percent symbol, so that the expression expansion rule can
propertize the contents.
(ruby-syntax-propertize-heredoc): Leave point at bol following the
heredoc openers.
(ruby-syntax-propertize-expansions): Remove.
2013-05-18 Juri Linkov <juri@jurta.org>

10
lisp/progmodes/ruby-mode.el
View file

@ -1435,7 +1435,7 @@ It will be properly highlighted even when the call omits parens.")
(line-end-position) t)
(unless (ruby-singleton-class-p (match-beginning 0))
(push (concat (ruby-here-doc-end-match) "\n") res))))
(let ((start (point)))
(save-excursion
;; With multiple openers on the same line, we don't know in which
;; part `start' is, so we have to go back to the beginning.
(when (cdr res)
@ -1445,11 +1445,9 @@ It will be properly highlighted even when the call omits parens.")
(if (null res)
(put-text-property (1- (point)) (point)
'syntax-table (string-to-syntax "\""))))
;; Make extra sure we don't move back, lest we could fall into an
;; inf-loop.
(if (< (point) start)
(goto-char start)
(ruby-syntax-propertize-expansions start (point)))))))
;; End up at bol following the heredoc openers.
;; Propertize expression expansions from this point forward.
))))
(defun ruby-syntax-enclosing-percent-literal (limit)
(let ((state (syntax-ppss))