diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-10-29 08:08:16 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-10-29 08:08:16 +0000 |
commit | 6c105b2dbfb56fcbcc77ed4b273e45908cfcbd50 (patch) | |
tree | 6c5d351eab06d9a153651f8e670faec009604fba /misc/ruby-mode.el | |
parent | 7e2d146b099a9213dbfa806de0e311cb7d21876e (diff) | |
download | ruby-6c105b2dbfb56fcbcc77ed4b273e45908cfcbd50.tar.gz ruby-6c105b2dbfb56fcbcc77ed4b273e45908cfcbd50.tar.xz ruby-6c105b2dbfb56fcbcc77ed4b273e45908cfcbd50.zip |
* eval.c (rb_thread_start_0): forget to free some memory chunks.
[ruby-core:03611]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@7135 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'misc/ruby-mode.el')
-rw-r--r-- | misc/ruby-mode.el | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/misc/ruby-mode.el b/misc/ruby-mode.el index 462ec609b..041ddc66f 100644 --- a/misc/ruby-mode.el +++ b/misc/ruby-mode.el @@ -521,10 +521,23 @@ The variable ruby-indent-level controls the amount of indentation. (looking-at "<<\\(-\\)?\\(\\([\"'`]\\)\\([^\n]+?\\)\\3\\|\\sw+\\)")) (setq re (regexp-quote (or (match-string 4) (match-string 2)))) (if (match-beginning 1) (setq re (concat "\\s *" re))) - (if (re-search-forward (concat "^" re "$") end 'move) - (forward-line 1) - (setq in-string (match-end 0)) - (goto-char end))) + (let* ((id-end (goto-char (match-end 0))) + (line-end-position (save-excursion (end-of-line) (point))) + (state (list in-string nest depth pcol indent))) + ;; parse the rest of the line + (while (and (> line-end-position (point)) + (setq state (apply 'ruby-parse-partial + line-end-position state)))) + (setq in-string (car state) + nest (nth 1 state) + depth (nth 2 state) + pcol (nth 3 state) + indent (nth 4 state)) + ;; skip heredoc section + (if (re-search-forward (concat "^" re "$") end 'move) + (forward-line 1) + (setq in-string id-end) + (goto-char end)))) (t (goto-char pnt)))) ((looking-at "^__END__$") |