From cced56ef7c45d74fb1593e18f7137c144d8b8b44 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 30 Nov 2005 04:50:04 +0000
Subject: * misc/ruby-mode.el (ruby-expr-beg): support $! at the end of  
 expression.   [ruby-dev:27868]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9634 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog               | 10 ++++++++++
 lib/complex.rb          |  9 ++-------
 lib/drb/drb.rb          |  2 +-
 lib/xmlrpc/datetime.rb  |  2 +-
 misc/ruby-mode.el       |  2 +-
 test/test_shellwords.rb |  6 ------
 6 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 69b7181728..5b3939e8c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Nov 30 13:43:07 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-expr-beg): support $! at the end of
+	  expression.   [ruby-dev:27868]
+
 Mon Nov 28 20:24:22 2005  Tanaka Akira  <akr@m17n.org>
 
 	* lib/pp.rb (PP::PPMethods#object_address_group): mask an address with
@@ -54,6 +59,11 @@ Sat Nov 26 19:57:45 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* dln.c (conv_to_posix_path): should initialize posix.
 
+Fri Nov 25 20:34:56 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/xmlrpc/datetime.rb (DateTime::to_a): comparison with non
+	  array-convertible object must return false.
+
 Fri Nov 25 14:34:09 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* range.c (range_max): treat end exclusion without iteration if
diff --git a/lib/complex.rb b/lib/complex.rb
index 9300f391e8..110a28ee7e 100644
--- a/lib/complex.rb
+++ b/lib/complex.rb
@@ -305,13 +305,8 @@ class Complex < Numeric
     Complex(@real, -@image)
   end
   alias conj conjugate
-  
-  #
-  # Compares the absolute values of the two numbers.
-  #
-  def <=> (other)
-    self.abs <=> other.abs
-  end
+
+  undef <=>
   
   #
   # Test for numerical equality (<tt>a == a + 0<i>i</i></tt>).
diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb
index 689416ac70..4c46909500 100644
--- a/lib/drb/drb.rb
+++ b/lib/drb/drb.rb
@@ -1549,7 +1549,7 @@ module DRb
 	  end
 	  ary.collect(&@obj)[0]
 	else
-	  @obj.__send__(@msg_id, *@argv)
+	  @obj.funcall(@msg_id, *@argv)
 	end
       end
 
diff --git a/lib/xmlrpc/datetime.rb b/lib/xmlrpc/datetime.rb
index 298263fe8a..f66ef8963a 100644
--- a/lib/xmlrpc/datetime.rb
+++ b/lib/xmlrpc/datetime.rb
@@ -127,7 +127,7 @@ class DateTime
   end
 
   def ==(o)
-    Array(self) == Array(o)
+    self.to_a == Array(o) rescue false
   end
 
 end
diff --git a/misc/ruby-mode.el b/misc/ruby-mode.el
index da4c4386ad..fa84d5b3c5 100644
--- a/misc/ruby-mode.el
+++ b/misc/ruby-mode.el
@@ -318,7 +318,7 @@ The variable ruby-indent-level controls the amount of indentation.
 	    (and (looking-at "[!?]")
 		 (or (not (eq option 'modifier))
 		     (bolp)
-		     (save-excursion (forward-char -1) (looking-at "\\Sw"))))
+		     (save-excursion (forward-char -1) (looking-at "\\Sw$"))))
 	    (and (looking-at ruby-symbol-re)
 		 (skip-chars-backward ruby-symbol-chars)
 		 (cond
diff --git a/test/test_shellwords.rb b/test/test_shellwords.rb
index 1d914c5c0e..ddb2d870b0 100644
--- a/test/test_shellwords.rb
+++ b/test/test_shellwords.rb
@@ -11,12 +11,6 @@ class TestShellwords < Test::Unit::TestCase
   end
 
 
-  def test_not_string  
-      assert_raises ArgumentError do 
-        shellwords(@not_string)
-    end
-  end
-  
   def test_string
     assert_instance_of(Array, shellwords(@cmd))
     assert_equal(4, shellwords(@cmd).length)
-- 
cgit v1.2.3