diff options
| author | Tom Tromey | 2018-08-09 17:56:53 -0600 |
|---|---|---|
| committer | Tom Tromey | 2018-08-09 17:56:53 -0600 |
| commit | accb7b7ecc19f85c2750ded1046a464bc73c6a52 (patch) | |
| tree | 1aa94af022d6700a93a8ff2b73f5b210046ac010 /src/nsselect.m | |
| parent | f822a2516d88eeb2118fbbc8554f155e86dfd74e (diff) | |
| parent | 53483df0de0085dbc9ef0b15a0f629ab808b0147 (diff) | |
| download | emacs-accb7b7ecc19f85c2750ded1046a464bc73c6a52.tar.gz emacs-accb7b7ecc19f85c2750ded1046a464bc73c6a52.zip | |
Merge remote-tracking branch 'origin/master' into feature/bignum
Diffstat (limited to 'src/nsselect.m')
| -rw-r--r-- | src/nsselect.m | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nsselect.m b/src/nsselect.m index b7e134b5466..35705bfca0e 100644 --- a/src/nsselect.m +++ b/src/nsselect.m | |||
| @@ -164,7 +164,7 @@ ns_get_our_change_count_for (Lisp_Object selection) | |||
| 164 | static void | 164 | static void |
| 165 | ns_string_to_pasteboard_internal (id pb, Lisp_Object str, NSString *gtype) | 165 | ns_string_to_pasteboard_internal (id pb, Lisp_Object str, NSString *gtype) |
| 166 | { | 166 | { |
| 167 | if (EQ (str, Qnil)) | 167 | if (NILP (str)) |
| 168 | { | 168 | { |
| 169 | [pb declareTypes: [NSArray array] owner: nil]; | 169 | [pb declareTypes: [NSArray array] owner: nil]; |
| 170 | } | 170 | } |
| @@ -399,7 +399,7 @@ these literal upper-case names.) The symbol nil is the same as | |||
| 399 | return Qnil; | 399 | return Qnil; |
| 400 | 400 | ||
| 401 | CHECK_SYMBOL (selection); | 401 | CHECK_SYMBOL (selection); |
| 402 | if (EQ (selection, Qnil)) selection = QPRIMARY; | 402 | if (NILP (selection)) selection = QPRIMARY; |
| 403 | if (EQ (selection, Qt)) selection = QSECONDARY; | 403 | if (EQ (selection, Qt)) selection = QSECONDARY; |
| 404 | pb = ns_symbol_to_pb (selection); | 404 | pb = ns_symbol_to_pb (selection); |
| 405 | if (pb == nil) return Qnil; | 405 | if (pb == nil) return Qnil; |
| @@ -421,7 +421,7 @@ and t is the same as `SECONDARY'. */) | |||
| 421 | { | 421 | { |
| 422 | check_window_system (NULL); | 422 | check_window_system (NULL); |
| 423 | CHECK_SYMBOL (selection); | 423 | CHECK_SYMBOL (selection); |
| 424 | if (EQ (selection, Qnil)) selection = QPRIMARY; | 424 | if (NILP (selection)) selection = QPRIMARY; |
| 425 | if (EQ (selection, Qt)) selection = QSECONDARY; | 425 | if (EQ (selection, Qt)) selection = QSECONDARY; |
| 426 | return ns_get_pb_change_count (selection) | 426 | return ns_get_pb_change_count (selection) |
| 427 | == ns_get_our_change_count_for (selection) | 427 | == ns_get_our_change_count_for (selection) |