[Emacs-diffs] Changes to emacs/lisp/subr.el,v

[Kim F. Storm]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kim F. Storm <kfstorm>  06/10/22 22:32:53

Index: subr.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/subr.el,v
retrieving revision 1.530
retrieving revision 1.531
diff -u -b -r1.530 -r1.531
--- subr.el     18 Oct 2006 10:56:46 -0000      1.530
+++ subr.el     22 Oct 2006 22:32:53 -0000      1.531
@@ -1100,13 +1100,19 @@
 into a hook function that will be run only after loading the package.
 `eval-after-load' provides one way to do this.  In some cases
 other hooks, such as major mode hooks, can do the job."
-  (if (if compare-fn
+  (if (cond
+       ((eq compare-fn 'eq)
+       (memq element (symbol-value list-var)))
+       ((eq compare-fn 'eql)
+       (memql element (symbol-value list-var)))
+       (compare-fn
          (let (present)
            (dolist (elt (symbol-value list-var))
              (if (funcall compare-fn element elt)
                  (setq present t)))
-           present)
-       (member element (symbol-value list-var)))
+         present))
+       (t
+       (member element (symbol-value list-var))))
       (symbol-value list-var)
     (set list-var
         (if append
@@ -1752,7 +1758,13 @@
     (or nodisp (redisplay))
     (let ((read (read-event nil nil seconds)))
       (or (null read)
-         (progn (push read unread-command-events)
+         (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)
                 nil))))))
 
 ;;; Atomic change groups.