diff options
| author | Glenn Morris | 2014-05-07 20:41:21 -0700 |
|---|---|---|
| committer | Glenn Morris | 2014-05-07 20:41:21 -0700 |
| commit | fb3f83f5fd9e80347c8b8e36f6eaefbb912fe57b (patch) | |
| tree | f106c360c3aef01bcacdc77b66b7c5b20261502e /src/nsselect.m | |
| parent | 1ba38c429fa6ce17568771ef51c8e53b1a72bb94 (diff) | |
| parent | 606695a67801acfd1792110e4ea3228b50b0117d (diff) | |
| download | emacs-fb3f83f5fd9e80347c8b8e36f6eaefbb912fe57b.tar.gz emacs-fb3f83f5fd9e80347c8b8e36f6eaefbb912fe57b.zip | |
Merge from emacs-24; up to 2014-05-08T03:34:20Z!rgm@gnu.org
Diffstat (limited to 'src/nsselect.m')
| -rw-r--r-- | src/nsselect.m | 4 |
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. */) | |||
| 429 | id pb; | 429 | id pb; |
| 430 | NSArray *types; | 430 | NSArray *types; |
| 431 | 431 | ||
| 432 | check_window_system (NULL); | 432 | if (!window_system_available (NULL)) |
| 433 | return Qnil; | ||
| 434 | |||
| 433 | CHECK_SYMBOL (selection); | 435 | CHECK_SYMBOL (selection); |
| 434 | if (EQ (selection, Qnil)) selection = QPRIMARY; | 436 | if (EQ (selection, Qnil)) selection = QPRIMARY; |
| 435 | if (EQ (selection, Qt)) selection = QSECONDARY; | 437 | if (EQ (selection, Qt)) selection = QSECONDARY; |