emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] trunk r114433: Remove references to universal-argument-num


From: Juanma Barranquero
Subject: [Emacs-diffs] trunk r114433: Remove references to universal-argument-num-events.
Date: Mon, 23 Sep 2013 02:58:10 +0000
User-agent: Bazaar (2.6b2)

------------------------------------------------------------
revno: 114433
revision-id: address@hidden
parent: address@hidden
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Mon 2013-09-23 04:58:02 +0200
message:
  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.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/autoarg.el                autoarg.el-20091113204419-o5vbwnq5f7feedwu-1807
  lisp/electric.el               electric.el-20091113204419-o5vbwnq5f7feedwu-47
  lisp/kmacro.el                 kmacro.el-20091113204419-o5vbwnq5f7feedwu-2431
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-09-22 12:23:20 +0000
+++ b/lisp/ChangeLog    2013-09-23 02:58:02 +0000
@@ -1,3 +1,10 @@
+2013-09-23  Juanma Barranquero  <address@hidden>
+
+       * 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  <address@hidden>
 
        * files.el (interpreter-mode-alist): Add octave.

=== modified file 'lisp/autoarg.el'
--- a/lisp/autoarg.el   2013-01-01 09:11:05 +0000
+++ b/lisp/autoarg.el   2013-09-23 02:58:02 +0000
@@ -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

=== modified file 'lisp/electric.el'
--- a/lisp/electric.el  2013-06-19 04:42:32 +0000
+++ b/lisp/electric.el  2013-09-23 02:58:02 +0000
@@ -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

=== modified file 'lisp/kmacro.el'
--- a/lisp/kmacro.el    2013-04-05 08:38:06 +0000
+++ b/lisp/kmacro.el    2013-09-23 02:58:02 +0000
@@ -1194,12 +1194,10 @@
          (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 @@
          (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))


reply via email to

[Prev in Thread] Current Thread [Next in Thread]