diff options
| author | Didier Verna | 2014-12-23 08:55:00 +0100 |
|---|---|---|
| committer | Jan D | 2014-12-23 08:55:00 +0100 |
| commit | 46d40398fc0bebd8584636eddadb138a62bf32af (patch) | |
| tree | c55380b3b68f5f7e19cff75ffcdb7b4953a8ae4d | |
| parent | e3040f2aee768655198dd6f979a1ff3a72d17d16 (diff) | |
| download | emacs-46d40398fc0bebd8584636eddadb138a62bf32af.tar.gz emacs-46d40398fc0bebd8584636eddadb138a62bf32af.zip | |
Fixes: debbugs:19396
* nsselect.m (Fns_selection_owner_p): Return a Lisp boolean, not a
C one.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/nsselect.m | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index f6647826463..b90471e8dea 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-12-23 Didier Verna <didier@didierverna.net> (tiny change). | ||
| 2 | |||
| 3 | * nsselect.m (Fns_selection_owner_p): Return a Lisp boolean, not a | ||
| 4 | C one (Bug#19396). | ||
| 5 | |||
| 1 | 2014-12-22 Jan Djärv <jan.h.d@swipnet.se> | 6 | 2014-12-22 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 7 | ||
| 3 | * xterm.c (x_bitmap_icon): Partly revert change from 2014-03-21 which | 8 | * xterm.c (x_bitmap_icon): Partly revert change from 2014-03-21 which |
diff --git a/src/nsselect.m b/src/nsselect.m index 3b33a97ca73..8863bd27f16 100644 --- a/src/nsselect.m +++ b/src/nsselect.m | |||
| @@ -438,7 +438,8 @@ On Nextstep, TERMINAL is unused. */) | |||
| 438 | if (EQ (selection, Qnil)) selection = QPRIMARY; | 438 | if (EQ (selection, Qnil)) selection = QPRIMARY; |
| 439 | if (EQ (selection, Qt)) selection = QSECONDARY; | 439 | if (EQ (selection, Qt)) selection = QSECONDARY; |
| 440 | return ns_get_pb_change_count (selection) | 440 | return ns_get_pb_change_count (selection) |
| 441 | == ns_get_our_change_count_for (selection); | 441 | == ns_get_our_change_count_for (selection) |
| 442 | ? Qt : Qnil; | ||
| 442 | } | 443 | } |
| 443 | 444 | ||
| 444 | 445 | ||