diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-03-31 14:15:48 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-03-31 14:15:48 +0000 |
| commit | 2cda63027d3acf3057cba6e7f4b77adaef5cbb20 (patch) | |
| tree | 5d5d6383bcb7de94bf06849cabe1fef57e24f6ed | |
| parent | eb239b43344665308eafc105b5a7318486f82410 (diff) | |
* 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
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | misc/ruby-mode.el | 7 |
2 files changed, 10 insertions, 2 deletions
@@ -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. diff --git a/misc/ruby-mode.el b/misc/ruby-mode.el index 48d91836f2..c799d8c52c 100644 --- a/misc/ruby-mode.el +++ b/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 () |