mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-01-23 18:47:57 +00:00
(mouse-set-font): Avoid misleading error message if user makes no selection.
This commit is contained in:
parent
74dde8ad92
commit
8eb1dc02a1
@ -2175,11 +2175,12 @@ and selects that window."
|
||||
(defun mouse-set-font (&rest fonts)
|
||||
"Select an emacs font from a list of known good fonts and fontsets."
|
||||
(interactive
|
||||
(and (display-multi-font-p)
|
||||
(x-popup-menu
|
||||
last-nonmenu-event
|
||||
;; Append list of fontsets currently defined.
|
||||
(append x-fixed-font-alist (list (generate-fontset-menu))))))
|
||||
(progn (unless (display-multi-font-p)
|
||||
(error "Cannot change fonts on this display"))
|
||||
(x-popup-menu
|
||||
last-nonmenu-event
|
||||
;; Append list of fontsets currently defined.
|
||||
(append x-fixed-font-alist (list (generate-fontset-menu))))))
|
||||
(if fonts
|
||||
(let (font)
|
||||
(while fonts
|
||||
@ -2191,8 +2192,7 @@ and selects that window."
|
||||
(error
|
||||
(setq fonts (cdr fonts)))))
|
||||
(if (null font)
|
||||
(error "Font not found")))
|
||||
(message "Cannot change fonts on this display")))
|
||||
(error "Font not found")))))
|
||||
|
||||
;;; Bindings for mouse commands.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user