From: Juanma Barranquero <lekktu@gmail.com>
Date: Mon, 23 Sep 2013 02:58:02 +0000 (+0200)
Subject: Remove references to universal-argument-num-events.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1476
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=57b16162ceacfd46efd784f0693b210b85d82762;p=emacs.git

Remove references to universal-argument-num-events.

* lisp/autoarg.el (autoarg-kp-digit-argument):
* lisp/electric.el (Electric-command-loop):
* lisp/kmacro.el (kmacro-step-edit-insert):
  Do not set universal-argument-num-events.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0cc066b010e..f5cdbcbb9b2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2013-09-23  Juanma Barranquero  <lekktu@gmail.com>
+
+	* autoarg.el (autoarg-kp-digit-argument):
+	* electric.el (Electric-command-loop):
+	* kmacro.el (kmacro-step-edit-insert):
+	Do not set universal-argument-num-events.
+
 2013-09-22  Leo Liu  <sdl.web@gmail.com>
 
 	* files.el (interpreter-mode-alist): Add octave.
diff --git a/lisp/autoarg.el b/lisp/autoarg.el
index 6878995454a..7501f09c773 100644
--- a/lisp/autoarg.el
+++ b/lisp/autoarg.el
@@ -75,7 +75,6 @@
 	   (setq prefix-arg (if (zerop digit) '- (- digit))))
 	  (t
 	   (setq prefix-arg digit))))
-  (setq universal-argument-num-events (length (this-command-keys)))
   (setq overriding-terminal-local-map universal-argument-map))
 
 (defvar autoarg-kp-mode-map
diff --git a/lisp/electric.el b/lisp/electric.el
index 351468fd75d..36ec4a00b88 100644
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -78,8 +78,6 @@
       (setq last-command-event (aref cmd (1- (length cmd)))
 	    this-command (key-binding cmd t)
 	    cmd this-command)
-      ;; This makes universal-argument-other-key work.
-      (setq universal-argument-num-events 0)
       (if (or (prog1 quit-flag (setq quit-flag nil))
 	      (eq last-input-event ?\C-g))
 	  (progn (setq unread-command-events nil
diff --git a/lisp/kmacro.el b/lisp/kmacro.el
index d6de2feb3fc..d20b54eba35 100644
--- a/lisp/kmacro.el
+++ b/lisp/kmacro.el
@@ -1194,12 +1194,10 @@ following additional answers: `insert', `insert-1', `replace', `replace-1',
 	  (setq cmd 'ignore)
 	  nil)
 	 ((memq cmd kmacro-step-edit-prefix-commands)
-	  (setq universal-argument-num-events 0)
 	  (reset-this-command-lengths)
 	  nil)
 	 ((eq cmd 'universal-argument-other-key)
 	  (setq kmacro-step-edit-action t)
-	  (setq universal-argument-num-events 0)
 	  (reset-this-command-lengths)
 	  (if (numberp kmacro-step-edit-inserting)
 	      (setq kmacro-step-edit-inserting nil))
@@ -1214,7 +1212,6 @@ following additional answers: `insert', `insert-1', `replace', `replace-1',
 	  (setq kmacro-step-edit-prefix-index nil)
 	  (reset-this-command-lengths)
 	  (setq overriding-terminal-local-map nil)
-	  (setq universal-argument-num-events nil)
 	  (setq next-index kmacro-step-edit-key-index)
 	  t)
 	 (t nil))