# HG changeset patch
# User kkm
# Date 991269041 0
# Node ID ed8e2ee8d29d79f5ceca4be155bd01e82150d834
# Parent  28e2f03164f1096d8ef2d1bb6f32ee49549ae998
[xemacs-hg @ 2001-05-31 00:30:39 by kkm]
My 2 patches of 05/24/01

diff -r 28e2f03164f1 -r ed8e2ee8d29d src/ChangeLog
--- a/src/ChangeLog	Tue May 29 08:03:09 2001 +0000
+++ b/src/ChangeLog	Thu May 31 00:30:41 2001 +0000
@@ -1,3 +1,9 @@
+2001-05-24  Kirill 'Big K' Katsnelson  <kkm@dtmx.com>
+
+	* redisplay.c (redisplay_device): Allow preemption on redisplay.
+
+	* event-msw.c (WM_DROPFILES): Use correct type for OLE characters.
+
 2001-05-29  Mike Alexander  <mta@arbortext.com>
 
 	* console-msw.h (FRAME_MSPRINTER_CHARHEIGHT): Unswap
diff -r 28e2f03164f1 -r ed8e2ee8d29d src/event-msw.c
--- a/src/event-msw.c	Tue May 29 08:03:09 2001 +0000
+++ b/src/event-msw.c	Thu May 31 00:30:41 2001 +0000
@@ -2962,7 +2962,7 @@
 		    if (psl->lpVtbl->QueryInterface (psl, &IID_IPersistFile,
 						     &ppf) == S_OK)
 		      {
-			WORD wsz[PATH_MAX];
+			OLECHAR wsz[PATH_MAX];
 			WIN32_FIND_DATA wfd;
 			LPSTR resolved = (char *) xmalloc (PATH_MAX+1);
 
diff -r 28e2f03164f1 -r ed8e2ee8d29d src/redisplay.c
--- a/src/redisplay.c	Tue May 29 08:03:09 2001 +0000
+++ b/src/redisplay.c	Thu May 31 00:30:41 2001 +0000
@@ -6473,7 +6473,7 @@
     {
       if (CLASS_REDISPLAY_FLAGS_CHANGEDP(f))
 	{
-	  int preempted = redisplay_frame (f, 0);
+	  int preempted = redisplay_frame (f, 1);
 	  if (preempted)
 	    return 1;
 	}
@@ -6502,7 +6502,7 @@
 	{
 	  if (CLASS_REDISPLAY_FLAGS_CHANGEDP (f))
 	    {
-	      int preempted = redisplay_frame (f, 0);
+	      int preempted = redisplay_frame (f, 1);
 	      if (preempted)
 		return 1;
 	    }