From ed3b657d7db2b62bd7bf80495417aea73d1ddd1e Mon Sep 17 00:00:00 2001
From: knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 15 Apr 2013 13:15:17 +0000
Subject: misc/ruby-electric.el: Minor refactoring.

* misc/ruby-electric.el (ruby-electric-insert): Check
  ruby-electric-is-last-command-char-expandable-punct-p here.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40306 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog             |   5 +++
 misc/ruby-electric.el | 102 +++++++++++++++++++++++++-------------------------
 2 files changed, 56 insertions(+), 51 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index aafb666970..c98b6bb50a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Apr 15 21:55:12 2013  Akinori MUSHA  <knu@iDaemons.org>
+
+	* misc/ruby-electric.el (ruby-electric-insert): Check
+	  ruby-electric-is-last-command-char-expandable-punct-p here.
+
 Mon Apr 15 12:54:42 2013  Martin Bosslet  <Martin.Bosslet@gmail.com>
 
 	* ext/openssl/ossl_ssl.c: Correct shutdown behavior w.r.t GC.
diff --git a/misc/ruby-electric.el b/misc/ruby-electric.el
index a0cbdc8513..994343dcb1 100644
--- a/misc/ruby-electric.el
+++ b/misc/ruby-electric.el
@@ -184,59 +184,60 @@ strings. Note that you must have Font Lock enabled."
 (defmacro ruby-electric-insert (arg &rest body)
   `(cond ((ruby-electric-cua-replace-region-p)
           (ruby-electric-cua-replace-region))
-         ((null ,arg)
+         ((and
+           (null ,arg)
+           (ruby-electric-is-last-command-char-expandable-punct-p))
           (self-insert-command 1)
           ,@body)
          (t
+          (setq this-command 'self-insert-command)
           (self-insert-command (prefix-numeric-value ,arg)))))
 
 (defun ruby-electric-curlies(arg)
   (interactive "P")
   (ruby-electric-insert
    arg
-   (if (ruby-electric-is-last-command-char-expandable-punct-p)
+   (cond
+    ((ruby-electric-code-at-point-p)
+     (insert "}")
+     (backward-char 1)
+     (redisplay)
+     (cond
+      ((ruby-electric-string-at-point-p) ;; %w{}, %r{}, etc.
+       t)
+      (ruby-electric-newline-before-closing-bracket
+       (insert " ")
+       (save-excursion
+         (newline)
+         (ruby-indent-line t)))
+      (t
+       (insert "  ")
+       (backward-char 1))))
+    ((ruby-electric-string-at-point-p)
+     (save-excursion
+       (backward-char 1)
        (cond
-        ((ruby-electric-code-at-point-p)
-         (insert "}")
-         (backward-char 1)
-         (redisplay)
-         (cond
-          ((ruby-electric-string-at-point-p) ; %w{}, %r{}, etc.
-           t)
-          (ruby-electric-newline-before-closing-bracket
-           (insert " ")
-           (save-excursion
-             (newline)
-             (ruby-indent-line t)))
-          (t
-           (insert "  ")
-           (backward-char 1))))
-        ((ruby-electric-string-at-point-p)
-         (save-excursion
-           (backward-char 1)
-           (cond
-            ((char-equal ?\# (preceding-char))
-             (unless (save-excursion
-                       (backward-char 1)
-                       (ruby-electric-escaped-p))
-               (forward-char 1)
-               (insert "}")))
-            ((ruby-electric-command-char-expandable-punct-p ?\#)
-             t) ; no need for the following if ruby-electric-hash is enabled
-            ((ruby-electric-escaped-p)
-             t)
-            (t
-             (insert "#")
-             (forward-char 1)
-             (insert "}")))))))))
+        ((char-equal ?\# (preceding-char))
+         (unless (save-excursion
+                   (backward-char 1)
+                   (ruby-electric-escaped-p))
+           (forward-char 1)
+           (insert "}")))
+        ((or
+          (ruby-electric-command-char-expandable-punct-p ?\#)
+          (ruby-electric-escaped-p))
+         t)
+        (t
+         (insert "#")
+         (forward-char 1)
+         (insert "}"))))))))
 
 (defun ruby-electric-hash(arg)
   (interactive "P")
   (ruby-electric-insert
    arg
-   (and (ruby-electric-is-last-command-char-expandable-punct-p)
-        (ruby-electric-string-at-point-p)
-        (or (looking-at "'") ; likely to be in ''
+   (and (ruby-electric-string-at-point-p)
+        (or (char-equal (following-char) ?') ;; likely to be in ''
             (save-excursion
               (backward-char 1)
               (ruby-electric-escaped-p))
@@ -246,22 +247,21 @@ strings. Note that you must have Font Lock enabled."
 
 (defun ruby-electric-matching-char(arg)
   (interactive "P")
-  (ruby-electric-insert arg
-    (and (ruby-electric-is-last-command-char-expandable-punct-p)
-         (ruby-electric-code-at-point-p)
-         (save-excursion
-           (insert (cdr (assoc last-command-event
-                               ruby-electric-matching-delimeter-alist)))))))
+  (ruby-electric-insert
+   arg
+   (and (ruby-electric-code-at-point-p)
+        (save-excursion (insert (cdr (assoc last-command-event
+                                            ruby-electric-matching-delimeter-alist)))))))))
 
 (defun ruby-electric-bar(arg)
   (interactive "P")
-  (ruby-electric-insert arg
-    (and (ruby-electric-is-last-command-char-expandable-punct-p)
-         (ruby-electric-code-at-point-p)
-         (and (save-excursion (re-search-backward ruby-electric-expandable-bar nil t))
-              (= (point) (match-end 0))) ;looking-back is missing on XEmacs
-         (save-excursion
-           (insert "|")))))
+  (ruby-electric-insert
+   arg
+   (and (ruby-electric-code-at-point-p)
+        (save-excursion (re-search-backward ruby-electric-expandable-bar nil t))
+        (= (point) (match-end 0)) ;; looking-back is missing on XEmacs
+        (save-excursion
+          (insert "|")))))
 
 
 (provide 'ruby-electric)
-- 
cgit v1.2.3