fb3dffb7c4
* Rebase accept-crlf.patch file. * Remove rgb.txt install command. Fixes https://github.com/msys2/MSYS2-packages/issues/3043
99 lines
3.1 KiB
Diff
99 lines
3.1 KiB
Diff
From: Johannes Schindelin <johannes.schindelin@gmx.de>
|
|
Date: Tue, 15 Sep 2015 12:57:37 +0200
|
|
Subject: [PATCH] Always accept CR/LF in MSys2
|
|
|
|
Since we are running on Windows, we have to expect that at least some
|
|
files or input use DOS line endings, still.
|
|
|
|
It is okay, of course, to behave like Unix vim otherwise, e.g. to create
|
|
LF-only files by default.
|
|
|
|
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
|
|
---
|
|
src/scriptfile.c | 10 +++++-----
|
|
src/fileio.c | 2 +-
|
|
src/quickfix.c | 2 +-
|
|
4 files changed, 8 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/src/scriptfile.c b/src/scriptfile.c
|
|
index 30f9e9d..c2d6e0f 100644
|
|
--- a/src/scriptfile.c
|
|
+++ b/src/scriptfile.c
|
|
@@ -1510,7 +1510,7 @@
|
|
else if (is_vimrc == DOSO_GVIMRC)
|
|
vimrc_found(fname_exp, (char_u *)"MYGVIMRC");
|
|
|
|
-#ifdef USE_CRNL
|
|
+#if defined(__MSYS__) || defined(USE_CRNL)
|
|
// If no automatic file format: Set default to CR-NL.
|
|
if (*p_ffs == NUL)
|
|
cookie.fileformat = EOL_DOS;
|
|
@@ -1940,7 +1940,7 @@
|
|
int len;
|
|
int c;
|
|
char_u *buf;
|
|
-#ifdef USE_CRNL
|
|
+#if defined(__MSYS__) || defined(USE_CRNL)
|
|
int has_cr; // CR-LF found
|
|
#endif
|
|
int have_read = FALSE;
|
|
@@ -1975,7 +1975,7 @@
|
|
break;
|
|
len = ga.ga_len + (int)STRLEN(buf + ga.ga_len);
|
|
}
|
|
-#ifdef USE_CRNL
|
|
+#if defined(__MSYS__) || defined(USE_CRNL)
|
|
// Ignore a trailing CTRL-Z, when in Dos mode. Only recognize the
|
|
// CTRL-Z by its own, or after a NL.
|
|
if ( (len == 1 || (len >= 2 && buf[len - 2] == '\n'))
|
|
@@ -1996,7 +1996,7 @@
|
|
|
|
if (len >= 1 && buf[len - 1] == '\n') // remove trailing NL
|
|
{
|
|
-#ifdef USE_CRNL
|
|
+#if defined(__MSYS__) || defined(USE_CRNL)
|
|
has_cr = (len >= 2 && buf[len - 2] == '\r');
|
|
if (sp->fileformat == EOL_UNKNOWN)
|
|
{
|
|
diff --git a/src/fileio.c b/src/fileio.c
|
|
index 0f3f148..016f15d 100644
|
|
--- a/src/fileio.c
|
|
+++ b/src/fileio.c
|
|
@@ -3024,7 +3024,7 @@ msg_add_fileformat(eol_type)
|
|
STRCAT(IObuff, shortmess(SHM_TEXT) ? _("[mac]") : _("[mac format]"));
|
|
return TRUE;
|
|
}
|
|
-#ifdef USE_CRNL
|
|
+#if defined(__MSYS__) || defined(USE_CRNL) || defined(USE_CR)
|
|
if (eol_type == EOL_UNIX)
|
|
{
|
|
STRCAT(IObuff, shortmess(SHM_TEXT) ? _("[unix]") : _("[unix format]"));
|
|
diff --git a/src/quickfix.c b/src/quickfix.c
|
|
index 7243a0c..3278bd7 100644
|
|
--- a/src/quickfix.c
|
|
+++ b/src/quickfix.c
|
|
@@ -882,7 +882,7 @@ qf_init_ext(qi, efile, buf, tv, errorformat, newlist, lnumfirst, lnumlast,
|
|
if (state->linelen > 0 && state->linebuf[state->linelen - 1] == '\n')
|
|
{
|
|
state->linebuf[state->linelen - 1] = NUL;
|
|
-#ifdef USE_CRNL
|
|
+#if defined(__MSYS__) || defined(USE_CRNL)
|
|
if (state->linelen > 1 && state->linebuf[state->linelen - 2] == '\r')
|
|
state->linebuf[state->linelen - 2] = NUL;
|
|
#endif
|
|
diff --git a/src/structs.h b/src/structs.h
|
|
--- a/src/structs.h
|
|
+++ b/src/structs.h
|
|
@@ -4442,7 +4442,7 @@
|
|
int source_from_buf;// TRUE if sourcing from current buffer
|
|
int buf_lnum; // line number in the current buffer
|
|
garray_T buflines; // lines in the current buffer
|
|
-#ifdef USE_CRNL
|
|
+#if defined(__MSYS__) || defined(USE_CRNL)
|
|
int fileformat; // EOL_UNKNOWN, EOL_UNIX or EOL_DOS
|
|
int error; // TRUE if LF found after CR-LF
|
|
#endif
|
|
--
|
|
2.31.1
|
|
|