summaryrefslogtreecommitdiffstats
path: root/misc
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-11-28 14:56:32 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-11-28 14:56:32 +0000
commit1b0f69032fdfa49aa229ba1c265d0fe4c9a68aae (patch)
tree645af2c635e9d5835c04e9136b163940ae4ef0c1 /misc
parentefd250b09d2a5d583c54ab8d2a974b3e6acfa053 (diff)
downloadruby-1b0f69032fdfa49aa229ba1c265d0fe4c9a68aae.tar.gz
ruby-1b0f69032fdfa49aa229ba1c265d0fe4c9a68aae.tar.xz
ruby-1b0f69032fdfa49aa229ba1c265d0fe4c9a68aae.zip
* eval.c (rb_thread_select): should subtract timeofday() from
limit, not reverse. * util.c (scan_hex): x is not a hexadecimal digit. * eval.c (rb_thread_schedule): should treat the case that select(2) returns 0, if a thread is under both WAIT_SELECT and WAIT_TIME. Jakub Travnik <J.Travnik@sh.cvut.cz> actually fixed this bug. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@1862 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'misc')
-rw-r--r--misc/ruby-mode.el7
1 files changed, 7 insertions, 0 deletions
diff --git a/misc/ruby-mode.el b/misc/ruby-mode.el
index 7f7cebef7..efd61254f 100644
--- a/misc/ruby-mode.el
+++ b/misc/ruby-mode.el
@@ -522,7 +522,14 @@ The variable ruby-indent-level controls the amount of indentation.
(re-search-backward "#" (save-excursion
(beginning-of-line)
(point)) t)
+ (save-excursion
+ (forward-char -1)
+ (not (looking-at "\\?")))
(skip-chars-backward " \t")
+ (if (save-excursion
+ (forward-char -1)
+ (looking-at "\\?"))
+ (skip-chars-forward " \t"))
(setq state (ruby-parse-region parse-start (point)))
(nth 0 state)
(goto-char pos)))