From: Juri Linkov <juri@linkov.net>
Date: Wed, 14 Apr 2021 18:22:55 +0000 (+0300)
Subject: Don't error out when selection data is unavailable (bug#47642)
X-Git-Tag: emacs-28.0.90~2854
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9b8a5070e5af506158e998e6125c3dab44fa8e5f;p=emacs.git

Don't error out when selection data is unavailable (bug#47642)

* src/xselect.c (x_get_window_property_as_lisp_data):
Display a message and return nil when data is not available.
---

diff --git a/src/xselect.c b/src/xselect.c
index 030f6240712..cd6d86bdf4c 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -1482,14 +1482,21 @@ x_get_window_property_as_lisp_data (struct x_display_info *dpyinfo,
 	= XGetSelectionOwner (display, selection_atom) != 0;
       unblock_input ();
       if (there_is_a_selection_owner)
-	signal_error ("Selection owner couldn't convert",
-		      actual_type
-		      ? list2 (target_type,
-			       x_atom_to_symbol (dpyinfo, actual_type))
-		      : target_type);
+	{
+	  AUTO_STRING (format, "Selection owner couldn't convert: %s");
+	  CALLN (Fmessage, format,
+		 actual_type
+		 ? list2 (target_type,
+			  x_atom_to_symbol (dpyinfo, actual_type))
+		 : target_type);
+	  return Qnil;
+	}
       else
-	signal_error ("No selection",
-		      x_atom_to_symbol (dpyinfo, selection_atom));
+	{
+	  AUTO_STRING (format, "No selection: %s");
+	  CALLN (Fmessage, format, x_atom_to_symbol (dpyinfo, selection_atom));
+	  return Qnil;
+	}
     }
 
   if (actual_type == dpyinfo->Xatom_INCR)