diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-06-07 09:34:27 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-06-07 09:34:27 -0700 |
| commit | 2aa6b47e3e216410195cf7ec3abb5902f38082fa (patch) | |
| tree | 1b993c346dd4b6e92df488e1228411a6c737fef0 /lisp/progmodes/ruby-mode.el | |
| parent | 5bc3263303bde93db32b0799ecee0cfa9fe40e9a (diff) | |
| parent | 6e3adf8a4a796cea4328a528da48fc972b3feed6 (diff) | |
| download | emacs-2aa6b47e3e216410195cf7ec3abb5902f38082fa.tar.gz | |
Merge from origin/emacs-25
6e3adf8 Fix crash in syntax.c after GC
973ce5a Improve squiggly heredoc support in non-SMIE Ruby mode
9d5cceb Fix doc string quoting
0b33a23 Fix mouse dragging of vertical dividers with scroll bars on l...
a5d05f4 * etc/PROBLEMS: Mention the link-time problems on FreeBSD 11.
Diffstat (limited to 'lisp/progmodes/ruby-mode.el')
| -rw-r--r-- | lisp/progmodes/ruby-mode.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el index cd3b04de712..d75edbc84ef 100644 --- a/lisp/progmodes/ruby-mode.el +++ b/lisp/progmodes/ruby-mode.el @@ -1151,7 +1151,7 @@ delimiter." ((looking-at "<<") (cond ((and (ruby-expr-beg 'heredoc) - (looking-at "<<\\(-\\)?\\(\\([\"'`]\\)\\([^\n]+?\\)\\3\\|\\(?:\\sw\\|\\s_\\)+\\)")) + (looking-at "<<\\([-~]\\)?\\(\\([\"'`]\\)\\([^\n]+?\\)\\3\\|\\(?:\\sw\\|\\s_\\)+\\)")) (setq re (regexp-quote (or (match-string 4) (match-string 2)))) (if (match-beginning 1) (setq re (concat "\\s *" re))) (let* ((id-end (goto-char (match-end 0))) |