knu	2013-12-17 17:33:01 +0900 (Tue, 17 Dec 2013)

  New Revision: 44261

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=44261

  Log:
    misc/ruby-electric.el: Import version 2.1.1.
    
      * ruby-electric-delete-backward-char: Enable support for number
        prefix.
    
      * ruby-electric-curlies: Fix electric operation after an open
        curly.

  Modified files:
    trunk/ChangeLog
    trunk/misc/ruby-electric.el
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 44260)
+++ ChangeLog	(revision 44261)
@@ -1,3 +1,14 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Tue Dec 17 17:30:56 2013  Akinori MUSHA  <knu@i...>
+
+	* misc/ruby-electric.el: Import version 2.1.1 from
+	  https://github.com/knu/ruby-electric.el.
+
+	  * ruby-electric-delete-backward-char: Enable support for number
+	    prefix.
+
+	  * ruby-electric-curlies: Fix electric operation after an open
+	    curly.
+
 Tue Dec 17 16:19:09 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* vm_trace.c (rb_postponed_job_flush): isolate exceptions in
Index: misc/ruby-electric.el
===================================================================
--- misc/ruby-electric.el	(revision 44260)
+++ misc/ruby-electric.el	(revision 44261)
@@ -10,7 +10,7 @@ https://github.com/ruby/ruby/blob/trunk/misc/ruby-electric.el#L10
 ;; URL: https://github.com/knu/ruby-electric.el
 ;; Keywords: languages ruby
 ;; License: The same license terms as Ruby
-;; Version: 2.1
+;; Version: 2.1.1
 
 ;;; Commentary:
 ;;
@@ -366,7 +366,9 @@ enabled." https://github.com/ruby/ruby/blob/trunk/misc/ruby-electric.el#L366
         (t
          (insert "#")
          (forward-char 1)
-         (insert "}"))))))))
+         (insert "}")))))
+    (t
+     (setq this-command 'self-insert-command)))))
 
 (defun ruby-electric-hash(arg)
   (interactive "*P")
@@ -447,7 +449,7 @@ enabled." https://github.com/ruby/ruby/blob/trunk/misc/ruby-electric.el#L449
           (setq this-command 'self-insert-command)))))
 
 (defun ruby-electric-delete-backward-char(arg)
-  (interactive "*P")
+  (interactive "*p")
   (cond ((memq last-command '(ruby-electric-matching-char
                               ruby-electric-bar))
          (delete-char 1))
@@ -466,7 +468,7 @@ enabled." https://github.com/ruby/ruby/blob/trunk/misc/ruby-electric.el#L468
         ((eq last-command 'ruby-electric-hash)
          (and (char-equal (preceding-char) ?{)
               (delete-char 1))))
-  (delete-char -1))
+  (delete-char (- arg)))
 
 (provide 'ruby-electric)
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/