From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 24 Oct 1994 21:59:55 +0000 (+0000)
Subject: (Fx_selection_exists_p): If selected_frame isn't an x frame, return nil.
X-Git-Tag: emacs-19.34~6175
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b8c70430de7dada8e7e18c4f56fd983cb9f25d41;p=emacs.git

(Fx_selection_exists_p): If selected_frame isn't an x frame, return nil.
---

diff --git a/src/xselect.c b/src/xselect.c
index b34686c20f8..282bfa8ffaf 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -1814,7 +1814,10 @@ and t is the same as `SECONDARY'.)")
   Atom atom;
   Display *dpy;
 
-  check_x ();
+  /* It should be safe to call this before we have an X frame.  */
+  if (FRAME_X_P (selected_frame))
+    return Qnil;
+
   dpy = FRAME_X_DISPLAY (selected_frame);
   CHECK_SYMBOL (selection, 0);
   if (!NILP (Fx_selection_owner_p (selection)))