Merged from miles@gnu.org--gnu-2005 (patch 83-87, 449-468)

[gnu-emacs] / src / xselect.c

diff --git a/src/xselect.c b/src/xselect.c
index 7a1ceaabbb0e5e5c67f695fb5df2f15d2ff39ec4..c60c12c3b673ae946b3611f24a4695f246f23a98 100644 (file)
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -1010,7 +1010,7 @@ x_handle_selection_clear (event)
      to see if this Emacs job now owns the selection
      through that display.  */
   for (t_dpyinfo = x_display_list; t_dpyinfo; t_dpyinfo = t_dpyinfo->next)
-    if (t_dpyinfo->kboard == dpyinfo->kboard)
+    if (t_dpyinfo->frame_display->kboard == dpyinfo->frame_display->kboard)
       {
        Window owner_window
          = XGetSelectionOwner (t_dpyinfo->display, selection);
@@ -2136,7 +2136,7 @@ anything that the functions on `selection-converter-alist' know about.  */)
 {
   check_x ();
   CHECK_SYMBOL (selection_name);
-  if (NILP (selection_value)) error ("selection-value may not be nil");
+  if (NILP (selection_value)) error ("SELECTION-VALUE may not be nil");
   x_own_selection (selection_name, selection_value);
   return selection_value;
 }