diff options
| author | Vibhav Pant | 2020-08-21 14:04:35 +0530 |
|---|---|---|
| committer | Vibhav Pant | 2020-08-21 14:04:35 +0530 |
| commit | f0f8d7b82492e741950c363a03b886965c91b1b0 (patch) | |
| tree | 19b716830b1ebabc0d7d75949c4e6800c0f104ad /src/composite.c | |
| parent | 9e64a087c4d167e7ec1c4e22bea3e6af53b563de (diff) | |
| parent | c818c29771d3cb51875643b2f6c894073e429dd2 (diff) | |
| download | emacs-feature/native-comp-macos-fixes.tar.gz emacs-feature/native-comp-macos-fixes.zip | |
Merge branch 'feature/native-comp' into feature/native-comp-macos-fixesfeature/native-comp-macos-fixes
Diffstat (limited to 'src/composite.c')
| -rw-r--r-- | src/composite.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/composite.c b/src/composite.c index ec2b8328f78..984e0d9cda8 100644 --- a/src/composite.c +++ b/src/composite.c | |||
| @@ -1258,7 +1258,7 @@ composition_reseat_it (struct composition_it *cmp_it, ptrdiff_t charpos, | |||
| 1258 | is backward in the buffer, which can only happen if the | 1258 | is backward in the buffer, which can only happen if the |
| 1259 | display routines were called to perform the bidi | 1259 | display routines were called to perform the bidi |
| 1260 | reordering. But it doesn't harm to test for that, and | 1260 | reordering. But it doesn't harm to test for that, and |
| 1261 | avoid someon raising their brows and thinking it's a | 1261 | avoid someone raising their brows and thinking it's a |
| 1262 | subtle bug... */ | 1262 | subtle bug... */ |
| 1263 | if (bidi_level < 0) | 1263 | if (bidi_level < 0) |
| 1264 | direction = Qnil; | 1264 | direction = Qnil; |
| @@ -1939,7 +1939,7 @@ syms_of_composite (void) | |||
| 1939 | staticpro (&gstring_hash_table); | 1939 | staticpro (&gstring_hash_table); |
| 1940 | 1940 | ||
| 1941 | staticpro (&gstring_work_headers); | 1941 | staticpro (&gstring_work_headers); |
| 1942 | gstring_work_headers = make_uninit_vector (8); | 1942 | gstring_work_headers = make_nil_vector (8); |
| 1943 | for (i = 0; i < 8; i++) | 1943 | for (i = 0; i < 8; i++) |
| 1944 | ASET (gstring_work_headers, i, make_nil_vector (i + 2)); | 1944 | ASET (gstring_work_headers, i, make_nil_vector (i + 2)); |
| 1945 | staticpro (&gstring_work); | 1945 | staticpro (&gstring_work); |