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 0cc066b010eac9633460d51605fa6f630490c340..f5cdbcbb9b223c2c579127b5e920c184e23d68c9 100644 (file)
--- 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 6878995454a72db6f815109e02dddb2898d81080..7501f09c7733e70fb687447b42f06e360a8db5c7 100644 (file)
--- 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 351468fd75d5da6ae346b73aac8887a1a6fb7c25..36ec4a00b881fe18df21de540b2857c26f11d28a 100644 (file)
--- 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 d6de2feb3fcfacb448ba8528df0c447033fd1b38..d20b54eba35801a9c1906ac331ebb2beb939cb5a 100644 (file)
--- 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))