diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-09-13 09:29:41 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-09-13 09:29:41 +0000 |
| commit | 1990397c5cf15c9f8fb84cc20acc75a90dd583a5 (patch) | |
| tree | 7354b11ca4154e8649499018e8c1d1c8da7b87a0 | |
| parent | a0cc731f586023953fb69aacfbedd0350ced98f6 (diff) | |
* misc/ruby-mode.el (ruby-parse-partial): better here-doc support.
a patch from Marshall T. Vandegrift <llasram at gmail.com>.
[ruby-core:08804]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10920 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | misc/ruby-mode.el | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,9 @@ +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. diff --git a/misc/ruby-mode.el b/misc/ruby-mode.el index 12c60a1d84..ff22e49981 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))) |