From: Didier Verna Date: Tue, 23 Dec 2014 07:55:00 +0000 (+0100) Subject: Fixes: debbugs:19396 X-Git-Tag: emacs-25.0.90~2631^2~17 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=46d40398fc0bebd8584636eddadb138a62bf32af;p=emacs.git Fixes: debbugs:19396 * nsselect.m (Fns_selection_owner_p): Return a Lisp boolean, not a C one. --- diff --git a/src/ChangeLog b/src/ChangeLog index f6647826463..b90471e8dea 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2014-12-23 Didier Verna (tiny change). + + * nsselect.m (Fns_selection_owner_p): Return a Lisp boolean, not a + C one (Bug#19396). + 2014-12-22 Jan Djärv * 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. */) if (EQ (selection, Qnil)) selection = QPRIMARY; if (EQ (selection, Qt)) selection = QSECONDARY; return ns_get_pb_change_count (selection) - == ns_get_our_change_count_for (selection); + == ns_get_our_change_count_for (selection) + ? Qt : Qnil; }