diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2013-10-16 18:55:45 +0200 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2013-10-16 18:55:45 +0200 |
| commit | 2318fccaa605347e1d7fc50c13334f6c18c1c6ce (patch) | |
| tree | ec4d0c67951f4c6857c98089cab8bb9143c1eff1 | |
| parent | 3dffe395916c0c075c1609c41e553d9f8e3690ea (diff) | |
| download | emacs-2318fccaa605347e1d7fc50c13334f6c18c1c6ce.tar.gz | |
* nsselect.m (ns_string_from_pasteboard): Remove Fquit, just return
Qnil.
Fixes: debbugs:15628
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/nsselect.m | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 3b419af9e32..9c6ce8321bc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2013-10-16 Jan Djärv <jan.h.d@swipnet.se> + + * nsselect.m (ns_string_from_pasteboard): Remove Fquit, just return + Qnil (Bug#15628). + 2013-10-16 Eli Zaretskii <eliz@gnu.org> * w32.c (network_interface_get_info, network_interface_list) diff --git a/src/nsselect.m b/src/nsselect.m index d95ff799877..00626a42cad 100644 --- a/src/nsselect.m +++ b/src/nsselect.m @@ -256,9 +256,7 @@ ns_string_from_pasteboard (id pb) type = [pb availableTypeFromArray: ns_return_types]; if (type == nil) { - Fsignal (Qquit, - list1 (build_string ("empty or unsupported pasteboard type"))); - return Qnil; + return Qnil; } /* get the string */ @@ -274,9 +272,6 @@ ns_string_from_pasteboard (id pb) } else { - Fsignal (Qquit, - list1 (build_string ("pasteboard doesn't contain" - " valid data"))); return Qnil; } } |