Mercurial > vim
comparison src/textprop.c @ 19644:d2153928b376 v8.2.0379
patch 8.2.0379: gcc warns for ambiguous else
Commit: https://github.com/vim/vim/commit/965fd8d4dc5e84f612d8fc1efeaa78bd17842c9b
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Mar 14 07:46:40 2020 +0100
patch 8.2.0379: gcc warns for ambiguous else
Problem: Gcc warns for ambiguous else.
Solution: Add braces. (Dominique Pelle, closes https://github.com/vim/vim/issues/5778)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 14 Mar 2020 08:00:07 +0100 |
| parents | 647ef636a11e |
| children | d067be761cd7 |
comparison
equal
deleted
inserted
replaced
| 19643:e9bfd6b3a478 | 19644:d2153928b376 |
|---|---|
| 662 { | 662 { |
| 663 mch_memmove(&prop, text + textlen + i * sizeof(textprop_T), | 663 mch_memmove(&prop, text + textlen + i * sizeof(textprop_T), |
| 664 sizeof(textprop_T)); | 664 sizeof(textprop_T)); |
| 665 | 665 |
| 666 if (lnum == lnum_start) | 666 if (lnum == lnum_start) |
| 667 { | |
| 667 if (dir < 0) | 668 if (dir < 0) |
| 668 { | 669 { |
| 669 if (col < prop.tp_col) | 670 if (col < prop.tp_col) |
| 670 break; | 671 break; |
| 671 } | 672 } |
| 672 else if (prop.tp_col + prop.tp_len - (prop.tp_len != 0) < col) | 673 else if (prop.tp_col + prop.tp_len - (prop.tp_len != 0) < col) |
| 673 continue; | 674 continue; |
| 674 | 675 } |
| 675 if (prop.tp_id == id || prop.tp_type == type_id) | 676 if (prop.tp_id == id || prop.tp_type == type_id) |
| 676 { | 677 { |
| 677 // Check if the starting position has text props. | 678 // Check if the starting position has text props. |
| 678 if (lnum_start == lnum | 679 if (lnum_start == lnum |
| 679 && col >= prop.tp_col | 680 && col >= prop.tp_col |