From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 29 May 2014 15:36:09 +0000 (-0400)
Subject: * lisp/subr.el (sit-for): Remove universal-arg dependency.
X-Git-Tag: emacs-25.0.90~2612^2~709^2~849
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d41708691ff9907262d87cedbbe05df108f6d6ce;p=emacs.git

* lisp/subr.el (sit-for): Remove universal-arg dependency.
---

diff --git a/lisp/subr.el b/lisp/subr.el
index 73dd0fe71df..282b85eb1e4 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2181,12 +2181,16 @@ floating point support."
     (let ((read (read-event nil t seconds)))
       (or (null read)
 	  (progn
-	    ;; If last command was a prefix arg, e.g. C-u, push this event onto
-	    ;; unread-command-events as (t . EVENT) so it will be added to
-	    ;; this-command-keys by read-key-sequence.
-	    (if (eq overriding-terminal-local-map universal-argument-map)
-		(setq read (cons t read)))
-	    (push read unread-command-events)
+            ;; https://lists.gnu.org/archive/html/emacs-devel/2006-10/msg00394.html
+            ;; We want `read' appear in the next command's this-command-event
+            ;; but not in the current one.
+            ;; By pushing (cons t read), we indicate that `read' has not
+            ;; yet been recorded in this-command-keys, so it will be recorded
+            ;; next time it's read.
+            ;; And indeed the `seconds' argument to read-event correctly
+            ;; prevented recording this event in the current command's
+            ;; this-command-keys.
+	    (push (cons t read) unread-command-events)
 	    nil))))))
 
 ;; Behind display-popup-menus-p test.