[Emacs-diffs] emacs-24 r117060: * nsselect.m (Fx_selection_exists_p): Just return Qnil if window system

[Jan D.]

------------------------------------------------------------
revno: 117060
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17398
committer: Jan D. <address@hidden>
branch nick: emacs-24
timestamp: Mon 2014-05-05 19:37:43 +0200
message:
  * nsselect.m (Fx_selection_exists_p): Just return Qnil if window system
  not initialized.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/nsselect.m                 nsselect.m-20091113204419-o5vbwnq5f7feedwu-8745

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-05-04 18:51:32 +0000
+++ b/src/ChangeLog     2014-05-05 17:37:43 +0000
@@ -1,3 +1,8 @@
+2014-05-05  Jan Djärv  <address@hidden>
+
+       * nsselect.m (Fx_selection_exists_p): Just return Qnil if window system
+       not initialized (Bug#17398).
+
 2014-05-04  Paul Eggert  <address@hidden>
 
        Revert recent libpng changes (Bug#17339).

=== modified file 'src/nsselect.m'
--- a/src/nsselect.m    2014-02-10 22:15:54 +0000
+++ b/src/nsselect.m    2014-05-05 17:37:43 +0000
@@ -429,7 +429,9 @@
   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;