diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2014-05-05 19:37:43 +0200 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2014-05-05 19:37:43 +0200 |
| commit | 879e36286d46283ac4b3e794c502bfac4c33016d (patch) | |
| tree | 642a134d47dc3971dd226ba9d5fda591552012b5 | |
| parent | dccb0688651388531f00de3c8b365cdabcf54aa2 (diff) | |
| download | emacs-879e36286d46283ac4b3e794c502bfac4c33016d.tar.gz | |
* nsselect.m (Fx_selection_exists_p): Just return Qnil if window system
not initialized.
Fixes: debbugs:17398
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/nsselect.m | 4 |
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; |