nano

commit 1e718cec3520fd0e6b9a6816f1ada3ba1df176ad
parent 5487551ce969b88eb47e90226865a979763d2693
Author: Benno Schulenberg <bensberg@telfort.nl>
Date:   Sun, 26 Nov 2017 18:01:02 +0100

tweaks: reshuffle a couple of lines, to put similar things together

Diffstat:
M
src/global.c
 | 
7
++-----
M
src/history.c
 | 
1
-
M
src/proto.h
 | 
10
++--------

3 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/src/global.c b/src/global.c
@@ -51,11 +51,6 @@ int margin = 0;
 int editwincols = -1;
 	/* The number of usable columns in the edit window: COLS - margin. */
 
-#ifdef ENABLE_COLOR
-bool have_palette = FALSE;
-	/* Whether the colors for the current syntax have been initialized. */
-#endif
-
 bool suppress_cursorpos = FALSE;
 	/* Should we skip constant position display for current keystroke? */
 
@@ -184,6 +179,8 @@ syntaxtype *syntaxes = NULL;
 	/* The global list of color syntaxes. */
 char *syntaxstr = NULL;
 	/* The color syntax name specified on the command line. */
+bool have_palette = FALSE;
+	/* Whether the colors for the current syntax have been initialized. */
 #endif
 
 bool refresh_needed = FALSE;
diff --git a/src/history.c b/src/history.c
@@ -326,7 +326,6 @@ void load_history(void)
 		history = &replace_history;
 	   else
 		history = &execute_history;
-
 	}
 
 	fclose(hisfile);
diff --git a/src/proto.h b/src/proto.h
@@ -43,10 +43,6 @@ extern bool as_an_at;
 extern int margin;
 extern int editwincols;
 
-#ifdef ENABLE_COLOR
-extern bool have_palette;
-#endif
-
 extern bool suppress_cursorpos;
 
 extern message_type lastmessage;
@@ -106,9 +102,6 @@ extern openfilestruct *firstfile;
 
 #ifndef NANO_TINY
 extern char *matchbrackets;
-#endif
-
-#ifndef NANO_TINY
 extern char *whitespace;
 extern int whitespace_len[2];
 #endif
@@ -124,7 +117,7 @@ extern char *quotestr;
 extern regex_t quotereg;
 extern int quoterc;
 extern char *quoteerr;
-#endif /* !ENABLE_JUSTIFY */
+#endif
 
 extern char *word_chars;
 
@@ -148,6 +141,7 @@ extern char *alt_speller;
 #ifdef ENABLE_COLOR
 extern syntaxtype *syntaxes;
 extern char *syntaxstr;
+extern bool have_palette;
 #endif
 
 extern bool refresh_needed;