X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/f99f7826a0303f7a40864571be7cbf84f3d4ee62..4618713ae48aac51c6f1a2474cc981f32c2bbede:/src/nsselect.m diff --git a/src/nsselect.m b/src/nsselect.m index 6053ee9ceb..00626a42ca 100644 --- a/src/nsselect.m +++ b/src/nsselect.m @@ -219,9 +219,10 @@ ns_get_local_selection (Lisp_Object selection_name, return value; // FIXME: Why `quit' rather than `error'? - Fsignal (Qquit, Fcons (build_string ( - "invalid data returned by selection-conversion function"), - Fcons (handler_fn, Fcons (value, Qnil)))); + Fsignal (Qquit, + list3 (build_string ("invalid data returned by" + " selection-conversion function"), + handler_fn, value)); // FIXME: Beware, `quit' can return!! return Qnil; } @@ -255,10 +256,7 @@ ns_string_from_pasteboard (id pb) type = [pb availableTypeFromArray: ns_return_types]; if (type == nil) { - Fsignal (Qquit, - Fcons (build_string ("empty or unsupported pasteboard type"), - Qnil)); - return Qnil; + return Qnil; } /* get the string */ @@ -274,9 +272,6 @@ ns_string_from_pasteboard (id pb) } else { - Fsignal (Qquit, - Fcons (build_string ("pasteboard doesn't contain valid data"), - Qnil)); return Qnil; } } @@ -362,7 +357,7 @@ On Nextstep, FRAME is unused. */) ns_declare_pasteboard (pb); old_value = assq_no_quit (selection, Vselection_alist); - new_value = Fcons (selection, Fcons (value, Qnil)); + new_value = list2 (selection, value); if (NILP (old_value)) Vselection_alist = Fcons (new_value, Vselection_alist);