* misc/ruby-mode.el (ruby-here-doc-beg-match): fix for here-doc

  which ends with an underscore.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@26294 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 13 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 82d2e29226..13a75fa945 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jan 12 12:49:39 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-here-doc-beg-match): fix for here-doc
+	  which ends with an underscore.
+
 Mon Jan 11 13:30:35 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/webrick/accesslog.rb (WEBrick::AccessLog#format): fixed typo.
diff --git a/misc/ruby-mode.el b/misc/ruby-mode.el
index 09b0e63065..85ad8e4ee8 100644
--- a/misc/ruby-mode.el
+++ b/misc/ruby-mode.el
@@ -80,13 +80,15 @@
                (match-string 6)))))
 
 (defun ruby-here-doc-beg-match ()
-  (let ((contents (regexp-quote (concat (match-string 2) (match-string 3)))))
+  (let ((contents (concat
+		   (regexp-quote (concat (match-string 2) (match-string 3)))
+		   (if (string= (match-string 3) "_") "\\B" "\\b"))))
     (concat "<<"
             (let ((match (match-string 1)))
               (if (and match (> (length match) 0))
                   (concat "\\(?:-\\([\"']?\\)\\|\\([\"']\\)" (match-string 1) "\\)"
-                          contents "\\b\\(\\1\\|\\2\\)")
-                (concat "-?\\([\"']\\|\\)" contents "\\b\\1"))))))
+                          contents "\\(\\1\\|\\2\\)")
+                (concat "-?\\([\"']\\|\\)" contents "\\1"))))))
 
 (defconst ruby-delimiter
   (concat "[?$/%(){}#\"'`.:]\\|<<\\|\\[\\|\\]\\|\\<\\("
diff --git a/version.h b/version.h
index b5a4453bf9..6c947dbd18 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.8"
-#define RUBY_RELEASE_DATE "2010-01-11"
+#define RUBY_RELEASE_DATE "2010-01-12"
 #define RUBY_VERSION_CODE 188
-#define RUBY_RELEASE_CODE 20100111
+#define RUBY_RELEASE_CODE 20100112
 #define RUBY_PATCHLEVEL -1
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 8
 #define RUBY_RELEASE_YEAR 2010
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 11
+#define RUBY_RELEASE_DAY 12
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];