Merge r21-4-11-chise-0_20-=ucs.

[chise/xemacs-chise.git.1] / src / select-x.c

diff --git a/src/select-x.c b/src/select-x.c
index e2e003f..835c7a5 100644 (file)
--- a/src/select-x.c
+++ b/src/select-x.c
@@ -73,7 +73,7 @@ Lisp_Object Vx_sent_selection_hooks;
 /* If the selection owner takes too long to reply to a selection request,
    we give up on it.  This is in seconds (0 = no timeout).
  */
-int x_selection_timeout;
+Fixnum x_selection_timeout;
 
 /* Enable motif selection optimizations. */
 int x_selection_strict_motif_ownership;
@@ -1628,6 +1628,14 @@ Set the value of the named CUTBUFFER (typically CUT_BUFFER0) to STRING.
          continue;
        }
 
+#ifdef UTF2000
+      if ((*ptr) <= 0xC3)
+       {
+         chartypes = LATIN_1;
+         ptr += 2;
+         continue;
+       }
+#else
       if ((*ptr) == LEADING_BYTE_LATIN_ISO8859_1 ||
          (*ptr) == LEADING_BYTE_CONTROL_1)
        {
@@ -1635,6 +1643,7 @@ Set the value of the named CUTBUFFER (typically CUT_BUFFER0) to STRING.
          ptr += 2;
          continue;
        }
+#endif
 
       chartypes = WORLD;
       break;
@@ -1782,7 +1791,7 @@ A value of 0 means wait as long as necessary.  This is initialized from the
   x_selection_timeout = 0;
 
   DEFVAR_BOOL ("x-selection-strict-motif-ownership", &x_selection_strict_motif_ownership /*
-*If true and XEmacs already owns the clipboard, don't own it again in the
+*If nil and XEmacs already owns the clipboard, don't own it again in the
 Motif way. Owning the selection on the Motif way does a huge amount of
 X protocol, and it makes killing text incredibly slow when using an
 X terminal.  However, when enabled Motif text fields don't bother to look up