* misc/ruby-mode.el (ruby-brace-to-do-end, ruby-do-end-to-brace):

adjust space between block beginning and block arguments

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

ChangeLog

@@ -1,3 +1,8 @@
+Thu Mar 31 23:15:46 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-mode.el (ruby-brace-to-do-end, ruby-do-end-to-brace):
+	  adjust space between block beginning and block arguments
+
 Thu Mar 31 20:42:05 2011  Tanaka Akira  <akr@fsij.org>
 
 	* ext/strscan/strscan.c:  parenthesize macro arguments.

misc/ruby-mode.el

@@ -1177,8 +1177,9 @@ balanced expression is found."
 	(if (eq (char-syntax (char-before)) ?w)
 	    (insert " "))
 	(insert "do")
-	(if (eq (char-syntax (char-after)) ?w)
-	    (insert " "))
+	(when (looking-at "\\sw\\||")
+	  (insert " ")
+	  (backward-char))
 	t))))
 
 (defun ruby-do-end-to-brace ()
@@ -1193,6 +1194,8 @@ balanced expression is found."
 	(goto-char orig)
 	(delete-char 2)
 	(insert "{")
+	(if (looking-at "\\s +|")
+	    (delete-char (- (match-end 0) (match-beginning 0) 1)))
 	t))))
 
 (defun ruby-toggle-block ()