[Emacs-diffs] Changes to emacs/src/w32select.c [lexbind]

[Miles Bader]

Index: emacs/src/w32select.c
diff -c emacs/src/w32select.c:1.23.4.1 emacs/src/w32select.c:1.23.4.2
*** emacs/src/w32select.c:1.23.4.1      Fri Apr  4 01:21:04 2003
--- emacs/src/w32select.c       Tue Oct 14 19:22:48 2003
***************
*** 41,49 ****
  /* Coding system for the next communicating with other Windows programs.  */
  static Lisp_Object Vnext_selection_coding_system;
  
! /* The last text we put into the clipboard.  This is used to prevent
!    passing back our own text from the clipboard, instead of using the
!    kill ring.  The former is undesirable because the clipboard data
     could be MULEtilated by inappropriately chosen
     (next-)selection-coding-system.  For this reason, we must store the
     text *after* it was encoded/Unix-to-DOS-converted.  */
--- 41,54 ----
  /* Coding system for the next communicating with other Windows programs.  */
  static Lisp_Object Vnext_selection_coding_system;
  
! /* Sequence number, used where possible to detect when we are pasting
!    our own text.  */
! static DWORD last_clipboard_sequence_number;
! extern ClipboardSequence_Proc clipboard_sequence_fn;
! 
! /* The last text we put into the clipboard.  This is used when the OS
!    does not support sequence numbers (NT4, 95). It is undesirable to
!    use data put on the clipboard by Emacs because the clipboard data
     could be MULEtilated by inappropriately chosen
     (next-)selection-coding-system.  For this reason, we must store the
     text *after* it was encoded/Unix-to-DOS-converted.  */
***************
*** 217,233 ****
        encode_coding (&coding, src, dst, nbytes, bufsize);
        Vlast_coding_system_used = coding.symbol;
  
!         /* Stash away the data we are about to put into the clipboard, so we
!            could later check inside Fw32_get_clipboard_data whether
!            the clipboard still holds our data.  */
!         if (clipboard_storage_size < coding.produced)
!           {
!             clipboard_storage_size = coding.produced + 100;
!             last_clipboard_text = (char *) xrealloc (last_clipboard_text,
!                                                      clipboard_storage_size);
!           }
!         if (last_clipboard_text)
!           memcpy (last_clipboard_text, dst, coding.produced);
  
        GlobalUnlock (htext);
  
--- 222,244 ----
        encode_coding (&coding, src, dst, nbytes, bufsize);
        Vlast_coding_system_used = coding.symbol;
  
!       /* If clipboard sequence numbers are not supported, keep a copy for
!          later comparison.  */
!       if (!clipboard_sequence_fn)
!         {
!           /* Stash away the data we are about to put into the
!              clipboard, so we could later check inside
!              Fw32_get_clipboard_data whether the clipboard still
!              holds our data.  */
!           if (clipboard_storage_size < coding.produced)
!             {
!               clipboard_storage_size = coding.produced + 100;
!               last_clipboard_text = (char *) xrealloc (last_clipboard_text,
!                                                        
clipboard_storage_size);
!             }
!           if (last_clipboard_text)
!             memcpy (last_clipboard_text, dst, coding.produced);
!         }
  
        GlobalUnlock (htext);
  
***************
*** 243,248 ****
--- 254,262 ----
  
    ok = EmptyClipboard () && SetClipboardData (CF_TEXT, htext);
  
+   if (clipboard_sequence_fn)
+     last_clipboard_sequence_number = clipboard_sequence_fn ();
+ 
    CloseClipboard ();
  
    if (ok) goto done;
***************
*** 254,259 ****
--- 268,275 ----
    if (last_clipboard_text)
      *last_clipboard_text = '\0';
  
+   last_clipboard_sequence_number = 0;
+ 
   done:
    UNBLOCK_INPUT;
  
***************
*** 297,305 ****
         data in the clipboard.  This is so we don't pass our own text
         from the clipboard (which might be troublesome if the killed
         text includes null characters).  */
!     if (last_clipboard_text
!         && clipboard_storage_size >= nbytes
!         && memcmp(last_clipboard_text, src, nbytes) == 0)
        goto closeclip;
  
      {
--- 313,323 ----
         data in the clipboard.  This is so we don't pass our own text
         from the clipboard (which might be troublesome if the killed
         text includes null characters).  */
!     if ((clipboard_sequence_fn
!        && clipboard_sequence_fn () == last_clipboard_sequence_number)
!       || (last_clipboard_text
!           && clipboard_storage_size >= nbytes
!           && memcmp(last_clipboard_text, src, nbytes) == 0))
        goto closeclip;
  
      {
***************
*** 471,473 ****
--- 489,494 ----
  
    QCLIPBOARD = intern ("CLIPBOARD");  staticpro (&QCLIPBOARD);
  }
+ 
+ /* arch-tag: c96e9724-5eb1-4dad-be07-289f092fd2af
+    (do not change this comment) */