From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#68213: 30.0.50; completion-preview-tests failure in --without-x build Date: Fri, 12 Jan 2024 19:16:02 -0500 Message-ID: References: <87ttnvr7x7.fsf@pub.pink> <83plyjzmlv.fsf@gnu.org> <874jfvr4rm.fsf@pub.pink> <83mstnzguy.fsf@gnu.org> <87il4bpcti.fsf@pub.pink> <83h6jqu7bc.fsf@gnu.org> Reply-To: Stefan Monnier Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="11070"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: john muhl , 68213@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Jan 13 01:17:19 2024 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 1rORiB-0002f8-7S for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 13 Jan 2024 01:17:19 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rORhx-0007Rf-Du; Fri, 12 Jan 2024 19:17:05 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rORhw-0007RW-5P for bug-gnu-emacs@gnu.org; Fri, 12 Jan 2024 19:17:04 -0500 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rORhv-0001mL-TF for bug-gnu-emacs@gnu.org; Fri, 12 Jan 2024 19:17:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rORht-0004HM-Ub for bug-gnu-emacs@gnu.org; Fri, 12 Jan 2024 19:17:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 13 Jan 2024 00:17:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68213 X-GNU-PR-Package: emacs Original-Received: via spool by 68213-submit@debbugs.gnu.org id=B68213.170510497314094 (code B ref 68213); Sat, 13 Jan 2024 00:17:01 +0000 Original-Received: (at 68213) by debbugs.gnu.org; 13 Jan 2024 00:16:13 +0000 Original-Received: from localhost ([127.0.0.1]:37992 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rORh6-0003ec-W9 for submit@debbugs.gnu.org; Fri, 12 Jan 2024 19:16:13 -0500 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:44968) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rORh2-0003RX-5y for 68213@debbugs.gnu.org; Fri, 12 Jan 2024 19:16:11 -0500 Original-Received: from pmg2.iro.umontreal.ca (localhost.localdomain [127.0.0.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id 34ECF812A8; Fri, 12 Jan 2024 19:16:04 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1705104962; bh=mNc7MkBU/VUj4x5jnjGQHVkUa/YFvRcsKYknUmJOlUY=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=f3OtvM1G9CfYL3X+78+PjwlYY7a0ARg4y5ZMoRxTVGYAFUXXAT6lUy3OYsqNXTVc0 DuvAOPDr9cH2IpyI/eOS7yM988rujUJ4pG5AnPvgBPWx0vj6K+HA+6Jb14jSl6GrwJ Q9JaviNldqfAoAaFDvzWZud1GYJBTI04FYEg9tIYLn/wzG9gIojcoH0RIQi6fNC1fS F9Kj5lMhi8REu/dgFkbub3zohbvMXMDXPg7V34uXjlMCLB1wP9W1NmWOci43T8Of1t oPoO2eziR7blxqW++kwx7tmvAg3hvxkbk+5oOPTJ7l5dm3PYPFNLfAZGgyRHkOxaWZ 69GxOSFvC892Q== Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id C948680BDD; Fri, 12 Jan 2024 19:16:02 -0500 (EST) Original-Received: from pastel (65-110-221-238.cpe.pppoe.ca [65.110.221.238]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id 9FA5712032C; Fri, 12 Jan 2024 19:16:02 -0500 (EST) In-Reply-To: <83h6jqu7bc.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 06 Jan 2024 11:42:15 +0200") 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-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:278073 Archived-At: I just pushed to `scratch/mwheel-no-alts` a set of patches which I intend to push to `master` soon. They should fix the test failure in `completion-preview`, and they get rid of the `mouse-wheel-*-alternate-event`s. Any comments/objections while I work on the corresponding etc/NEWS and Texinfo changes? Stefan commit ee2a8fd4cff84cd5bd672fdde8ec3e0800f132be Author: Stefan Monnier Date: Tue Jan 9 11:34:05 2024 -0500 (mouse-wheel-*-event): Minor cleanups * lisp/mwheel.el (mwheel-event-button): Mark as obsolete alias. Change all callers. * lisp/edmacro.el (mouse-wheel-*-event): Move declarations to ... (edmacro-fix-menu-commands): ... where we do know that they should be defined. Obey `mouse-wheel-*-alternate-event`s as well. commit a764b503e126a60ff4ea1266da924de7b020637e Author: Stefan Monnier Date: Fri Jan 12 17:50:09 2024 -0500 (mwheel--is-dir-p): New macro to reduce code duplication It also slightly reduces memory allocation. * lisp/mwheel.el (mwheel--is-dir-p): New macro. (mwheel-scroll, mouse-wheel-text-scale) (mouse-wheel-global-text-scale): Use it. commit 3bd8e963f7c8d762551c2528b2f907b613218a08 Author: Stefan Monnier Date: Fri Jan 12 18:05:14 2024 -0500 * lisp/keymap.el (define-keymap): Demote "duplicate def" to a warning commit b9959e94d26bdd406d506ef355612627a0b1406b Author: Stefan Monnier Date: Fri Jan 12 18:08:31 2024 -0500 * lisp/completion-preview.el: Fix use in non-GUI session Fix loading in non-GUI sessions where `mwheel` is not preloaded. Not requiring `mwheel` would be a lot more complex, since it would require delaying the construction of `completion-preview--mouse-map`. * lisp/completion-preview.el (): Require `mwheel`. Remove correspondingly redundant `defvar`s. (completion-preview--mouse-map): Use `key-description` rather than mimicking it with `format`. commit b0f04ce4d3495de8593e3b64ddd218cd3bad221c Author: Stefan Monnier Date: Fri Jan 12 18:28:12 2024 -0500 mwheel.el: Unconditionally use the `wheel-up/down/...` events The `mouse-wheel-DIR-event` vars were introduced because under X11 we get different `mouse-N` events depending on the users' mouse and those same events can be used for other things for other rodents, so we can't unconditionally treat those events as mouse-wheel events. But this does not apply to the `wheel-up/down/...` events. So hard code them. * lisp/mwheel.el (mwheel--is-dir-p): Always consider the `wheel-DIR` events. (mouse-wheel--setup-bindings): Always bind the `wheel-DIR` events. * lisp/completion-preview.el (completion-preview--mouse-map): Unconditionally bind the `wheel-DIR` events. * lisp/edmacro.el (edmacro-fix-menu-commands): Hard code the `wheel-DIR` events as mouse events regardless of `mouse-wheel-*-event`s. * lisp/progmodes/flymake.el (flymake--mode-line-counter-map): Do nothing, because it's already been done in commit e5be6c7ae309. commit 8cb8b9736532fdd8f2fc734b08ed55c17b922806 Author: Stefan Monnier Date: Fri Jan 12 18:52:37 2024 -0500 mwheel.el: Remove `mouse-wheel-*-alternate-event` vars Now that `wheel-DIR` events are hardcoded, we never need more than one variable (which we actually never needed anyway, we could have let `mouse-wheel-*-event` vars hold lists of events instead), so remove the `mouse-wheel-*-alternate-event` vars by merging their default value into that of the corresponding `mouse-wheel-*-event`. * lisp/mwheel.el (mouse-wheel-down-event, mouse-wheel-up-event) (mouse-wheel-left-event, mouse-wheel-right-event): Don't bother holding `wheel-DIR` events since these are already handled anyway. Hold the event that would have been held in `mouse-wheel-DIR-alternate-event` instead. (mouse-wheel-down-alternate-event, mouse-wheel-up-alternate-event) (mouse-wheel-left-alternate-event, mouse-wheel-right-alternate-event): Delete vars. (mwheel--is-dir-p, mouse-wheel--setup-bindings): * lisp/edmacro.el (edmacro-fix-menu-commands): * lisp/completion-preview.el (completion-preview--mouse-map): Don't use `mouse-wheel-up/down-alternate-event` any more. * lisp/progmodes/flymake.el (flymake--mode-line-counter-map): Do nothing, because it already ignored those vars. commit f355557bb9e93f5d5e7c3fae17e4da398226efb4 Author: Stefan Monnier Date: Fri Jan 12 19:05:24 2024 -0500 mwheel.el: Code clean to reduce duplication * lisp/mwheel.el (mouse-wheel-obey-old-style-wheel-buttons): New var, extracted from `mouse-wheel-*-event` definitions. (mouse-wheel-down-event, mouse-wheel-up-event) (mouse-wheel-left-event, mouse-wheel-right-event): Use it.