mirrors/nano
1
0
Fork 0
mirror of git://git.sv.gnu.org/nano.git synced 2024-12-30 22:24:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

tweaks: set the file format only when unset, so it doesn't need saving

Browse Source 
When inserting a file into the current buffer, the 'fmt' element will
already be set.  When we avoid overwriting the current value of 'fmt'
(when it's other than UNSPECIFIED), we don't need to save and restore
the value when inserting a file.
This commit is contained in:
Benno Schulenberg 2021-03-24 12:00:34 +01:00
parent 09b919a68f
commit 735757b0c1
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/files.c
View File

@ -824,10 +824,6 @@ void read_file(FILE *f, int fd, const char *filename, bool undoable)
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))
focusing = FALSE; focusing = FALSE;
@ -842,6 +838,8 @@ void read_file(FILE *f, int fd, const char *filename, bool undoable)
if (ISSET(MAKE_IT_UNIX)) if (ISSET(MAKE_IT_UNIX))
openfile->fmt = NIX_FILE; openfile->fmt = NIX_FILE;
else if (openfile->fmt == UNSPECIFIED)
openfile->fmt = format;
#endif #endif
} }
@ -1121,9 +1119,6 @@ void do_insertfile(bool execute)
#ifdef ENABLE_MULTIBUFFER #ifdef ENABLE_MULTIBUFFER
bool was_multibuffer = ISSET(MULTIBUFFER); bool was_multibuffer = ISSET(MULTIBUFFER);
#endif #endif
#ifndef NANO_TINY
format_type was_fmt = openfile->fmt;
#endif
/* Display newlines in filenames as ^J. */ /* Display newlines in filenames as ^J. */
as_an_at = FALSE; as_an_at = FALSE;
@ -1293,10 +1288,7 @@ void do_insertfile(bool execute)
if (openfile->current->lineno != was_current_lineno || if (openfile->current->lineno != was_current_lineno ||
openfile->current_x != was_current_x) openfile->current_x != was_current_x)
set_modified(); set_modified();
#ifndef NANO_TINY
/* Ensure that the buffer retains the format that it had. */
openfile->fmt = was_fmt;
#endif
refresh_needed = TRUE; refresh_needed = TRUE;
} }