[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 1feddd3 5/5: Merge from origin/emacs-27
From: |
Glenn Morris |
Subject: |
master 1feddd3 5/5: Merge from origin/emacs-27 |
Date: |
Fri, 12 Mar 2021 11:47:53 -0500 (EST) |
branch: master
commit 1feddd35abb3b3a1ac4b63c24de53d491d596ba0
Merge: 069ff11 02a5cfc
Author: Glenn Morris <rgm@gnu.org>
Commit: Glenn Morris <rgm@gnu.org>
Merge from origin/emacs-27
02a5cfce47 (origin/emacs-27) * lisp/mouse.el: Fix mouse-1-clock-follo...
c881e990e3 * lisp/emacs-lisp/gv.el (edebug-after): Don't run the gett...
---
lisp/emacs-lisp/gv.el | 3 +--
lisp/mouse.el | 4 +++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/lisp/emacs-lisp/gv.el b/lisp/emacs-lisp/gv.el
index 3d80549..ce48e57 100644
--- a/lisp/emacs-lisp/gv.el
+++ b/lisp/emacs-lisp/gv.el
@@ -324,8 +324,7 @@ The return value is the last VAL in the list.
(gv-letplace (getter setter) place
(funcall do `(edebug-after ,before ,index ,getter)
(lambda (store)
- `(progn (edebug-after ,before ,index ,getter)
- ,(funcall setter store)))))))
+ `(edebug-after ,before ,index ,(funcall setter store)))))))
;;; The common generalized variables.
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 8732fb8..f4979e3 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -119,7 +119,9 @@ Expects to be bound to `(double-)mouse-1' in
`key-translation-map'."
(time-since (cdr mouse--last-down))
(/ (abs mouse-1-click-follows-link) 1000.0))))))
(eq (car mouse--last-down)
- (event-convert-list (list 'down (car-safe last-input-event))))
+ (event-convert-list
+ `(down ,@(event-modifiers last-input-event)
+ ,(event-basic-type last-input-event))))
(let* ((action (mouse-on-link-p (event-start last-input-event))))
(when (and action
(or mouse-1-click-in-non-selected-windows