mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

More fixes for recently committed context-menu additions from bug#52973

Browse source 
* lisp/hi-lock.el (highlight-symbol-at-mouse): New defalias.
(hi-lock-face-symbol-at-mouse): Rename from hi-lock-symbol-at-mouse.
(hi-lock-context-menu): Use thing-at-mouse and middle-separator.

* lisp/man.el (Man-context-menu): Fix Man-at-mouse and use middle-separator.

* lisp/mouse.el (context-menu-functions): Remove context-menu-online-search.
Add occur-context-menu and dictionary-context-menu (bug#50552).
This commit is contained in:
Juri Linkov 2022-01-15 20:33:45 +02:00
parent 7055104358
commit f19b34376a
3 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lisp/hi-lock.el
View file

@ -855,7 +855,8 @@ SPACES-REGEXP is a regexp to substitute spaces in font-lock search."
nil)
;;; Mouse support
(defun hi-lock-symbol-at-mouse (event)
(defalias 'highlight-symbol-at-mouse 'hi-lock-face-symbol-at-mouse)
(defun hi-lock-face-symbol-at-mouse (event)
"Highlight symbol at mouse click EVENT."
(interactive "e")
(save-excursion
@ -865,13 +866,13 @@ SPACES-REGEXP is a regexp to substitute spaces in font-lock search."
;;;###autoload
(defun hi-lock-context-menu (menu click)
"Populate MENU with a menu item to highlight symbol at CLICK."
(save-excursion
(mouse-set-point click)
(when (symbol-at-point)
(define-key-after menu [highlight-search-separator] menu-bar-separator)
(define-key-after menu [highlight-search-mouse]
'(menu-item "Highlight Symbol" highlight-symbol-at-mouse
:help "Highlight symbol at point"))))
(when (thing-at-mouse click 'symbol)
(define-key-after menu [highlight-search-separator] menu-bar-separator
'middle-separator)
(define-key-after menu [highlight-search-mouse]
'(menu-item "Highlight Symbol" highlight-symbol-at-mouse
:help "Highlight symbol at point")
'highlight-search-separator))
menu)
(provide 'hi-lock)

10
lisp/man.el
View file

@ -1993,11 +1993,13 @@ Uses `Man-name-local-regexp'."
(skip-syntax-backward "^ ")
(and (looking-at
"[[:space:]]*\\([[:alnum:]_-]+([[:alnum:]]+)\\)")
(match-string 1)))
(define-key-after menu [man-separator] menu-bar-separator)
(match-string 1)))
(define-key-after menu [man-separator] menu-bar-separator
'middle-separator)
(define-key-after menu [man-at-mouse]
'(menu-item "Open man page" man-at-mouse
:help "Open man page around mouse click"))))
'(menu-item "Open man page" Man-at-mouse
:help "Open man page around mouse click")
'man-separator)))
menu)

5
lisp/mouse.el
View file

@ -298,9 +298,10 @@ and should return the same menu with changes such as added new menu items."
(function-item context-menu-buffers)
(function-item context-menu-vc)
(function-item context-menu-ffap)
(function-item Man-context-menu)
(function-item hi-lock-context-menu)
(function-item context-menu-online-search)
(function-item occur-context-menu)
(function-item Man-context-menu)
(function-item dictionary-context-menu)
(function :tag "Custom function")))
:version "28.1")