diff options
| author | James McCoy <jamessan@jamessan.com> | 2020-07-31 17:59:48 -0400 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2020-07-31 17:59:48 -0400 |
| commit | 228d7d948200563292f13723cdd0f947bd0c711c (patch) | |
| tree | e30ac7afb5cfc68470be42e8c5e02907fb44b99b /src/nvim/charset.c | |
| parent | 3e3002b90c46fca8d8d5edebc021e56d95c5e645 (diff) | |
| parent | 1153ac9036ab62ee25078248a01dc56a2311b9a6 (diff) | |
| download | rneovim-228d7d948200563292f13723cdd0f947bd0c711c.tar.gz rneovim-228d7d948200563292f13723cdd0f947bd0c711c.tar.bz2 rneovim-228d7d948200563292f13723cdd0f947bd0c711c.zip | |
Merge remote-tracking branch 'upstream/master' into fileinfo-garbage
Diffstat (limited to 'src/nvim/charset.c')
| -rw-r--r-- | src/nvim/charset.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/nvim/charset.c b/src/nvim/charset.c index 78e7861d9d..f9d5adbc12 100644 --- a/src/nvim/charset.c +++ b/src/nvim/charset.c @@ -8,7 +8,6 @@ #include <assert.h> #include <string.h> #include <wctype.h> -#include <wchar.h> // for towupper() and towlower() #include <inttypes.h> #include "nvim/vim.h" @@ -1087,8 +1086,6 @@ int win_lbr_chartabsize(win_T *wp, char_u *line, char_u *s, colnr_T col, int *he } if (col == 0 || (col + size + sbrlen > (colnr_T)wp->w_width_inner)) { - added = 0; - if (*p_sbr != NUL) { if (size + sbrlen + numberwidth > (colnr_T)wp->w_width_inner) { // Calculate effective window width. @@ -1573,6 +1570,7 @@ char_u* skiptohex(char_u *q) /// /// @return Pointer to the next whitespace or NUL character. char_u *skiptowhite(const char_u *p) + FUNC_ATTR_NONNULL_ALL { while (*p != ' ' && *p != '\t' && *p != NUL) { p++; |