diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-09-13 19:32:06 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-13 19:32:06 -0700 |
| commit | 9cf8cf605d85ec043d4e39f73ac42c7482c6f901 (patch) | |
| tree | b0a8ec8985c5bdfb1882ee847ff64b42c98d3e0a /src/nvim/buffer.c | |
| parent | 427cf16e44d047c14e0ca1b95eb09fc8b8eb2f3d (diff) | |
| parent | 6aae0e7c943267d2109ae20ec5086791c3b94a5e (diff) | |
| download | rneovim-9cf8cf605d85ec043d4e39f73ac42c7482c6f901.tar.gz rneovim-9cf8cf605d85ec043d4e39f73ac42c7482c6f901.tar.bz2 rneovim-9cf8cf605d85ec043d4e39f73ac42c7482c6f901.zip | |
Merge #11015 from justinmk/getdigits
getdigits: introduce `strict`, `def` parameters
Diffstat (limited to 'src/nvim/buffer.c')
| -rw-r--r-- | src/nvim/buffer.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c index 8fd4360aed..b50c764ac3 100644 --- a/src/nvim/buffer.c +++ b/src/nvim/buffer.c @@ -1016,8 +1016,9 @@ do_bufdel( break; } arg = p; - } else - bnr = getdigits_int(&arg); + } else { + bnr = getdigits_int(&arg, false, 0); + } } } if (!got_int && do_current @@ -3626,10 +3627,7 @@ int build_stl_str_hl( // The first digit group is the item's min width if (ascii_isdigit(*fmt_p)) { - minwid = getdigits_int(&fmt_p); - if (minwid < 0) { // overflow - minwid = 0; - } + minwid = getdigits_int(&fmt_p, false, 0); } // User highlight groups override the min width field @@ -3712,10 +3710,7 @@ int build_stl_str_hl( if (*fmt_p == '.') { fmt_p++; if (ascii_isdigit(*fmt_p)) { - maxwid = getdigits_int(&fmt_p); - if (maxwid <= 0) { // overflow - maxwid = 50; - } + maxwid = getdigits_int(&fmt_p, false, 50); } } @@ -5078,7 +5073,7 @@ chk_modeline( } else { e = s + 3; } - if (getdigits_safe(&e, &vers) != OK) { + if (!try_getdigits(&e, &vers)) { continue; } |