diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | lib/debug.rb | 4 | ||||
-rw-r--r-- | misc/ruby-mode.el | 2 | ||||
-rw-r--r-- | object.c | 3 |
4 files changed, 10 insertions, 5 deletions
@@ -1,3 +1,9 @@ +Mon Feb 4 15:38:29 2002 Yukihiro Matsumoto <matz@ruby-lang.org> + + * object.c (rb_class_real): should not follow ICLASS link + + * variable.c (classname): should follow ICLASS link explicitly. + Thu Jan 31 20:45:33 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp> * lib/mkmf.rb (dir_config): prior --with flag. diff --git a/lib/debug.rb b/lib/debug.rb index 2216f3a4df..3eadef9b74 100644 --- a/lib/debug.rb +++ b/lib/debug.rb @@ -448,7 +448,7 @@ class DEBUGGER__ stdout.print "At toplevel\n" end binding, binding_file, binding_line = @frames[frame_pos] - stdout.printf "#%d %s:%s\n", frame_pos, binding_file, binding_line + stdout.printf "#%d %s:%s\n", frame_pos+1, binding_file, binding_line when /^\s*down(?:\s+(\d+))?$/ previous_line = nil @@ -463,7 +463,7 @@ class DEBUGGER__ stdout.print "At stack bottom\n" end binding, binding_file, binding_line = @frames[frame_pos] - stdout.printf "#%d %s:%s\n", frame_pos, binding_file, binding_line + stdout.printf "#%d %s:%s\n", frame_pos+1, binding_file, binding_line when /^\s*fin(?:ish)?$/ if frame_pos == @frames.size diff --git a/misc/ruby-mode.el b/misc/ruby-mode.el index c365c20a3b..6f36a6bb9a 100644 --- a/misc/ruby-mode.el +++ b/misc/ruby-mode.el @@ -731,6 +731,8 @@ An end of a defun is found by moving forward from the beginning of one." (add-hook 'ruby-mode-hook '(lambda () (make-local-variable 'font-lock-defaults) + (make-local-variable 'font-lock-keywords) + (make-local-variable 'font-lock-syntactic-keywords) (setq font-lock-defaults '((ruby-font-lock-keywords) nil nil)) (setq font-lock-keywords ruby-font-lock-keywords) (setq font-lock-syntactic-keywords ruby-font-lock-syntactic-keywords))))) @@ -76,9 +76,6 @@ VALUE rb_class_real(cl) VALUE cl; { - if (TYPE(cl) == T_ICLASS) { - cl = RBASIC(cl)->klass; - } while (FL_TEST(cl, FL_SINGLETON) || TYPE(cl) == T_ICLASS) { cl = RCLASS(cl)->super; } |