[AC21.5] Simplify redisplay-x/separate_textual_runs

Stephen J. Turnbull stephen at xemacs.org
Mon Apr 16 10:30:18 EDT 2007


APPROVE COMMIT 21.5

Per comments by Vin and Olivier.

Vin Shelton writes:

 > Yup - much better!  Please commit.  :-)

Thanks for the confirmation, Vin!  Sorry about the brain damage, I
actually noticed it in the patch but didn't realize that it wasn't
intentional.

src/ChangeLog addition:

2007-04-16  Stephen J. Turnbull  <stephen at xemacs.org>

	* redisplay-x.c (separate_textual_runs_nomule): Oops.  We agreed
	that memcpy didn't work, and used it anyway.  Fix it.


21.5 source patch:
Diff command:   cvs -q diff -u

Index: src/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.1054
diff -u -u -r1.1054 ChangeLog
--- src/ChangeLog	14 Apr 2007 16:10:53 -0000	1.1054
+++ src/ChangeLog	16 Apr 2007 13:47:03 -0000
@@ -1,18 +1,7 @@
+2007-04-16  Stephen J. Turnbull  <stephen at xemacs.org>
 
+	* redisplay-x.c (separate_textual_runs_nomule): Oops.  We agreed
+	that memcpy didn't work, and used it anyway.  Fix it.
 
 2007-04-01  Stephen J. Turnbull  <stephen at xemacs.org>
 
Index: src/redisplay-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/redisplay-x.c,v
retrieving revision 1.47
diff -u -u -r1.47 redisplay-x.c
--- src/redisplay-x.c	5 Apr 2007 02:27:11 -0000	1.47
+++ src/redisplay-x.c	16 Apr 2007 13:47:05 -0000
@@ -145,7 +145,8 @@
   run_storage[0].dimension = 1;
   run_storage[0].charset = Qnil;
 
-  memcpy (text_storage, str, len);
+  while (len--)
+    *text_storage++ = *str++;
   return 1;
 }
 #endif




More information about the XEmacs-Patches mailing list