refactor(lib): tweak user-error messages

To make these errors more consistent with similar commands/operations,
as well as rely less on cl-check-type (cl-lib's understanding of the
`font` type is a bit odd; they'd emit warnings/errors about this, but
still perform the checks -- I opted to check more explicitly instead).
This commit is contained in:
Henrik Lissner 2024-06-22 18:01:11 -04:00
parent a3a0629e03
commit 17119c5df7
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
2 changed files with 3 additions and 3 deletions

View file

@ -538,7 +538,7 @@ which case it will save it without prompting."
(when (or (derived-mode-p 'dired-mode)
(derived-mode-p 'wdired-mode))
default-directory)
(user-error "Cannot determine the file path of the current buffer"))))
(user-error "Current buffer isn't visiting a file"))))
;;;###autoload
(defun doom/sudo-save-buffer ()

View file

@ -29,7 +29,6 @@ The font will be normalized (i.e. :weight, :slant, and :width will set to
FONT can be a `font-spec', a font object, an XFT font string, or an XLFD font
string."
(cl-check-type font (or font string vector))
(when (and (stringp font)
(string-prefix-p "-" font))
(setq font (x-decompose-font-name font)))
@ -45,7 +44,8 @@ string."
((vectorp font)
(dolist (i '(1 2 3) (x-compose-font-name font))
(unless (aref font i)
(aset font i "normal"))))))
(aset font i "normal"))))
((signal 'wrong-type-of-argument (list '(font string vectorp) font)))))
(font (x-resolve-font-name font))
(font (font-spec :name font)))
(unless (font-get font :size)