* nsselect.m (Fx_selection_exists_p): Just return Qnil if window system

not initialized.

Fixes: debbugs:17398

2 files changed, 8 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 0f6aaf93598..9839b6a2146 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-05  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsselect.m (Fx_selection_exists_p): Just return Qnil if window system
+        not initialized (Bug#17398).
+
 2014-05-04  Paul Eggert  <eggert@cs.ucla.edu>
 
         Revert recent libpng changes (Bug#17339).
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;