diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | misc/ruby-mode.el | 2 |
2 files changed, 7 insertions, 5 deletions
@@ -1,11 +1,13 @@ +Wed Sep 13 18:25:18 2006 Yukihiro Matsumoto <matz@ruby-lang.org> + + * misc/ruby-mode.el (ruby-parse-partial): better here-doc support. + a patch from Marshall T. Vandegrift <llasram at gmail.com>. + [ruby-core:08804] + Wed Sep 13 16:43:36 2006 Yukihiro Matsumoto <matz@ruby-lang.org> * string.c (rb_str_intern): prohibit interning tainted string. - * string.c (rb_str_intern): allow symbols to contains nul. - - * string.c (sym_inspect): symbol may contain nul. - Wed Sep 13 01:14:02 2006 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/optparse.rb (OptionParser#getopts): works with pre-registered diff --git a/misc/ruby-mode.el b/misc/ruby-mode.el index fa84d5b3c5..c44b4c7875 100644 --- a/misc/ruby-mode.el +++ b/misc/ruby-mode.el @@ -523,7 +523,7 @@ The variable ruby-indent-level controls the amount of indentation. ((looking-at "<<") (cond ((and (ruby-expr-beg 'heredoc) - (looking-at "<<\\(-\\)?\\(\\([\"'`]\\)\\([^\n]+?\\)\\3\\|\\sw+\\)")) + (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))) |