* lisp/thingatpt.el (thing-at-mouse): New function (bug#50256).

* lisp/net/dictionary.el: Add 'context-menu-dictionary' to
'context-menu-functions'.
(dictionary-search-word-at-mouse): New function.
(context-menu-dictionary): New function that uses 'thing-at-mouse'.
(dictionary-mouse-popup-matching-words): Remove stray 'selected-window'.

* lisp/textmodes/flyspell.el (flyspell-context-menu): Add '_click' arg.
This commit is contained in:
Juri Linkov 2021-09-12 20:32:02 +03:00
parent 4877ddeaf7
commit bd917088e6
4 changed files with 33 additions and 2 deletions

View file

@ -2503,6 +2503,8 @@ This allows mode-specific alterations to how 'thing-at-point' works.
'symbol-at-point') will narrow to the current field (if any) before
trying to identify the thing at point.
*** New function 'thing-at-mouse'.
** image-dired
---

View file

@ -1211,7 +1211,6 @@ allows editing it."
(save-excursion
(mouse-set-point event)
(current-word)))))
(selected-window)
(dictionary-popup-matching-words word)))
;;;###autoload
@ -1368,5 +1367,26 @@ any buffer where (dictionary-tooltip-mode 1) has been called."
(if on #'dictionary-tooltip-track-mouse #'ignore))
on))
;;; Context menu support
(defun dictionary-search-word-at-mouse (event)
(interactive "e")
(let ((word (save-window-excursion
(save-excursion
(mouse-set-point event)
(current-word)))))
(dictionary-search word)))
(defun context-menu-dictionary (menu click)
"Dictionary context menu."
(when (thing-at-mouse click 'word)
(define-key menu [dictionary-separator] menu-bar-separator)
(define-key menu [dictionary-search-word-at-mouse]
'(menu-item "Dictionary Search" dictionary-search-word-at-mouse
:help "Search the word at mouse click in dictionary")))
menu)
(add-hook 'context-menu-functions 'context-menu-dictionary 15)
(provide 'dictionary)
;;; dictionary.el ends here

View file

@ -470,7 +470,7 @@ See also `flyspell-duplicate-distance'."
(defvar flyspell-overlay nil)
(defun flyspell-context-menu (_menu)
(defun flyspell-context-menu (_menu _click)
"Context menu for `context-menu-mode'."
;; TODO: refactor `flyspell-correct-word' and related functions to return
;; a keymap menu where every menu item is bound to a lambda that calls

View file

@ -151,6 +151,15 @@ positions of the thing found."
(if (and (<= real-beg orig) (<= orig end) (< real-beg end))
(cons real-beg end))))))))))
;;;###autoload
(defun thing-at-mouse (event thing &optional no-properties)
"Return the THING at mouse click.
Like `thing-at-point', but tries to use the event
where the mouse button is clicked to find a thing nearby."
(save-excursion
(mouse-set-point event)
(thing-at-point thing no-properties)))
;;;###autoload
(defun thing-at-point (thing &optional no-properties)
"Return the THING at point.