Mercurial > vim

comparison src/arabic.c @ 16160:061cf939f7ce v8.1.1085

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1085: compiler warning for possibly uninitialized variable commit https://github.com/vim/vim/commit/bd9bf266fccbf7b7f09e476e09b61f0133e914db Author: Bram Moolenaar <Bram@vim.org> Date: Sat Mar 30 18:25:39 2019 +0100 patch 8.1.1085: compiler warning for possibly uninitialized variable Problem: Compiler warning for possibly uninitialized variable. (Tony Mechelynck) Solution: Make conditions more logical.
author Bram Moolenaar <Bram@vim.org>
date Sat, 30 Mar 2019 18:30:04 +0100
parents 473fbdb2717c
children 7334bf933510
comparison
equal deleted inserted replaced
16159:a246f204d996 16160:061cf939f7ce
361 { 361 {
362 struct achar *curr_a = find_achar(c); 362 struct achar *curr_a = find_achar(c);
363 int backward_combine = !prev_laa && can_join(prev_c, c); 363 int backward_combine = !prev_laa && can_join(prev_c, c);
364 int forward_combine = can_join(c, next_c); 364 int forward_combine = can_join(c, next_c);
365 365
366 if (backward_combine && forward_combine) 366 if (backward_combine)
367 curr_c = curr_a->medial; 367 {
368 if (backward_combine && !forward_combine) 368 if (forward_combine)
369 curr_c = curr_a->final; 369 curr_c = curr_a->medial;
370 if (!backward_combine && forward_combine) 370 else
371 curr_c = curr_a->initial; 371 curr_c = curr_a->final;
372 if (!backward_combine && !forward_combine) 372 }
373 curr_c = curr_a->isolated; 373 else
374 } 374 {
375 375 if (forward_combine)
376 // Sanity check -- curr_c should, in the future, never be 0. 376 curr_c = curr_a->initial;
377 // We should, in the future, insert a fatal error here. 377 else
378 curr_c = curr_a->isolated;
379 }
380 }
381
382 // Character missing from the table means using original character.
378 if (curr_c == NUL) 383 if (curr_c == NUL)
379 curr_c = c; 384 curr_c = c;
380 385
381 if (curr_c != c && ccp != NULL) 386 if (curr_c != c && ccp != NULL)
382 { 387 {