summaryrefslogtreecommitdiff
path: root/src/evalfunc.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-02-15 21:06:09 +0100
committerBram Moolenaar <Bram@vim.org>2019-02-15 21:06:09 +0100
commit00590740081489db69f43d9f1c0e3f70e29ce6da (patch)
tree5200046e5c39885c50b5057cca9110975a629eb5 /src/evalfunc.c
parente93e5a504f481bd0dad9c504d5fcf0e5f0dfc6e6 (diff)
downloadvim-git-00590740081489db69f43d9f1c0e3f70e29ce6da.tar.gz
patch 8.1.0927: USE_CR is never definedv8.1.0927
Problem: USE_CR is never defined. Solution: Remove usage of USE_CR. (Ken Takata, closes #3958)
Diffstat (limited to 'src/evalfunc.c')
-rw-r--r--src/evalfunc.c16
1 files changed, 1 insertions, 15 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c
index e693ef913..f1cb9dc60 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -13431,20 +13431,7 @@ get_cmd_output_as_rettv(
else
{
res = get_cmd_output(tv_get_string(&argvars[0]), infile, flags, NULL);
-#ifdef USE_CR
- /* translate <CR> into <NL> */
- if (res != NULL)
- {
- char_u *s;
-
- for (s = res; *s; ++s)
- {
- if (*s == CAR)
- *s = NL;
- }
- }
-#else
-# ifdef USE_CRNL
+#ifdef USE_CRNL
/* translate <CR><NL> into <NL> */
if (res != NULL)
{
@@ -13459,7 +13446,6 @@ get_cmd_output_as_rettv(
}
*d = NUL;
}
-# endif
#endif
rettv->vval.v_string = res;
res = NULL;