summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--misc/ruby-mode.el9
2 files changed, 13 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 4aa94f7..372d710 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Jul 30 17:21:13 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
+
+ * misc/ruby-mode.el (ruby-accurate-end-of-block): incomplete block
+ caused infinite loop.
+
+ * misc/ruby-mode.el (ruby-parse-partial): returns nil unless
+ delimiters found.
+
Tue Jul 30 15:24:07 2002 WATANABE Hirofumi <eban@ruby-lang.org>
* ext/tcltklib/stubs.c (ruby_tcltk_stubs): win32_getenv returns
diff --git a/misc/ruby-mode.el b/misc/ruby-mode.el
index 2faec59..7bc5ec0 100644
--- a/misc/ruby-mode.el
+++ b/misc/ruby-mode.el
@@ -171,9 +171,10 @@ Also ignores spaces after parenthesis when 'space.")
(defun ruby-imenu-create-index ()
(nreverse (ruby-imenu-create-index-in-block nil (point-min) nil)))
-(defun ruby-accurate-end-of-block ()
+(defun ruby-accurate-end-of-block (&optional end)
(let (state)
- (while (>= (nth 2 (setq state (apply 'ruby-parse-partial end state))) 0))))
+ (while (and (setq state (apply 'ruby-parse-partial end state))
+ (>= (nth 2 state) 0)))))
(defun ruby-mode-variables ()
(set-syntax-table ruby-mode-syntax-table)
@@ -482,8 +483,8 @@ The variable ruby-indent-level controls the amount of indentation.
(t
(error (format "bad string %s"
(buffer-substring (point) pnt)
- ))))))
- (list in-string nest depth pcol))
+ )))))
+ (list in-string nest depth pcol)))
(defun ruby-parse-region (start end)
(let (state)