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/frame.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/frame.el')
| -rw-r--r-- | lisp/frame.el | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/frame.el b/lisp/frame.el index 151aefb47a3..2b6e4a60b83 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -367,6 +367,7 @@ there (in decreasing order of priority)." ;; by the lines added in x-create-frame for the tab-bar and ;; switch `tab-bar-mode' off. (when (display-graphic-p) + (declare-function tab-bar-height "xdisp.c" (&optional frame pixelwise)) (let* ((init-lines (assq 'tab-bar-lines initial-frame-alist)) (other-lines @@ -708,9 +709,11 @@ Return nil if we don't know how to interpret DISPLAY." (defun make-frame-on-display (display &optional parameters) "Make a frame on display DISPLAY. The optional argument PARAMETERS specifies additional frame parameters." - (interactive (list (completing-read - (format "Make frame on display: ") - (x-display-list)))) + (interactive (if (fboundp 'x-display-list) + (list (completing-read + (format "Make frame on display: ") + (x-display-list))) + (user-error "This Emacs build does not support X displays"))) (make-frame (cons (cons 'display display) parameters))) (defun make-frame-on-current-monitor (&optional parameters) |