diff options
author | Basil L. Contovounesios <contovob@tcd.ie> | 2021-03-26 17:13:59 +0000 |
---|---|---|
committer | Basil L. Contovounesios <contovob@tcd.ie> | 2021-03-26 17:35:34 +0000 |
commit | 331ddd803a72056d0f0c70e5a677e0d4a6300584 (patch) | |
tree | 7af07b75e20d604a9098cf57e7587cd3c6c5d782 /lisp/gnus/gnus-util.el | |
parent | bc506441372726341b6d95abb85011dba6d897ea (diff) | |
download | emacs-331ddd803a72056d0f0c70e5a677e0d4a6300584.tar.gz emacs-331ddd803a72056d0f0c70e5a677e0d4a6300584.tar.bz2 emacs-331ddd803a72056d0f0c70e5a677e0d4a6300584.zip |
Address some --without-x byte-compilation warnings
These came to light in the contexts of bug#29713 and bug#47234.
* lisp/emulation/edt-mapper.el (edt-xserver):
* lisp/emulation/edt.el (edt-xserver):
* lisp/gnus/gnus-util.el (gnus-rescale-image):
* lisp/gnus/nnimap.el (nnimap-map-port):
* lisp/term/w32-win.el:
* lisp/image.el (image--get-imagemagick-and-warn):
* lisp/frame.el (frame-notice-user-settings): Declare functions that
are known to be present at runtime in GUI builds.
(make-frame-on-display): Signal more informative error when called
interactively in a non-GUI build (bug#29713).
* lisp/international/mule-diag.el (describe-font):
* lisp/org/org-macs.el (org--string-from-props): Pacify warnings
about unknown functions in non-GUI bilds.
* lisp/mh-e/mh-mime.el (mh-small-image-p): Avoid eliminating fboundp
check in non-GUI builds, to pacify unused lexical variable warning.
* lisp/net/newst-plainview.el (newsticker--plainview-tool-bar-map):
* lisp/net/newst-treeview.el (newsticker-treeview-tool-bar-map):
Declare tool-bar-map as a special variable in non-GUI builds.
Diffstat (limited to 'lisp/gnus/gnus-util.el')
-rw-r--r-- | lisp/gnus/gnus-util.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el index f80243cfedb..e558f639e46 100644 --- a/lisp/gnus/gnus-util.el +++ b/lisp/gnus/gnus-util.el @@ -1612,8 +1612,8 @@ empty directories from OLD-PATH." "Rescale IMAGE to SIZE if possible. SIZE is in format (WIDTH . HEIGHT). Return a new image. Sizes are in pixels." - (if (not (display-graphic-p)) - image + (when (display-images-p) + (declare-function image-size "image.c" (spec &optional pixels frame)) (let ((new-width (car size)) (new-height (cdr size))) (when (> (cdr (image-size image t)) new-height) @@ -1621,8 +1621,8 @@ Sizes are in pixels." :max-height new-height))) (when (> (car (image-size image t)) new-width) (setq image (create-image (plist-get (cdr image) :data) nil t - :max-width new-width))) - image))) + :max-width new-width))))) + image) (defun gnus-recursive-directory-files (dir) "Return all regular files below DIR. |