diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-02-26 17:15:00 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-02-26 17:15:00 +0000 |
commit | cf6068c38dbd71edb3ba2bb10394dff6e23eac9f (patch) | |
tree | 9a59a2a739ca7ddbf1d798c7b5ebf66fd927944f /misc | |
parent | 30ef90e7cf1bb5b69e0268af65033d84d808a7b5 (diff) | |
download | ruby-cf6068c38dbd71edb3ba2bb10394dff6e23eac9f.tar.gz ruby-cf6068c38dbd71edb3ba2bb10394dff6e23eac9f.tar.xz ruby-cf6068c38dbd71edb3ba2bb10394dff6e23eac9f.zip |
* eval.c (localjump_destination): lambda should not interfere
return from the yielded block.
* hash.c (delete_if_i): use st_delete_safe() (via
rb_hash_delete()) instead of returning ST_DELETE.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@5842 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'misc')
-rw-r--r-- | misc/ruby-mode.el | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/misc/ruby-mode.el b/misc/ruby-mode.el index f1762e6b5..a52b00893 100644 --- a/misc/ruby-mode.el +++ b/misc/ruby-mode.el @@ -683,11 +683,9 @@ The variable ruby-indent-level controls the amount of indentation. (setq end nil)) (goto-char (or end pos)) (skip-chars-backward " \t") - (and - (setq state (ruby-parse-region parse-start (point))) - (nth 0 state) - (setq begin (cdr (nth 1 state))) - (goto-char pos))) + (setq state (ruby-parse-region parse-start (point))) + (setq begin (or (nth 0 state) (cdr (nth 1 state)))) + (goto-char pos)) (or (bobp) (forward-char -1)) (and (or (and (looking-at ruby-symbol-re) |