diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2015-01-11 15:34:38 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-01-11 15:34:38 -0500 |
| commit | 7f30439d0f4d8d7e6b18f56d83d6fe868c84318c (patch) | |
| tree | cdbe41bd51e1db7ba38b4ecc84d562b21c374a06 /src/nvim/diff.c | |
| parent | a684cc175a6c1ca2cfc3bff2d68383d32008cb3b (diff) | |
| parent | 7f7262e93390a1855ac9c687bd492eadfe10cf98 (diff) | |
| download | rneovim-7f30439d0f4d8d7e6b18f56d83d6fe868c84318c.tar.gz rneovim-7f30439d0f4d8d7e6b18f56d83d6fe868c84318c.tar.bz2 rneovim-7f30439d0f4d8d7e6b18f56d83d6fe868c84318c.zip | |
Merge pull request #1794 from elmart/remove-long_u-cleanup
Some suggested cleanup after #1788.
Diffstat (limited to 'src/nvim/diff.c')
| -rw-r--r-- | src/nvim/diff.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/nvim/diff.c b/src/nvim/diff.c index 7e31c3f216..6cc75e948c 100644 --- a/src/nvim/diff.c +++ b/src/nvim/diff.c @@ -1221,11 +1221,11 @@ static void diff_read(int idx_orig, int idx_new, char_u *fname) // {first}a{first}[,{last}] // {first}[,{last}]d{first} p = linebuf; - f1 = getdigits(&p); + f1 = getdigits_long(&p); if (*p == ',') { ++p; - l1 = getdigits(&p); + l1 = getdigits_long(&p); } else { l1 = f1; } @@ -1235,11 +1235,11 @@ static void diff_read(int idx_orig, int idx_new, char_u *fname) continue; } difftype = *p++; - f2 = getdigits(&p); + f2 = getdigits_long(&p); if (*p == ',') { ++p; - l2 = getdigits(&p); + l2 = getdigits_long(&p); } else { l2 = f2; } @@ -1783,7 +1783,7 @@ int diffopt_changed(void) diff_flags_new |= DIFF_FILLER; } else if ((STRNCMP(p, "context:", 8) == 0) && VIM_ISDIGIT(p[8])) { p += 8; - diff_context_new = getdigits(&p); + diff_context_new = getdigits_int(&p); } else if (STRNCMP(p, "icase", 5) == 0) { p += 5; diff_flags_new |= DIFF_ICASE; @@ -1798,7 +1798,7 @@ int diffopt_changed(void) diff_flags_new |= DIFF_VERTICAL; } else if ((STRNCMP(p, "foldcolumn:", 11) == 0) && VIM_ISDIGIT(p[11])) { p += 11; - diff_foldcolumn_new = getdigits(&p); + diff_foldcolumn_new = getdigits_int(&p); } if ((*p != ',') && (*p != NUL)) { |