[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master c8bde5b0a3: Fix two no-X compilation warnings
From: |
Lars Ingebrigtsen |
Subject: |
master c8bde5b0a3: Fix two no-X compilation warnings |
Date: |
Tue, 22 Mar 2022 16:14:40 -0400 (EDT) |
branch: master
commit c8bde5b0a3c7ac6c1d71c404977f83e2b4e94092
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>
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.
---
lisp/mouse.el | 3 +++
lisp/term/pgtk-win.el | 5 +++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 93c89de91c..30b19510a4 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -2998,6 +2998,9 @@ Call `tooltip-show-help-non-mode' instead on
non-graphical displays."
(x-show-tip tooltip)
(tooltip-show-help-non-mode tooltip)))
+(declare-function x-hide-tip "xfns.c")
+(declare-function x-show-tip "xfns.c")
+
(defun mouse-drag-and-drop-region-hide-tooltip ()
"Hide any tooltip currently displayed.
Call `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 8e17864284..114f98edb5 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.")
(setq command-line-args (x-handle-args command-line-args))
;; Make sure we have a valid resource name.
- (or (stringp x-resource-name)
+ (when (boundp 'x-resource-name)
+ (unless (stringp x-resource-name)
(let (i)
(setq x-resource-name (copy-sequence invocation-name))
;; Change any . or * characters in x-resource-name to hyphens,
;; so as not to choke when we use it in X resource queries.
(while (setq i (string-match "[.*]" x-resource-name))
- (aset x-resource-name i ?-))))
+ (aset x-resource-name i ?-)))))
;; Setup the default fontset.
(create-default-fontset)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master c8bde5b0a3: Fix two no-X compilation warnings,
Lars Ingebrigtsen <=