diff options
author | bfredl <bjorn.linse@gmail.com> | 2024-11-06 10:19:28 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-11-06 10:19:28 +0100 |
commit | c0f222d55b780831382a4034cec5c643d0504f58 (patch) | |
tree | fe16c8cf648a058889de60c8e033b3e201053b11 /src/nvim/diff.c | |
parent | 04274a417358a4eb9b3b3d1f7e1ea4a4b4419c5c (diff) | |
parent | cbc9a03f58394bbb85bbe70c48856cc1efca4ab7 (diff) | |
download | rneovim-c0f222d55b780831382a4034cec5c643d0504f58.tar.gz rneovim-c0f222d55b780831382a4034cec5c643d0504f58.tar.bz2 rneovim-c0f222d55b780831382a4034cec5c643d0504f58.zip |
Merge pull request #31062 from famiu/refactor/options/ff_macro
refactor(options): remove fileformat macros
Diffstat (limited to 'src/nvim/diff.c')
-rw-r--r-- | src/nvim/diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nvim/diff.c b/src/nvim/diff.c index d22fb65827..a690c70875 100644 --- a/src/nvim/diff.c +++ b/src/nvim/diff.c @@ -801,7 +801,7 @@ static int diff_write(buf_T *buf, diffin_T *din) // Always use 'fileformat' set to "unix". char *save_ff = buf->b_p_ff; - buf->b_p_ff = xstrdup(FF_UNIX); + buf->b_p_ff = xstrdup("unix"); const bool save_cmod_flags = cmdmod.cmod_flags; // Writing the buffer is an implementation detail of performing the diff, // so it shouldn't update the '[ and '] marks. |