aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2013-10-16 18:55:45 +0200
committerJan Djärv2013-10-16 18:55:45 +0200
commit2318fccaa605347e1d7fc50c13334f6c18c1c6ce (patch)
treeec4d0c67951f4c6857c98089cab8bb9143c1eff1 /src
parent3dffe395916c0c075c1609c41e553d9f8e3690ea (diff)
downloademacs-2318fccaa605347e1d7fc50c13334f6c18c1c6ce.tar.gz
emacs-2318fccaa605347e1d7fc50c13334f6c18c1c6ce.zip
* nsselect.m (ns_string_from_pasteboard): Remove Fquit, just return
Qnil. Fixes: debbugs:15628
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/nsselect.m7
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 @@
12013-10-16 Jan Djärv <jan.h.d@swipnet.se>
2
3 * nsselect.m (ns_string_from_pasteboard): Remove Fquit, just return
4 Qnil (Bug#15628).
5
12013-10-16 Eli Zaretskii <eliz@gnu.org> 62013-10-16 Eli Zaretskii <eliz@gnu.org>
2 7
3 * w32.c (network_interface_get_info, network_interface_list) 8 * 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)
256 type = [pb availableTypeFromArray: ns_return_types]; 256 type = [pb availableTypeFromArray: ns_return_types];
257 if (type == nil) 257 if (type == nil)
258 { 258 {
259 Fsignal (Qquit, 259 return Qnil;
260 list1 (build_string ("empty or unsupported pasteboard type")));
261 return Qnil;
262 } 260 }
263 261
264 /* get the string */ 262 /* get the string */
@@ -274,9 +272,6 @@ ns_string_from_pasteboard (id pb)
274 } 272 }
275 else 273 else
276 { 274 {
277 Fsignal (Qquit,
278 list1 (build_string ("pasteboard doesn't contain"
279 " valid data")));
280 return Qnil; 275 return Qnil;
281 } 276 }
282 } 277 }