From cc4ce8d83bafe5ffb4ab155b04b3385a6ebc6a69 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Wed, 2 Oct 2019 17:09:22 +0200 Subject: [PATCH] tweaks: rename a type, to better fit the general pattern --- src/files.c | 4 ++-- src/nano.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/files.c b/src/files.c index ce9c0bc4..5ae1f97f 100644 --- a/src/files.c +++ b/src/files.c @@ -1029,7 +1029,7 @@ void do_insertfile(void) char *given = mallocstrcpy(NULL, ""); /* The last answer the user typed at the statusbar prompt. */ #ifndef NANO_TINY - file_format original_fmt = openfile->fmt; + format_type was_fmt = openfile->fmt; bool execute = FALSE; #endif @@ -1197,7 +1197,7 @@ void do_insertfile(void) set_modified(); #ifndef NANO_TINY /* Ensure that the buffer retains the format that it had. */ - openfile->fmt = original_fmt; + openfile->fmt = was_fmt; #endif refresh_needed = TRUE; } diff --git a/src/nano.h b/src/nano.h index f261c624..c6e30942 100644 --- a/src/nano.h +++ b/src/nano.h @@ -147,7 +147,7 @@ /* Enumeration types. */ typedef enum { NIX_FILE, DOS_FILE, MAC_FILE -} file_format; +} format_type; typedef enum { HUSH, NOTICE, MILD, ALERT @@ -381,7 +381,7 @@ typedef struct openfilestruct { /* The mark's x position in the above line. */ mark_type kind_of_mark; /* Whether it is a soft (with Shift) or a hard mark. */ - file_format fmt; + format_type fmt; /* The file's format -- Unix or DOS or Mac or mixed. */ undo *undotop; /* The top of the undo list. */