From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#47060: mouse-1-click-follows-link double broken by 3d5e31eceb9dc1fb62b2b27bcab549df3bd04ce9 Date: Thu, 11 Mar 2021 09:55:24 -0500 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="30057"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: 47060@debbugs.gnu.org To: Eyal Soha Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Mar 11 16:48:57 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lKNYW-0007f8-MZ for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 11 Mar 2021 16:48:56 +0100 Original-Received: from localhost ([::1]:35560 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lKNYV-0007x6-Lv for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 11 Mar 2021 10:48:55 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:44556) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKMjK-0008Kp-II for bug-gnu-emacs@gnu.org; Thu, 11 Mar 2021 09:56:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:43096) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lKMjK-0007Ki-AW for bug-gnu-emacs@gnu.org; Thu, 11 Mar 2021 09:56:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lKMjK-0001ZE-2m for bug-gnu-emacs@gnu.org; Thu, 11 Mar 2021 09:56:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 11 Mar 2021 14:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47060 X-GNU-PR-Package: emacs Original-Received: via spool by 47060-submit@debbugs.gnu.org id=B47060.16154745356011 (code B ref 47060); Thu, 11 Mar 2021 14:56:02 +0000 Original-Received: (at 47060) by debbugs.gnu.org; 11 Mar 2021 14:55:35 +0000 Original-Received: from localhost ([127.0.0.1]:54642 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lKMit-0001Yt-26 for submit@debbugs.gnu.org; Thu, 11 Mar 2021 09:55:35 -0500 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:13683) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lKMiq-0001Q7-V8 for 47060@debbugs.gnu.org; Thu, 11 Mar 2021 09:55:33 -0500 Original-Received: from pmg2.iro.umontreal.ca (localhost.localdomain [127.0.0.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id 095AE8078F; Thu, 11 Mar 2021 09:55:27 -0500 (EST) Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id 5B94980618; Thu, 11 Mar 2021 09:55:25 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1615474525; bh=tdy+m7ckOZ3jY2vqxQ92j/4pTdE7bsHEEivmm+IiFcI=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=CAc/DAtzoqSyOah3Cq04BWti3O1hGFiPA/ovq4o1MNf3gVSWZ8SLIlCXLyiuJU/rc wAE/4WJeLdHKXQ/L+9uj/NSdCNr50RxUtMtmOSA8HRs8MzVaBbnzc5zKy3sbsoCn9Y WX2RcqYUqB2VAWGytVnV8x20Z2bigpkgw9/mjDtqKK8joXUfTtdtcf0udtWS21tE8h 7kUZEwzBJETwSkPLKXrpAtv0r0YAahgX/OuPMe+W3SYqgBi+DMyJJP/yrLFgWzwkOe C8lSVXh/UCbk49PvlBQFB6OxUwrSxuzvmHKoYMjoaUhm04o9xMqzn5HzCYLFDFYfGP Q09DdQxkr7Gvg== Original-Received: from alfajor (unknown [216.154.43.249]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id 337A212023A; Thu, 11 Mar 2021 09:55:25 -0500 (EST) In-Reply-To: (Eyal Soha's message of "Wed, 10 Mar 2021 14:02:12 -0700") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:202066 Archived-At: > Setting the variable mouse-1-click-follows-link to 'double was broken by > the commit 3d5e31eceb9dc1fb62b2b27bcab549df3bd04ce9 . Indeed! And since this code can be sometimes tricky to debug and tune, your report got me scared that I was going to have to rethink the way it works, but ... it was a silly mistake: I called `event-convert-list` with a list whose last element was not always a "basic" event, so we ended up comparing `down-double-mouse-1` and `double-down-mouse-1` and deciding these are different events. The patch below should fix it. I think this patch should go to `emacs-27`. Eli any objection? Stefan diff --git a/lisp/mouse.el b/lisp/mouse.el index 8732fb8086..f4979e37b0 100644 --- a/lisp/mouse.el +++ b/lisp/mouse.el @@ -119,7 +119,9 @@ mouse--click-1-maybe-follows-link (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