aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorLars Ingebrigtsen2022-03-22 21:14:21 +0100
committerLars Ingebrigtsen2022-03-22 21:14:21 +0100
commitc8bde5b0a3c7ac6c1d71c404977f83e2b4e94092 (patch)
treef4cfb83a64d741c95334288de90233f4acc19bbe /lisp
parenta0e33850702e84ca747178b0eba0f43ef30c14fc (diff)
downloademacs-c8bde5b0a3c7ac6c1d71c404977f83e2b4e94092.tar.gz
emacs-c8bde5b0a3c7ac6c1d71c404977f83e2b4e94092.zip
Fix two no-X compilation warnings
* lisp/mouse.el (x-hide-tip, x-show-tip): Declare to avoid no-X build compilation warnings (bug#54524). * lisp/term/pgtk-win.el (window-system-initialization): Avoid no-X compilation warning.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/mouse.el3
-rw-r--r--lisp/term/pgtk-win.el5
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 93c89de91c2..30b19510a46 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -2998,6 +2998,9 @@ Call `tooltip-show-help-non-mode' instead on non-graphical displays."
2998 (x-show-tip tooltip) 2998 (x-show-tip tooltip)
2999 (tooltip-show-help-non-mode tooltip))) 2999 (tooltip-show-help-non-mode tooltip)))
3000 3000
3001(declare-function x-hide-tip "xfns.c")
3002(declare-function x-show-tip "xfns.c")
3003
3001(defun mouse-drag-and-drop-region-hide-tooltip () 3004(defun mouse-drag-and-drop-region-hide-tooltip ()
3002 "Hide any tooltip currently displayed. 3005 "Hide any tooltip currently displayed.
3003Call `tooltip-show-help-non-mode' to clear the echo area message 3006Call `tooltip-show-help-non-mode' to clear the echo area message
diff --git a/lisp/term/pgtk-win.el b/lisp/term/pgtk-win.el
index 8e17864284e..114f98edb57 100644
--- a/lisp/term/pgtk-win.el
+++ b/lisp/term/pgtk-win.el
@@ -255,14 +255,15 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
255 (setq command-line-args (x-handle-args command-line-args)) 255 (setq command-line-args (x-handle-args command-line-args))
256 256
257 ;; Make sure we have a valid resource name. 257 ;; Make sure we have a valid resource name.
258 (or (stringp x-resource-name) 258 (when (boundp 'x-resource-name)
259 (unless (stringp x-resource-name)
259 (let (i) 260 (let (i)
260 (setq x-resource-name (copy-sequence invocation-name)) 261 (setq x-resource-name (copy-sequence invocation-name))
261 262
262 ;; Change any . or * characters in x-resource-name to hyphens, 263 ;; Change any . or * characters in x-resource-name to hyphens,
263 ;; so as not to choke when we use it in X resource queries. 264 ;; so as not to choke when we use it in X resource queries.
264 (while (setq i (string-match "[.*]" x-resource-name)) 265 (while (setq i (string-match "[.*]" x-resource-name))
265 (aset x-resource-name i ?-)))) 266 (aset x-resource-name i ?-)))))
266 267
267 ;; Setup the default fontset. 268 ;; Setup the default fontset.
268 (create-default-fontset) 269 (create-default-fontset)