Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-06-14 12:31:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into feature/android

Browse source
This commit is contained in:
Po Lu 2023-07-18 16:17:28 +08:00
commit ef497028bd
1 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
lisp/mouse.el
View file

@ -206,8 +206,13 @@ always return a positive integer or zero."
;; Provide a mode-specific menu on a mouse button.
(defun minor-mode-menu-from-indicator (indicator &optional event)
(defun minor-mode-menu-from-indicator (indicator &optional window event)
"Show menu for minor mode specified by INDICATOR.
INDICATOR is either a string object returned by `posn-object' or
the car of such an object. WINDOW may be the window whose mode
line is being displayed.
EVENT may be the mouse event that is causing this menu to be
displayed.
@ -218,6 +223,21 @@ items `Turn Off' and `Help'."
(list (completing-read
"Minor mode indicator: "
(describe-minor-mode-completion-table-for-indicator))))
;; If INDICATOR is a string object and `mode-line-compact' might be
;; enabled, look for the word at its position and use that instead.
(when (and (consp indicator)
window
(with-selected-window window
mode-line-compact))
(with-temp-buffer
(insert (car indicator))
(goto-char (cdr indicator))
(if-let ((thing (thing-at-point 'word)))
(setq indicator thing)
(setq indicator (car indicator)))))
;; If INDICATOR is still a cons, use its car.
(when (consp indicator)
(setq indicator (car indicator)))
(let* ((minor-mode (lookup-minor-mode-from-indicator indicator))
(mm-fun (or (get minor-mode :minor-mode-function) minor-mode)))
(unless minor-mode (error "Cannot find minor mode for `%s'" indicator))
@ -243,8 +263,10 @@ items `Turn Off' and `Help'."
(defun mouse-minor-mode-menu (event)
"Show minor-mode menu for EVENT on minor modes area of the mode line."
(interactive "@e")
(let ((indicator (car (nth 4 (car (cdr event))))))
(minor-mode-menu-from-indicator indicator event)))
(let* ((posn (event-start event))
(indicator (posn-object posn))
(window (posn-window posn)))
(minor-mode-menu-from-indicator indicator window event)))
;; See (elisp)Touchscreen Events.
(put 'mouse-minor-mode-menu 'mouse-1-menu-command t)