emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 8d1aa370d3: ; Fix PGTK declare-function mistakes


From: Po Lu
Subject: master 8d1aa370d3: ; Fix PGTK declare-function mistakes
Date: Sat, 14 May 2022 09:43:19 -0400 (EDT)

branch: master
commit 8d1aa370d33f51e15ca038d2a083502329c64119
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    ; Fix PGTK declare-function mistakes
    
    * lisp/frame.el (pgtk-frame-list-z-order):
    (frame-list-z-order):
    * lisp/term/pgtk-win.el (pgtk-hide-emacs): Remove extraneous or
    incorrect `declare-function's.  Reported by Eli Zaretskii
    <eliz@gnu.org>.
---
 lisp/frame.el         | 7 +++++--
 lisp/term/pgtk-win.el | 1 -
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lisp/frame.el b/lisp/frame.el
index 9b8937c258..094d67688c 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1993,7 +1993,8 @@ workarea attribute."
 (declare-function x-frame-list-z-order "xfns.c" (&optional display))
 (declare-function w32-frame-list-z-order "w32fns.c" (&optional display))
 (declare-function ns-frame-list-z-order "nsfns.m" (&optional display))
-(declare-function pgtk-frame-list-z-order "pgtkfns.c" (&optional display))
+;; TODO: implement this on PGTK.
+;; (declare-function pgtk-frame-list-z-order "pgtkfns.c" (&optional display))
 (declare-function haiku-frame-list-z-order "haikufns.c" (&optional display))
 
 (defun frame-list-z-order (&optional display)
@@ -2016,7 +2017,9 @@ Return nil if DISPLAY contains no Emacs frame."
      ((eq frame-type 'ns)
       (ns-frame-list-z-order display))
      ((eq frame-type 'pgtk)
-      (pgtk-frame-list-z-order display))
+      ;; This is currently not supported on PGTK.
+      ;; (pgtk-frame-list-z-order display)
+      nil)
      ((eq frame-type 'haiku)
       (haiku-frame-list-z-order display)))))
 
diff --git a/lisp/term/pgtk-win.el b/lisp/term/pgtk-win.el
index 9b22ab0970..8abea3edba 100644
--- a/lisp/term/pgtk-win.el
+++ b/lisp/term/pgtk-win.el
@@ -45,7 +45,6 @@
 (defvar pgtk-use-im-context-on-new-connection)
 
 (declare-function pgtk-use-im-context "pgtkim.c")
-(declare-function pgtk-hide-emacs "pgtkfns.c" (on))
 
 (defun pgtk-drag-n-drop (event &optional new-frame force-text)
   "Edit the files listed in the drag-n-drop EVENT.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]