procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
not initialized.

Fixes: debbugs:17398
This commit is contained in:
Jan Djärv 2014-05-05 19:37:43 +02:00
parent dccb068865
commit 879e36286d
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -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).

4
src/nsselect.m
View file

@ -429,7 +429,9 @@ Updated by Christian Limpach (chris@nice.ch)
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;