commit - 786e6deb98e5c4050020215a479330250ed9736e
commit + 54ee0a94b6caabb0346274480b28c8dd0920deed
blob - b2e935e75a8a541cd463ea41780fe87cce2bcadf
blob + 8daed403c2862ce0a79b5ca04c0d55f78ea393e3
--- minibuffer.c
+++ minibuffer.c
@@ -50,6 +50,8 @@ struct histhead eecmd_history,
 struct ministate ministate;
 
 struct buffer minibufferwin;
+
+int in_minibuffer;
 
 /*
  * Recompute the visible completions.  If add is 1, don't consider the
blob - 3bffc8ee89aba97615b924dcda611bab2c6983d2
blob + 22b80a7f3ddc9ea6713aa7d2e5f1e62290cd699c
--- minibuffer.h
+++ minibuffer.h
@@ -41,8 +41,6 @@ extern struct histhead eecmd_history,
 	lu_history,
 	read_history;
 
-extern struct buffer minibufferwin;
-
 struct ministate {
 	char		*curmesg;
 
@@ -65,8 +63,11 @@ struct ministate {
 		void		*data;
 	} compl;
 };
-extern struct ministate ministate;
+extern struct ministate	 ministate;
 
+extern struct buffer	 minibufferwin;
+extern int		 in_minibuffer;
+
 void	 recompute_completions(int);
 
 void	 minibuffer_taint_hist(void);
blob - 4ccdcb9611bcab011e8fa48509d774b4ce14499a
blob + 5b94d1b78da4585cb3186d6672823b719c01e096
--- ui.c
+++ ui.c
@@ -109,8 +109,6 @@ struct kmap global_map,
 	minibuffer_map,
 	*current_map,
 	*base_map;
-
-int in_minibuffer;
 
 static inline void
 update_x_offset(void)
blob - 7973a0dca3f3a20529e0a4bf54fa434db5db810d
blob + 1c19636b76ec0edab111d99ca338311175ac624e
--- ui.h
+++ ui.h
@@ -21,7 +21,6 @@
 
 extern int	 body_lines;
 extern int	 body_cols;
-extern int	 in_minibuffer;
 
 extern struct kmap global_map, minibuffer_map, *current_map, *base_map;