summaryrefslogtreecommitdiff
path: root/src/xselect.c
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1994-10-24 21:59:55 +0000
committerRichard M. Stallman <rms@gnu.org>1994-10-24 21:59:55 +0000
commita83f90bbf20d17bf6a179ce55b3d5a3751f7ccdc (patch)
tree0025749d7cd31c631ee680924a047791b43e2814 /src/xselect.c
parentda98b94fe7a6e74b21591c1fc448f6cb678e4830 (diff)
downloademacs-a83f90bbf20d17bf6a179ce55b3d5a3751f7ccdc.tar.gz
(Fx_selection_exists_p): If selected_frame isn't an x frame, return nil.
Diffstat (limited to 'src/xselect.c')
-rw-r--r--src/xselect.c5
1 files changed, 4 insertions, 1 deletions
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)))