APPROVE COMMIT NOTE: This patch has been committed. # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net&gt; # Date 1489244504 0 # Sat Mar 11 15:01:44 2017 +0000 # Node ID 983dba76721858b22ec0249092ac251354449368 # Parent 3c65e6055691e8ef6705f25cf30477c483890aaa Use valid_unicode_leading_surrogate correctly in separate_t_r_xft_mule(). src/ChangeLog addition: 2017-03-11 Aidan Kehoe <kehoea(a)parhasard.net&gt; * redisplay-xlike-inc.c (separate_textual_runs_xft_mule): Correct a thinko here introduced in the last change, the new name is valid_unicode_leading_surrogate(). Thank you for the report, Mike Sperber! diff -r 3c65e6055691 -r 983dba767218 src/ChangeLog --- a/src/ChangeLog Fri Mar 10 21:54:07 2017 +0000 +++ b/src/ChangeLog Sat Mar 11 15:01:44 2017 +0000 ＠＠ -1,3 +1,10 ＠＠ +2017-03-11 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * redisplay-xlike-inc.c (separate_textual_runs_xft_mule): + Correct a thinko here introduced in the last change, the new name + is valid_unicode_leading_surrogate(). Thank you for the report, + Mike Sperber! + 2017-03-10 Aidan Kehoe <kehoea(a)parhasard.net&gt; Get the recent redisplay changes building on mswindows with diff -r 3c65e6055691 -r 983dba767218 src/redisplay-xlike-inc.c --- a/src/redisplay-xlike-inc.c Fri Mar 10 21:54:07 2017 +0000 +++ b/src/redisplay-xlike-inc.c Sat Mar 11 15:01:44 2017 +0000 ＠＠ -283,7 +283,7 ＠＠ runs_so_far++; } - if (valid_utf_16_leading_surrogate (*((XftChar16 *) (text_storage)))) + if (valid_unicode_leading_surrogate (*((XftChar16 *) (text_storage)))) { text_storage += sizeof (XftChar16); } -- ‘As I sat looking up at the Guinness ad, I could never figure out / How your man stayed up on the surfboard after forty pints of stout’ (C. Moore)