ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

files: always register the format, also when the file is unwritable 

When saving the buffer under a different name, it should by default
have the same format as the original file.

This fixes https://savannah.gnu.org/bugs/?60278.

Bug existed since version 2.6.0, commit 0293eac1.
master
Benno Schulenberg 2021-03-23 19:53:18 +01:00
parent 2f718e11a7
commit 09b919a68f
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/files.c
View File

@ -656,8 +656,8 @@ void read_file(FILE *f, int fd, const char *filename, bool undoable)
bool writable = TRUE; bool writable = TRUE;
/* Whether the file is writable (in case we care). */ /* Whether the file is writable (in case we care). */
#ifndef NANO_TINY #ifndef NANO_TINY
int format = 0; format_type format = NIX_FILE;
/* 0 = Unix, 1 = DOS, 2 = Mac. */ /* The type of line ending the file uses: Unix, DOS, or Mac. */
#endif #endif
#ifndef NANO_TINY #ifndef NANO_TINY
@ -697,12 +697,12 @@ void read_file(FILE *f, int fd, const char *filename, bool undoable)
#ifndef NANO_TINY #ifndef NANO_TINY
if (len > 0 && buf[len - 1] == '\r' && !ISSET(NO_CONVERT)) { if (len > 0 && buf[len - 1] == '\r' && !ISSET(NO_CONVERT)) {
if (num_lines == 0) if (num_lines == 0)
format = 1; format = DOS_FILE;
len--; len--;
} }
} else if ((num_lines == 0 || format == 2) && } else if ((num_lines == 0 || format == 2) &&
len > 0 && buf[len - 1] == '\r' && !ISSET(NO_CONVERT)) { len > 0 && buf[len - 1] == '\r' && !ISSET(NO_CONVERT)) {
format = 2; format = MAC_FILE;
len--; len--;
#endif #endif
} else { } else {
@ -781,7 +781,7 @@ void read_file(FILE *f, int fd, const char *filename, bool undoable)
* strip this CR and indicate that an extra blank line is needed. */ * strip this CR and indicate that an extra blank line is needed. */
if (buf[len - 1] == '\r' && !ISSET(NO_CONVERT)) { if (buf[len - 1] == '\r' && !ISSET(NO_CONVERT)) {
if (num_lines == 0) if (num_lines == 0)
format = 2; format = MAC_FILE;
buf[--len] = '\0'; buf[--len] = '\0';
mac_line_needs_newline = TRUE; mac_line_needs_newline = TRUE;
} }
@ -810,24 +810,23 @@ void read_file(FILE *f, int fd, const char *filename, bool undoable)
if (!writable) if (!writable)
statusline(ALERT, _("File '%s' is unwritable"), filename); statusline(ALERT, _("File '%s' is unwritable"), filename);
#ifndef NANO_TINY #ifndef NANO_TINY
else if (format == 2) { else if (format == MAC_FILE)
/* TRANSLATORS: Keep the next three messages at most 78 characters. */ /* TRANSLATORS: Keep the next three messages at most 78 characters. */
openfile->fmt = MAC_FILE;
statusline(HUSH, P_("Read %zu line (Converted from Mac format)", statusline(HUSH, P_("Read %zu line (Converted from Mac format)",
"Read %zu lines (Converted from Mac format)", "Read %zu lines (Converted from Mac format)",
num_lines), num_lines); num_lines), num_lines);
} else if (format == 1) { else if (format == DOS_FILE)
openfile->fmt = DOS_FILE;
statusline(HUSH, P_("Read %zu line (Converted from DOS format)", statusline(HUSH, P_("Read %zu line (Converted from DOS format)",
"Read %zu lines (Converted from DOS format)", "Read %zu lines (Converted from DOS format)",
num_lines), num_lines); num_lines), num_lines);
}
#endif #endif
else { else
openfile->fmt = NIX_FILE;
statusline(HUSH, P_("Read %zu line", "Read %zu lines", statusline(HUSH, P_("Read %zu line", "Read %zu lines",
num_lines), num_lines); num_lines), num_lines);
}
#ifndef NANO_TINY
openfile->fmt = format;
#endif
/* If we inserted less than a screenful, don't center the cursor. */ /* If we inserted less than a screenful, don't center the cursor. */
if (undoable && less_than_a_screenful(was_lineno, was_leftedge)) if (undoable && less_than_a_screenful(was_lineno, was_leftedge))