From: Jan Djärv <jan.h.d@swipnet.se>
Date: Wed, 16 Oct 2013 16:55:45 +0000 (+0200)
Subject: * nsselect.m (ns_string_from_pasteboard): Remove Fquit, just return
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1244
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2318fccaa605347e1d7fc50c13334f6c18c1c6ce;p=emacs.git

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

Fixes: debbugs:15628
---

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;
         }
     }