From 152cc24d1fb79dc43c0a59f746e1ef766a4ba0fb Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@telfort.nl>
Date: Sun, 1 Apr 2018 19:53:51 +0200
Subject: [PATCH] tweaks: reshuffle two declarations

---
 src/global.c | 9 ++++-----
 src/proto.h  | 5 ++---
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/global.c b/src/global.c
index d8455687..9b9e813d 100644
--- a/src/global.c
+++ b/src/global.c
@@ -46,11 +46,6 @@ bool focusing = TRUE;
 bool as_an_at = TRUE;
 		/* Whether a 0x0A byte should be shown as a ^@ instead of a ^J. */
 
-int margin = 0;
-		/* The amount of space reserved at the left for line numbers. */
-int editwincols = -1;
-		/* The number of usable columns in the edit window: COLS - margin. */
-
 bool suppress_cursorpos = FALSE;
 		/* Should we skip constant position display for current keystroke? */
 
@@ -110,6 +105,10 @@ WINDOW *bottomwin = NULL;
 		 * messages, the statusbar prompt, and a list of shortcuts. */
 int editwinrows = 0;
 		/* How many rows does the edit window take up? */
+int editwincols = -1;
+		/* The number of usable columns in the edit window: COLS - margin. */
+int margin = 0;
+		/* The amount of space reserved at the left for line numbers. */
 
 filestruct *cutbuffer = NULL;
 		/* The buffer where we store cut text. */
diff --git a/src/proto.h b/src/proto.h
index 93f4f068..2df633dd 100644
--- a/src/proto.h
+++ b/src/proto.h
@@ -40,9 +40,6 @@ extern bool focusing;
 
 extern bool as_an_at;
 
-extern int margin;
-extern int editwincols;
-
 extern bool suppress_cursorpos;
 
 extern message_type lastmessage;
@@ -95,6 +92,8 @@ extern WINDOW *topwin;
 extern WINDOW *edit;
 extern WINDOW *bottomwin;
 extern int editwinrows;
+extern int editwincols;
+extern int margin;
 
 extern filestruct *cutbuffer;
 extern filestruct *cutbottom;