From: Jim Porter <jporterbugs@gmail.com>
To: Juri Linkov <juri@linkov.net>
Cc: 52293@debbugs.gnu.org
Subject: bug#52293: 29.0.50; [PATCH v2] Prevent further cases of duplicated separators in context menus
Date: Mon, 6 Dec 2021 19:54:11 -0800 [thread overview]
Message-ID: <15eebcb1-b67a-8363-bc23-cf113913856f@gmail.com> (raw)
In-Reply-To: <86pmqa14fc.fsf@mail.linkov.net>
[-- Attachment #1: Type: text/plain, Size: 1766 bytes --]
On 12/6/2021 1:23 AM, Juri Linkov wrote:
>> Updating this part of my config for Emacs 28 was actually what prompted me
>> to start looking into `context-menu-mode' in more detail. It would be
>> easier to implement this if context menu functions didn't rely on the
>> context menu title having a particular value.
>
> I think the remaining problem we have to solve is to try to
> prevent such a situation when the user accidentally removes
> `context-menu-top-separator' from `context-menu-functions'.
> To not break the menu in this case, maybe we need to ensure
> that the menu always contains `top-separator' as well as
> `middle-separator' even when `context-menu-functions'
> doesn't contain a function that adds them? I.e. just to check
> if these separators are missing, and add them at the top.
For the top separator, maybe instead of providing a function for users
to put wherever they like in `context-menu-functions', we could just add
it directly in `context-menu-map' immediately before calling the
functions in `context-menu-functions'? Since it's supposed to be at the
top, it doesn't make a lot of sense to be able to customize where it goes.
It does makes sense to customize where `middle-separator' goes though;
what the user considers the "middle" depends on what other menu items
are normally present. However, if the user didn't include
`context-menu-middle-separator', then
(define-key-after menu [foo] '(menu-item ...) 'middle-separator)
just adds `foo' to the end of the menu. That seems ok to me. Then,
adding after `top-separator' puts your item at the beginning of the
menu, and adding after `middle-separator' puts your item at the middle
or the end, depending on the user's configuration. How does that sound
to you?
[-- Attachment #2: 0001-Add-a-top-separator-to-the-context-menu.patch --]
[-- Type: text/plain, Size: 7955 bytes --]
From 831ba55dd209fe5551733bbea1d33fc0e720227e Mon Sep 17 00:00:00 2001
From: Jim Porter <jporterbugs@gmail.com>
Date: Mon, 6 Dec 2021 19:40:40 -0800
Subject: [PATCH] Add a 'top-separator' to the context menu
This provides an anchor for context menu functions to use to insert
their menu items after it. Using 'define-key' doesn't work properly in
this case, since it inserts the items before the menu title, confusing
the separator de-duplication in 'context-menu-map'.
* lisp/mouse.el (context-menu-map): Add 'top-separator' to the menu.
* lisp/dired.el (dired-context-menu):
* lisp/help-mode.el (help-mode-context-menu):
* lisp/info.el (Info-context-menu):
* lisp/net/eww.el (eww-context-menu):
* lisp/net/goto-addr.el (goto-address-context-menu):
Use 'top-separator'.
---
lisp/dired.el | 5 +++--
lisp/help-mode.el | 10 ++++++----
lisp/info.el | 9 +++++----
lisp/mouse.el | 3 +++
lisp/net/eww.el | 14 ++++++++------
lisp/net/goto-addr.el | 8 +++++---
6 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/lisp/dired.el b/lisp/dired.el
index d0e547ba0b..b004d81495 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -2282,7 +2282,7 @@ dired-mode-operate-menu
(defun dired-context-menu (menu click)
"Populate MENU with Dired mode commands at CLICK."
(when (mouse-posn-property (event-start click) 'dired-filename)
- (define-key menu [dired-separator] menu-bar-separator)
+ (define-key-after menu [dired-separator] menu-bar-separator 'top-separator)
(let ((easy-menu (make-sparse-keymap "Immediate")))
(easy-menu-define nil easy-menu nil
'("Immediate"
@@ -2292,7 +2292,8 @@ dired-context-menu
:help "Edit file at mouse click in other window"]))
(dolist (item (reverse (lookup-key easy-menu [menu-bar immediate])))
(when (consp item)
- (define-key menu (vector (car item)) (cdr item))))))
+ (define-key-after menu (vector (car item)) (cdr item)
+ 'top-separator)))))
menu)
\f
diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index 792f2e5af3..2ed20577f5 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -74,7 +74,8 @@ help-mode-menu
(defun help-mode-context-menu (menu click)
"Populate MENU with Help mode commands at CLICK."
- (define-key menu [help-mode-separator] menu-bar-separator)
+ (define-key-after menu [help-mode-separator] menu-bar-separator
+ 'top-separator)
(let ((easy-menu (make-sparse-keymap "Help-Mode")))
(easy-menu-define nil easy-menu nil
'("Help-Mode"
@@ -86,14 +87,15 @@ help-mode-context-menu
:active help-xref-forward-stack]))
(dolist (item (reverse (lookup-key easy-menu [menu-bar help-mode])))
(when (consp item)
- (define-key menu (vector (car item)) (cdr item)))))
+ (define-key-after menu (vector (car item)) (cdr item) 'top-separator))))
(when (mouse-posn-property (event-start click) 'mouse-face)
- (define-key menu [help-mode-push-button]
+ (define-key-after menu [help-mode-push-button]
'(menu-item "Follow Link" (lambda (event)
(interactive "e")
(push-button event))
- :help "Follow the link at click")))
+ :help "Follow the link at click")
+ 'top-separator))
menu)
diff --git a/lisp/info.el b/lisp/info.el
index 559460e8d2..05e9277698 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -4193,7 +4193,7 @@ Info-check-pointer
(defun Info-context-menu (menu click)
"Populate MENU with Info commands at CLICK."
- (define-key menu [Info-separator] menu-bar-separator)
+ (define-key-after menu [Info-separator] menu-bar-separator 'top-separator)
(let ((easy-menu (make-sparse-keymap "Info")))
(easy-menu-define nil easy-menu nil
'("Info"
@@ -4203,12 +4203,13 @@ Info-context-menu
:help "Go forward in history"]))
(dolist (item (reverse (lookup-key easy-menu [menu-bar info])))
(when (consp item)
- (define-key menu (vector (car item)) (cdr item)))))
+ (define-key-after menu (vector (car item)) (cdr item) 'top-separator))))
(when (mouse-posn-property (event-start click) 'mouse-face)
- (define-key menu [Info-mouse-follow-nearest-node]
+ (define-key-after menu [Info-mouse-follow-nearest-node]
'(menu-item "Follow Link" Info-mouse-follow-nearest-node
- :help "Follow a link where you click")))
+ :help "Follow a link where you click")
+ 'top-separator))
menu)
diff --git a/lisp/mouse.el b/lisp/mouse.el
index af1eca12f4..36003a1db8 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -319,6 +319,9 @@ context-menu-map
(click (or click last-input-event))
(fun (mouse-posn-property (event-start click)
'context-menu-function)))
+ ;; Add a separator to the top of the menu to provide an anchor for
+ ;; context menu functions to use.
+ (define-key-after menu [top-separator] menu-bar-separator)
(if (functionp fun)
(setq menu (funcall fun menu click))
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index e86d21f889..7303e01a37 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -1106,7 +1106,7 @@ eww-mode-map
(defun eww-context-menu (menu click)
"Populate MENU with eww commands at CLICK."
- (define-key menu [eww-separator] menu-bar-separator)
+ (define-key-after menu [eww-separator] menu-bar-separator 'top-separator)
(let ((easy-menu (make-sparse-keymap "Eww")))
(easy-menu-define nil easy-menu nil
'("Eww"
@@ -1117,20 +1117,22 @@ eww-context-menu
["Reload" eww-reload t]))
(dolist (item (reverse (lookup-key easy-menu [menu-bar eww])))
(when (consp item)
- (define-key menu (vector (car item)) (cdr item)))))
+ (define-key-after menu (vector (car item)) (cdr item) 'top-separator))))
(when (or (mouse-posn-property (event-start click) 'shr-url)
(mouse-posn-property (event-start click) 'image-url))
- (define-key menu [shr-mouse-browse-url-new-window]
+ (define-key-after menu [shr-mouse-browse-url-new-window]
`(menu-item "Follow URL in new window" ,(if browse-url-new-window-flag
'shr-mouse-browse-url
'shr-mouse-browse-url-new-window)
- :help "Browse the URL under the mouse cursor in a new window"))
- (define-key menu [shr-mouse-browse-url]
+ :help "Browse the URL under the mouse cursor in a new window")
+ 'top-separator)
+ (define-key-after menu [shr-mouse-browse-url]
`(menu-item "Follow URL" ,(if browse-url-new-window-flag
'shr-mouse-browse-url-new-window
'shr-mouse-browse-url)
- :help "Browse the URL under the mouse cursor")))
+ :help "Browse the URL under the mouse cursor")
+ 'top-separator))
menu)
diff --git a/lisp/net/goto-addr.el b/lisp/net/goto-addr.el
index 848bad3b0d..bb0f0b00ee 100644
--- a/lisp/net/goto-addr.el
+++ b/lisp/net/goto-addr.el
@@ -127,10 +127,12 @@ goto-address-highlight-keymap
(defun goto-address-context-menu (menu click)
"Populate MENU with `goto-address' commands at CLICK."
(when (mouse-posn-property (event-start click) 'goto-address)
- (define-key menu [goto-address-separator] menu-bar-separator)
- (define-key menu [goto-address-at-mouse]
+ (define-key-after menu [goto-address-separator] menu-bar-separator
+ 'top-separator)
+ (define-key-after menu [goto-address-at-mouse]
'(menu-item "Follow Link" goto-address-at-mouse
- :help "Follow a link where you click")))
+ :help "Follow a link where you click")
+ 'top-separator))
menu)
(defcustom goto-address-url-face 'link
--
2.25.1
next prev parent reply other threads:[~2021-12-07 3:54 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-05 5:58 bug#52293: 29.0.50; [PATCH] Prevent further cases of duplicated separators in context menus Jim Porter
2021-12-05 9:39 ` Juri Linkov
2021-12-06 4:07 ` Jim Porter
2021-12-05 17:59 ` Juri Linkov
2021-12-06 4:50 ` Jim Porter
2021-12-06 9:23 ` Juri Linkov
2021-12-07 3:54 ` Jim Porter [this message]
2021-12-07 8:19 ` bug#52293: 29.0.50; [PATCH v2] " Juri Linkov
2021-12-08 4:37 ` bug#52293: 29.0.50; [PATCH v3] " Jim Porter
2021-12-08 12:59 ` Eli Zaretskii
2021-12-08 17:43 ` Jim Porter
2021-12-08 19:07 ` Juri Linkov
2021-12-08 19:47 ` Eli Zaretskii
2021-12-09 9:06 ` Juri Linkov
2021-12-09 9:39 ` Eli Zaretskii
2021-12-12 4:02 ` Jim Porter
2021-12-12 7:02 ` Eli Zaretskii
2021-12-12 20:27 ` Jim Porter
2021-12-12 20:43 ` Eli Zaretskii
2021-12-12 21:59 ` Jim Porter
2021-12-13 12:23 ` Eli Zaretskii
2021-12-13 18:13 ` Jim Porter
2021-12-12 21:00 ` bug#52293: [External] : " Drew Adams
2021-12-12 22:12 ` Jim Porter
2021-12-12 23:14 ` Jim Porter
2021-12-13 1:16 ` Drew Adams
2021-12-13 1:46 ` Jim Porter
2021-12-13 2:41 ` Drew Adams
2021-12-13 8:47 ` Juri Linkov
2021-12-13 17:25 ` Jim Porter
2021-12-13 18:58 ` Juri Linkov
2021-12-14 5:41 ` Jim Porter
2021-12-14 8:30 ` Juri Linkov
2021-12-14 13:04 ` Eli Zaretskii
2021-12-14 16:49 ` Drew Adams
2021-12-14 20:51 ` Juri Linkov
2021-12-14 22:02 ` Drew Adams
2021-12-15 8:59 ` Juri Linkov
2021-12-15 18:10 ` Drew Adams
2021-12-15 18:24 ` Juri Linkov
2021-12-15 21:36 ` Drew Adams
2021-12-16 17:20 ` Juri Linkov
2021-12-16 17:51 ` Drew Adams
2021-12-16 17:56 ` Drew Adams
2021-12-17 8:20 ` Juri Linkov
2021-12-17 17:21 ` Drew Adams
2021-12-15 0:17 ` Jim Porter
2021-12-15 8:57 ` Juri Linkov
2022-01-01 7:13 ` Jim Porter
2022-01-02 19:27 ` Juri Linkov
2022-01-03 6:14 ` bug#52293: 29.0.50; [PATCH v4] " Jim Porter
2022-01-04 8:19 ` Juri Linkov
2022-01-04 21:14 ` Jim Porter
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=15eebcb1-b67a-8363-bc23-cf113913856f@gmail.com \
--to=jporterbugs@gmail.com \
--cc=52293@debbugs.gnu.org \
--cc=juri@linkov.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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).