Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 09:14:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix 'help-echo' for package suggestions in mode line

Browse source 
* lisp/emacs-lisp/package-activate.el (package--autosugest-line-format):
Remove variable and function.
(package--autosuggest-after-change-mode): Inject upgrade prompt
using ':propertize'.  We can drop the condition testing if there
are any suggestions, as installing the package changes the major
mode and thus also 'mode-name'.
This commit is contained in:
Philip Kaludercic 2026-02-13 22:00:26 +01:00
parent 7470151179
commit d092c8f63a
No known key found for this signature in database
1 changed files with 17 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
lisp/emacs-lisp/package-activate.el
View file

@ -639,40 +639,27 @@ in `package--suggestion-applies-p'."
(push sug suggetions)))
suggetions)))
(defvar package--autosugest-line-format
'(:eval (package--autosugest-line-format)))
(put 'package--autosugest-line-format 'risky-local-variable t)
(defun package--autosugest-line-format ()
"Generate a mode-line button to indicate a suggested package."
`(,@(and-let* (((not (null package-autosuggest-mode)))
((eq package-autosuggest-style 'mode-line))
(avail (package--autosuggest-find-candidates)))
(propertize
"[Upgrade?]"
'face 'mode-line-emphasis
'mouse-face 'mode-line-highlight
'help-echo "Click to install suggested package."
'keymap (let ((map (make-sparse-keymap)))
(define-key map
[mode-line down-mouse-1]
#'package-autosuggest)
map)))))
(declare-function package-autosuggest "package" (&optional candidates))
(defun package--autosuggest-after-change-mode ()
"Display package suggestions for the current buffer.
This function is intended for addition to `after-change-major-mode-hook'."
(when-let* ((avail (package--autosuggest-find-candidates))
(pkgs (mapconcat #'symbol-name
(delete-dups (mapcar #'car avail))
", ")))
(when-let* ((avail (package--autosuggest-find-candidates)))
(pcase-exhaustive package-autosuggest-style
('mode-line
(setq mode-name (append (ensure-list mode-name)
'((package-autosuggest-mode
package--autosugest-line-format))))
(setq mode-name
(append
(ensure-list mode-name)
`((:propertize
"[Upgrade?]"
face mode-line-emphasis
mouse-face mode-line-highlight
help-echo "Click to see suggested packages for this file."
keymap ,(let ((map (make-sparse-keymap)))
(define-key map
[mode-line down-mouse-1]
#'package-autosuggest)
map)))))
(force-mode-line-update t))
('always
(package-autosuggest avail))
@ -680,7 +667,9 @@ This function is intended for addition to `after-change-major-mode-hook'."
(message
(substitute-command-keys
(format "Found suggested packages: %s. Install using \\[package-autosuggest]"
pkgs)))
(mapconcat #'symbol-name
(delete-dups (mapcar #'car avail))
", "))))
(dolist (rec avail)
(add-to-list 'package--autosuggest-suggested (car rec)))))))