From: Po Lu <luangruo@yahoo.com>
Date: Sat, 8 Jan 2022 12:53:02 +0000 (+0800)
Subject: Fix pinch-to-scale on real X servers and NS
X-Git-Tag: emacs-29.0.90~3195
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e05512ba42dea3064965367df59732cc71515435;p=emacs.git

Fix pinch-to-scale on real X servers and NS

* lisp/face-remap.el (text-scale-pinch): Stop waiting for
more events.
---

diff --git a/lisp/face-remap.el b/lisp/face-remap.el
index 95207959dd3..00560f9d2e1 100644
--- a/lisp/face-remap.el
+++ b/lisp/face-remap.el
@@ -400,15 +400,6 @@ a top-level keymap, `text-scale-increase' or
   (interactive "e")
   (when (not (eq (event-basic-type event) 'pinch))
     (error "`text-scale-pinch' bound to bad event type"))
-  (let ((evt))
-    (catch 'done
-      (while t
-        (unless (and (setq evt (read-event nil nil 0.01))
-                     (eq (car evt) 'pinch))
-          (throw 'done nil))))
-    (when (and (consp evt)
-               (eq (car evt) 'pinch))
-      (setq event evt)))
   (let ((window (posn-window (nth 1 event)))
         (scale (nth 4 event))
         (dx (nth 2 event))