summaryrefslogtreecommitdiff
path: root/src/nsselect.m
diff options
context:
space:
mode:
authorJan Djärv <jan.h.d@swipnet.se>2014-05-05 19:37:43 +0200
committerJan Djärv <jan.h.d@swipnet.se>2014-05-05 19:37:43 +0200
commit879e36286d46283ac4b3e794c502bfac4c33016d (patch)
tree642a134d47dc3971dd226ba9d5fda591552012b5 /src/nsselect.m
parentdccb0688651388531f00de3c8b365cdabcf54aa2 (diff)
downloademacs-879e36286d46283ac4b3e794c502bfac4c33016d.tar.gz
* nsselect.m (Fx_selection_exists_p): Just return Qnil if window system
not initialized. Fixes: debbugs:17398
Diffstat (limited to 'src/nsselect.m')
-rw-r--r--src/nsselect.m4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/nsselect.m b/src/nsselect.m
index f4713cb5e10..038849c0aed 100644
--- a/src/nsselect.m
+++ b/src/nsselect.m
@@ -429,7 +429,9 @@ On Nextstep, TERMINAL is unused. */)
id pb;
NSArray *types;
- check_window_system (NULL);
+ if (!window_system_available (NULL))
+ return Qnil;
+
CHECK_SYMBOL (selection);
if (EQ (selection, Qnil)) selection = QPRIMARY;
if (EQ (selection, Qt)) selection = QSECONDARY;