diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-03-30 18:25:39 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-03-30 18:25:39 +0100 |
| commit | bd9bf266fccbf7b7f09e476e09b61f0133e914db (patch) | |
| tree | 48ce27fd7b5539ec54a8ec76f17bdac7579691fb | |
| parent | aff749145e23c0f20b5158d1d3a942948ed138e3 (diff) | |
patch 8.1.1085: compiler warning for possibly uninitialized variablev8.1.1085
Problem: Compiler warning for possibly uninitialized variable. (Tony
Mechelynck)
Solution: Make conditions more logical.
| -rw-r--r-- | src/arabic.c | 25 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 17 insertions, 10 deletions
diff --git a/src/arabic.c b/src/arabic.c index d323abf644..efc6aa66db 100644 --- a/src/arabic.c +++ b/src/arabic.c @@ -363,18 +363,23 @@ arabic_shape( int backward_combine = !prev_laa && can_join(prev_c, c); int forward_combine = can_join(c, next_c); - if (backward_combine && forward_combine) - curr_c = curr_a->medial; - if (backward_combine && !forward_combine) - curr_c = curr_a->final; - if (!backward_combine && forward_combine) - curr_c = curr_a->initial; - if (!backward_combine && !forward_combine) - curr_c = curr_a->isolated; + if (backward_combine) + { + if (forward_combine) + curr_c = curr_a->medial; + else + curr_c = curr_a->final; + } + else + { + if (forward_combine) + curr_c = curr_a->initial; + else + curr_c = curr_a->isolated; + } } - // Sanity check -- curr_c should, in the future, never be 0. - // We should, in the future, insert a fatal error here. + // Character missing from the table means using original character. if (curr_c == NUL) curr_c = c; diff --git a/src/version.c b/src/version.c index 74fa0bd55f..a4744722db 100644 --- a/src/version.c +++ b/src/version.c @@ -776,6 +776,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1085, +/**/ 1084, /**/ 1083, |