Revision: [email protected]/emacs--unicode--0--patch-15

Merge from emacs--cvs-trunk--0

Patches applied:

 * [email protected]/emacs--cvs-trunk--0--patch-218
 - [email protected]/emacs--cvs-trunk--0--patch-220
   Update from CVS

 * [email protected]/emacs--cvs-trunk--0--patch-221
   Restore deleted tagline in etc/TUTORIAL.ru

 * [email protected]/emacs--cvs-trunk--0--patch-222
 - [email protected]/emacs--cvs-trunk--0--patch-228
   Update from CVS

 * [email protected]/emacs--cvs-trunk--0--patch-229
   Remove TeX output files from the archive

 * [email protected]/emacs--cvs-trunk--0--patch-230
 - [email protected]/emacs--cvs-trunk--0--patch-247
   Update from CVS

 * [email protected]/emacs--cvs-trunk--0--patch-248
   src/lisp.h (CYCLE_CHECK): Macro moved from xfaces.c

 * [email protected]/emacs--cvs-trunk--0--patch-249
 - [email protected]/emacs--cvs-trunk--0--patch-256
   Update from CVS

 * [email protected]/emacs--cvs-trunk--0--patch-258
 - [email protected]/emacs--cvs-trunk--0--patch-263
   Update from CVS

 * [email protected]/emacs--cvs-trunk--0--patch-264
   Update from CVS: lispref/display.texi: emacs -> Emacs.

 * [email protected]/emacs--cvs-trunk--0--patch-265
 - [email protected]/emacs--cvs-trunk--0--patch-274
   Update from CVS

 * [email protected]/emacs--cvs-trunk--0--patch-275
   Update from CVS: man/makefile.w32-in: Revert last change

 * [email protected]/emacs--cvs-trunk--0--patch-276
 - [email protected]/emacs--cvs-trunk--0--patch-295
   Update from CVS

 * [email protected]/emacs--cvs-trunk--0--patch-296
   Allow restarting an existing debugger session that's exited

 * [email protected]/emacs--cvs-trunk--0--patch-297
 - [email protected]/emacs--cvs-trunk--0--patch-299
   Update from CVS

 * [email protected]/emacs--cvs-trunk--0--patch-300
 - [email protected]/emacs--cvs-trunk--0--patch-327
   Update from CVS

 * [email protected]/emacs--cvs-trunk--0--patch-328
   Update from CVS: src/.gdbinit (xsymbol): Fix last change.

 * [email protected]/emacs--cvs-trunk--0--patch-329
 - [email protected]/emacs--cvs-trunk--0--patch-344
   Update from CVS

 * [email protected]/emacs--cvs-trunk--0--patch-345
   Tweak source regexps so that building in place won't cause problems

 * [email protected]/emacs--cvs-trunk--0--patch-346
 - [email protected]/emacs--cvs-trunk--0--patch-351
   Update from CVS

 * [email protected]/emacs--cvs-trunk--0--patch-352
   Update from CVS: lisp/flymake.el: New file.

 * [email protected]/emacs--cvs-trunk--0--patch-353
 - [email protected]/emacs--cvs-trunk--0--patch-361
   Update from CVS

 * [email protected]/emacs--cvs-trunk--0--patch-362
   Support " [...]" style defaults in minibuffer-electric-default-mode

 * [email protected]/emacs--cvs-trunk--0--patch-363
   (read-number): Use canonical format for default in prompt.

 * [email protected]/emacs--cvs-trunk--0--patch-364
 - [email protected]/emacs--cvs-trunk--0--patch-367
   Update from CVS

 * [email protected]/emacs--cvs-trunk--0--patch-368
   Improve display-supports-face-attributes-p on non-ttys

 * [email protected]/emacs--cvs-trunk--0--patch-369
   Rewrite face-differs-from-default-p

 * [email protected]/emacs--cvs-trunk--0--patch-370
   Move `display-supports-face-attributes-p' entirely into C code

 * [email protected]/emacs--cvs-trunk--0--patch-371
   Update from CVS

 * [email protected]/emacs--cvs-trunk--0--patch-372
   Simplify face-differs-from-default-p; don't consider :stipple.

 * [email protected]/emacs--cvs-trunk--0--patch-373
   Update from CVS

 * [email protected]/emacs--cvs-trunk--0--patch-374
   (tty_supports_face_attributes_p): Ensure attributes differ from default

 * [email protected]/emacs--cvs-trunk--0--patch-375
 - [email protected]/emacs--cvs-trunk--0--patch-376
   Update from CVS

 * [email protected]/emacs--cvs-trunk--0--patch-377
   (Fdisplay_supports_face_attributes_p): Work around bootstrapping problem

 * [email protected]/emacs--cvs-trunk--0--patch-378
 - [email protected]/emacs--cvs-trunk--0--patch-380
   Update from CVS

 * [email protected]/emacs--cvs-trunk--0--patch-381
   Face merging cleanups

 * [email protected]/emacs--cvs-trunk--0--patch-382
 - [email protected]/emacs--cvs-trunk--0--patch-384
   Update from CVS

 * [email protected]/emacs--cvs-trunk--0--patch-385
   src/xfaces.c (push_named_merge_point): Return 0 if a cycle is detected

 * [email protected]/emacs--cvs-trunk--0--patch-386
 - [email protected]/emacs--cvs-trunk--0--patch-395
   Update from CVS

 * [email protected]/emacs--cvs-trunk--0--patch-396
   Tweak arch tagging to make build/install-in-place less annoying

 * [email protected]/emacs--cvs-trunk--0--patch-397
   Work around vc-arch problems when building eshell

 * [email protected]/emacs--cvs-trunk--0--patch-398
   Tweak permissions

 * [email protected]/emacs--cvs-trunk--0--patch-399
   Tweak directory permissions

 * [email protected]/emacs--cvs-trunk--0--patch-400
   Update from CVS

 * [email protected]/emacs--cvs-trunk--0--patch-401
   More build-in-place tweaking of arch tagging

 * [email protected]/emacs--cvs-trunk--0--patch-402
   Update from CVS

 * [email protected]/emacs--cvs-trunk--0--patch-403
   Yet more build-in-place tweaking of arch tagging

 * [email protected]/emacs--cvs-trunk--0--patch-404
 - [email protected]/emacs--cvs-trunk--0--patch-409
   Update from CVS

 * [email protected]/emacs--cvs-trunk--0--patch-410
   Make sure image types are initialized for lookup too

 * [email protected]/emacs--cvs-trunk--0--patch-411
 - [email protected]/emacs--cvs-trunk--0--patch-416
   Update from CVS

1 files changed, 9 insertions, 2 deletions

diff --git a/src/w32select.c b/src/w32select.c
index 21f828d1f0..cc0ca64fab 100644
--- a/src/w32select.c
+++ b/src/w32select.c
@@ -249,11 +249,18 @@ DEFUN ("w32-set-clipboard-data", Fw32_set_clipboard_data,
 
   ok = EmptyClipboard () && SetClipboardData (CF_TEXT, htext);
 
+  CloseClipboard ();
+
+  /* Common sense says to read the sequence number inside the
+     OpenClipboard/ CloseClipboard block to avoid race conditions
+     where another app puts something on the clipboard straight after
+     us. But experience suggests that the sequence number from the
+     SetClipboardData is not allocated until we close the clipboard!
+     Since clipboard operations are normally user-driven, the race
+     condition is probably not going to really happen.  */
   if (clipboard_sequence_fn)
     last_clipboard_sequence_number = clipboard_sequence_fn ();
 
-  CloseClipboard ();
-
   if (ok) goto done;
 
  error: