summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-06 22:32:38 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-06 22:32:38 +0000
commitce231cdbdd21b82dd3e3753d03fc4275ec346208 (patch)
tree859f1cdf40c0a9d8a89189cbf81acc4f29758437
parent2d1c5d2c248938d0a957c2c811fcb40b7cf81e0b (diff)
* misc/ruby-mode.el: don't crash the whole mode if the Subversion
$ keyword isn't interpolated. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19203 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog3
-rw-r--r--misc/ruby-mode.el5
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 76348cd6f4..aca5a8cf0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ Sun Sep 7 07:24:09 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* misc/ruby-mode.el: improve here-doc performance.
+ * misc/ruby-mode.el: don't crash the whole mode if the Subversion
+ $ keyword isn't interpolated.
+
Sun Sep 7 06:31:51 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* file.c (file_expand_path): applied a patch from Nobuhiro Tachino
diff --git a/misc/ruby-mode.el b/misc/ruby-mode.el
index a2755f44e0..e37cc4eab8 100644
--- a/misc/ruby-mode.el
+++ b/misc/ruby-mode.el
@@ -9,9 +9,8 @@
"Ruby mode revision string.")
(defconst ruby-mode-version
- (progn
- (string-match "[0-9.]+" ruby-mode-revision)
- (substring ruby-mode-revision (match-beginning 0) (match-end 0)))
+ (and (string-match "[0-9.]+" ruby-mode-revision)
+ (substring ruby-mode-revision (match-beginning 0) (match-end 0)))
"Ruby mode version number.")
(defconst ruby-block-beg-re