aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2019-01-02 18:00:46 +0200
committerEli Zaretskii2019-01-02 18:00:46 +0200
commitf7ccac9f9d82019d4d5ba3182200422fbc9c7e67 (patch)
tree0714b4ee8e327e5020e7e3ec2cb5fa3e537ea81d
parent1cef2d7cbea407eaeff5c65e9594e03fabe3bf5e (diff)
downloademacs-f7ccac9f9d82019d4d5ba3182200422fbc9c7e67.tar.gz
emacs-f7ccac9f9d82019d4d5ba3182200422fbc9c7e67.zip
; Fix last change in src /composite.c.
-rw-r--r--src/composite.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/composite.c b/src/composite.c
index 7cb97934a20..77bb79a0cfe 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -1215,6 +1215,10 @@ composition_reseat_it (struct composition_it *cmp_it, ptrdiff_t charpos,
1215 continue; 1215 continue;
1216 if (charpos < endpos) 1216 if (charpos < endpos)
1217 { 1217 {
1218 if (pdir == L2R)
1219 direction = QL2R;
1220 else if (pdir == R2L)
1221 direction = QR2L;
1218 for (; CONSP (val); val = XCDR (val)) 1222 for (; CONSP (val); val = XCDR (val))
1219 { 1223 {
1220 elt = XCAR (val); 1224 elt = XCAR (val);
@@ -1223,10 +1227,6 @@ composition_reseat_it (struct composition_it *cmp_it, ptrdiff_t charpos,
1223 continue; 1227 continue;
1224 if (XFIXNAT (AREF (elt, 1)) != cmp_it->lookback) 1228 if (XFIXNAT (AREF (elt, 1)) != cmp_it->lookback)
1225 goto no_composition; 1229 goto no_composition;
1226 if (pdir == L2R)
1227 direction = QL2R;
1228 else if (pdir == R2L)
1229 direction = QR2L;
1230 lgstring = autocmp_chars (elt, charpos, bytepos, endpos, 1230 lgstring = autocmp_chars (elt, charpos, bytepos, endpos,
1231 w, face, string, direction); 1231 w, face, string, direction);
1232 if (composition_gstring_p (lgstring)) 1232 if (composition_gstring_p (lgstring))