[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master ba28acf: Adjust occur-context-menu and elisp-context-menu
From: |
Juri Linkov |
Subject: |
master ba28acf: Adjust occur-context-menu and elisp-context-menu |
Date: |
Wed, 15 Sep 2021 03:21:00 -0400 (EDT) |
branch: master
commit ba28acf3b8fb81a95e9963fb986ec581969d237c
Author: Juri Linkov <juri@linkov.net>
Commit: Juri Linkov <juri@linkov.net>
Adjust occur-context-menu and elisp-context-menu
* lisp/progmodes/elisp-mode.el (elisp-context-menu): Add separator
only when there is a symbol at mouse click.
* lisp/replace.el (occur-context-menu): Insert items in the middle
of the menu after mark-whole-buffer.
---
lisp/progmodes/elisp-mode.el | 4 ++--
lisp/replace.el | 13 ++++++++-----
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index 917a7ad..a4c8d86 100644
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -154,9 +154,9 @@ All commands in `lisp-mode-shared-map' are inherited by
this map.")
:selected (bound-and-true-p eldoc-mode)]))
(defun elisp-context-menu (menu click)
- (define-key-after menu [elisp-separator] menu-bar-separator
- 'mark-whole-buffer)
(when (thing-at-mouse click 'symbol)
+ (define-key-after menu [elisp-separator] menu-bar-separator
+ 'mark-whole-buffer)
(define-key-after menu [describe-symbol]
'(menu-item "Describe Symbol"
(lambda (click) (interactive "e")
diff --git a/lisp/replace.el b/lisp/replace.el
index 63b3e21..63b58c9 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -2385,13 +2385,16 @@ To be added to `context-menu-functions'."
(let ((word (thing-at-mouse click 'word))
(sym (thing-at-mouse click 'symbol)))
(when (or word sym)
- (define-key-after menu [occur-separator] menu-bar-separator)
- (when word
- (define-key-after menu [occur-word-at-mouse]
- '(menu-item "Occur Word" occur-word-at-mouse)))
+ (define-key-after menu [occur-separator] menu-bar-separator
+ 'mark-whole-buffer)
(when sym
(define-key-after menu [occur-symbol-at-mouse]
- '(menu-item "Occur Symbol" occur-symbol-at-mouse)))))
+ '(menu-item "Occur Symbol" occur-symbol-at-mouse)
+ 'occur-separator))
+ (when word
+ (define-key-after menu [occur-word-at-mouse]
+ '(menu-item "Occur Word" occur-word-at-mouse)
+ 'occur-separator))))
menu)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master ba28acf: Adjust occur-context-menu and elisp-context-menu,
Juri Linkov <=