procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix tmm-menubar when 'tmm-completion-prompt' is nil

Browse source 
* lisp/tmm.el (tmm-prompt): Handle nil value of 'tmm-mid-prompt'.
(tmm-completion-delete-prompt): Don't rely on the exact text of
the completion heading line, as it is now a customizable format
string, and can be nil, meaning no heading line is inserted at
all.  Instead, search for the first character of the menu based on
text properties used for it.  (Bug#63754)
This commit is contained in:
Eli Zaretskii 2023-05-27 20:09:40 +03:00
parent 5e7c826bfa
commit 5d844e129a
1 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lisp/tmm.el
View file

@ -28,6 +28,7 @@
;;; Code:
(require 'electric)
(require 'text-property-search)
(defgroup tmm nil
"Text mode access to menu-bar."
@ -192,7 +193,11 @@ instead of executing it."
(or (not visible) (eval visible))))))
(setq index-of-default (1+ index-of-default)))
(setq tail (cdr tail)))))
(let ((prompt (concat "^." (regexp-quote tmm-mid-prompt))))
(let ((prompt
(concat "^"
(if (stringp tmm-mid-prompt)
(concat "."
(regexp-quote tmm-mid-prompt))))))
(setq tmm--history
(reverse (delq nil
(mapcar
@ -320,8 +325,21 @@ Stores a list of all the shortcuts in the free variable `tmm-short-cuts'."
(defun tmm-completion-delete-prompt ()
(with-current-buffer standard-output
(goto-char (point-min))
(delete-region (point) (search-forward "Possible completions are:\n"))))
(goto-char (point-min))
(let* (;; First candidate: first string with mouse-face
(menu-start-1 (next-single-char-property-change (point) 'mouse-face))
;; Second candidate: an inactive menu item with tmm-inactive face
(tps-result (save-excursion
(text-property-search-forward 'face 'tmm-inactive t)))
(menu-start-2 (and tps-result (prop-match-beginning tps-result))))
(or (and (null menu-start-1) (null menu-start-2))
(delete-region (point)
;; Use the smallest position of the two candidates.
(or (and menu-start-1 menu-start-2
(min menu-start-1 menu-start-2))
;; Otherwise use the one that is non-nil.
menu-start-1
menu-start-2))))))
(defun tmm-remove-inactive-mouse-face ()
"Remove the mouse-face property from inactive menu items."