* nsselect.m (ns_string_from_pasteboard): Remove Fquit, just return

Qnil.

Fixes: debbugs:15628

diff --git a/src/ChangeLog b/src/ChangeLog
index 3b419af9e32b64dad4bc8b97a4412f8998cb590d..9c6ce8321bc24d229b38384b8949dbbb293fd359 100644 (file)
--- 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 d95ff799877b27b933117d29130401d462035062..00626a42cad5b74e8f3c632dc2f9b9b4f97b15e2 100644 (file)
--- 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;
         }
     }