* misc/ruby-mode.el: better support for general delimited

  strings.  [ruby-dev:22695]

* lib/weakref.rb (WeakRef::initialize): set up @__id before
  calling "super".

* lib/delegate.rb (Delegator::initialize): preserve
  singleton_method_added method [ruby-dev:22685]

* lib/delegate.rb (Delegator::initialize): use Kernel::raise
  instead of mere raise.  [ruby-dev:22681]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5565 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 6 deletions

diff --git a/ruby.h b/ruby.h
index 8790a2863b..f9dad9b08a 100644
--- a/ruby.h
+++ b/ruby.h
@@ -638,9 +638,7 @@ rb_class_of(obj)
 	if (obj == Qnil)   return rb_cNilClass;
 	if (obj == Qfalse) return rb_cFalseClass;
     }
-    else{
-	return RBASIC(obj)->klass;
-    }
+    return RBASIC(obj)->klass;
 }
 
 static inline int
@@ -661,9 +659,7 @@ rb_type(obj)
 	if (obj == Qnil) return T_NIL;
 	if (obj == Qfalse) return T_FALSE;
     }
-    else{
-	return BUILTIN_TYPE(obj);
-    }
+    return BUILTIN_TYPE(obj);
 }
 
 static inline int