[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r114687: * nsselect.m (ns_string_from_pasteboard): R
From: |
Jan D. |
Subject: |
[Emacs-diffs] trunk r114687: * nsselect.m (ns_string_from_pasteboard): Remove Fquit, just return |
Date: |
Wed, 16 Oct 2013 16:55:50 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 114687
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/15628
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Wed 2013-10-16 18:55:45 +0200
message:
* nsselect.m (ns_string_from_pasteboard): Remove Fquit, just return
Qnil.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/nsselect.m nsselect.m-20091113204419-o5vbwnq5f7feedwu-8745
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-10-16 15:44:02 +0000
+++ b/src/ChangeLog 2013-10-16 16:55:45 +0000
@@ -1,3 +1,8 @@
+2013-10-16 Jan Djärv <address@hidden>
+
+ * nsselect.m (ns_string_from_pasteboard): Remove Fquit, just return
+ Qnil (Bug#15628).
+
2013-10-16 Eli Zaretskii <address@hidden>
* w32.c (network_interface_get_info, network_interface_list)
=== modified file 'src/nsselect.m'
--- a/src/nsselect.m 2013-07-16 06:39:49 +0000
+++ b/src/nsselect.m 2013-10-16 16:55:45 +0000
@@ -256,9 +256,7 @@
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 @@
}
else
{
- Fsignal (Qquit,
- list1 (build_string ("pasteboard doesn't contain"
- " valid data")));
return Qnil;
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r114687: * nsselect.m (ns_string_from_pasteboard): Remove Fquit, just return,
Jan D. <=