From: Jared Finder via "Bug reports for GNU Emacs, the Swiss army knife of text editors" <bug-gnu-emacs@gnu.org>
To: Eli Zaretskii <eliz@gnu.org>
Cc: philipk@posteo.net, 68765@debbugs.gnu.org,
monnier@iro.umontreal.ca, Juri Linkov <juri@linkov.net>
Subject: bug#68765: 30.0.50; Adding window-tool-bar package.
Date: Sat, 18 May 2024 20:55:38 -0700 [thread overview]
Message-ID: <a8abeb78e1269b4d7b95c9eba9569a47@finder.org> (raw)
In-Reply-To: <86ed9ze9f4.fsf@gnu.org>
[-- Attachment #1: Type: text/plain, Size: 785 bytes --]
On 2024-05-18 02:50, Eli Zaretskii wrote:
>
> Byte-compiling emits some warnings:
>
> In toplevel form:
> window-tool-bar.el:341:21: Warning: `mouse-wheel-down-event' is an
> obsolete variable (as of 30.1); use `mouse-wheel-buttons' instead.
> window-tool-bar.el:341:44: Warning: `mouse-wheel-up-event' is an
> obsolete variable (as of 30.1); use `mouse-wheel-buttons' instead.
> window-tool-bar.el:342:21: Warning: `mouse-wheel-left-event' is an
> obsolete variable (as of 30.1); use `mouse-wheel-buttons' instead.
> window-tool-bar.el:342:44: Warning: `mouse-wheel-right-event' is an
> obsolete variable (as of 30.1); use `mouse-wheel-buttons' instead.
>
> Jared, could you please take care of these?
>
> Thanks.
The attached patch fixes those warnings.
-- MJF
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Fix-byte-compiler-warnings.patch --]
[-- Type: text/x-diff; name=0001-Fix-byte-compiler-warnings.patch, Size: 2386 bytes --]
From f8b0f612fbb5ffbf7a8ff29f2b252203ff83dcda Mon Sep 17 00:00:00 2001
From: Jared Finder <jared@finder.org>
Date: Sat, 18 May 2024 20:51:09 -0700
Subject: [PATCH] Fix byte compiler warnings
* lisp/window-tool-bar.el (window-tool-bar--static-if)
(window-tool-bar--ignored-event-types): Avoid byte compiler
seeing variables obsolete in Emacs 30 and up.
---
lisp/window-tool-bar.el | 25 ++++++++++++++++++++++---
1 file changed, 22 insertions(+), 3 deletions(-)
diff --git a/lisp/window-tool-bar.el b/lisp/window-tool-bar.el
index 640deccdd61..395aa3aa9cc 100644
--- a/lisp/window-tool-bar.el
+++ b/lisp/window-tool-bar.el
@@ -335,15 +335,34 @@ window-tool-bar--ignore
(interactive)
nil)
+;; static-if was added in Emacs 30, but this packages supports earlier
+;; versions.
+(defmacro window-tool-bar--static-if (condition then-form &rest else-forms)
+ "A conditional compilation macro.
+Evaluate CONDITION at macro-expansion time. If it is non-nil,
+expand the macro to THEN-FORM. Otherwise expand it to ELSE-FORMS
+enclosed in a `progn' form. ELSE-FORMS may be empty."
+ (declare (indent 2)
+ (debug (sexp sexp &rest sexp)))
+ (if (eval condition lexical-binding)
+ then-form
+ (cons 'progn else-forms)))
+
(defvar window-tool-bar--ignored-event-types
- (let ((list (list 'mouse-movement 'pinch
- 'wheel-down 'wheel-up 'wheel-left 'wheel-right
+ (let ((list (append
+ '(mouse-movement pinch
+ wheel-down wheel-up wheel-left wheel-right)
+ ;; Prior to emacs 30, wheel events could also surface as
+ ;; mouse-<NUM> buttons.
+ (window-tool-bar--static-if (version< emacs-version "30")
+ (list
mouse-wheel-down-event mouse-wheel-up-event
mouse-wheel-left-event mouse-wheel-right-event
(bound-and-true-p mouse-wheel-down-alternate-event)
(bound-and-true-p mouse-wheel-up-alternate-event)
(bound-and-true-p mouse-wheel-left-alternate-event)
- (bound-and-true-p mouse-wheel-right-alternate-event))))
+ (bound-and-true-p mouse-wheel-right-alternate-event))
+ nil))))
(delete-dups (delete nil list)))
"Cache for `window-tool-bar--last-command-triggers-refresh-p'.")
--
2.39.2
next prev parent reply other threads:[~2024-05-19 3:55 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-27 23:36 bug#68765: 30.0.50; Adding window-tool-bar package Jared Finder via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-02-10 8:19 ` Eli Zaretskii
2024-02-10 17:25 ` Juri Linkov
2024-02-26 22:38 ` Jared Finder via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-03-26 15:34 ` Jared Finder via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-03-27 7:04 ` Juri Linkov
2024-05-02 6:03 ` Juri Linkov
2024-05-09 8:00 ` Eli Zaretskii
2024-05-10 4:24 ` Jared Finder via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-05-11 4:33 ` Jared Finder via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-05-12 16:34 ` Juri Linkov
2024-05-14 4:14 ` Jared Finder via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-05-14 6:01 ` Juri Linkov
2024-05-18 9:50 ` Eli Zaretskii
2024-05-19 3:55 ` Jared Finder via Bug reports for GNU Emacs, the Swiss army knife of text editors [this message]
2024-05-19 6:43 ` Eli Zaretskii
2024-05-20 17:14 ` Juri Linkov
2024-05-21 2:25 ` Jared Finder via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-05-21 6:12 ` Juri Linkov
2024-05-18 9:45 ` Eli Zaretskii
2024-05-18 9:48 ` Eli Zaretskii
2024-05-19 3:58 ` Jared Finder via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-05-19 6:48 ` Eli Zaretskii
2024-05-23 4:19 ` Jared Finder via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-05-23 6:52 ` Eli Zaretskii
2024-05-25 15:49 ` Jared Finder via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-05-25 17:03 ` Eli Zaretskii
2024-05-25 19:54 ` Jared Finder via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-05-26 9:44 ` Eli Zaretskii
2024-05-26 16:20 ` Jared Finder via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-05-26 18:40 ` Eli Zaretskii
2024-06-02 4:17 ` Jared Finder via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-06-02 5:21 ` Eli Zaretskii
2024-06-02 15:57 ` Jared Finder via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-06-02 16:46 ` Eli Zaretskii
2024-05-19 14:41 ` Philip Kaludercic
2024-05-20 3:25 ` Jared Finder via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-05-20 6:39 ` Philip Kaludercic
2024-05-20 9:19 ` Philip Kaludercic
2024-05-21 4:18 ` Jared Finder via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-05-21 13:40 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-05-22 16:16 ` Philip Kaludercic
2024-02-11 20:51 ` Philip Kaludercic
2024-02-27 3:02 ` Jared Finder via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-03-26 15:33 ` Jared Finder via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-04-13 7:43 ` Eli Zaretskii
2024-04-27 8:25 ` Eli Zaretskii
2024-04-27 10:00 ` Philip Kaludercic
2024-04-28 4:44 ` Jared Finder via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-06-04 5:24 ` Jared Finder via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-06-04 15:59 ` Eli Zaretskii
2024-06-05 4:22 ` Jared Finder via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-06-05 12:10 ` Eli Zaretskii
2024-06-09 0:29 ` Jared Finder via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-06-09 12:23 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a8abeb78e1269b4d7b95c9eba9569a47@finder.org \
--to=bug-gnu-emacs@gnu.org \
--cc=68765@debbugs.gnu.org \
--cc=eliz@gnu.org \
--cc=jared@finder.org \
--cc=juri@linkov.net \
--cc=monnier@iro.umontreal.ca \
--cc=philipk@posteo.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.