Merge remote-tracking branch 'upstream/master' into aucmd_textputpost

1 files changed, 16 insertions, 11 deletions

diff --git a/src/nvim/window.h b/src/nvim/window.h
index 3650fef46e..d20b799e20 100644
--- a/src/nvim/window.h
+++ b/src/nvim/window.h
@@ -21,15 +21,16 @@ enum {
 
 /// arguments for win_split()
 enum {
-  WSP_ROOM   = 0x01,   ///< require enough room
-  WSP_VERT   = 0x02,   ///< split/equalize vertically
-  WSP_HOR    = 0x04,   ///< equalize horizontally
-  WSP_TOP    = 0x08,   ///< window at top-left of shell
-  WSP_BOT    = 0x10,   ///< window at bottom-right of shell
-  WSP_HELP   = 0x20,   ///< creating the help window
-  WSP_BELOW  = 0x40,   ///< put new window below/right
-  WSP_ABOVE  = 0x80,   ///< put new window above/left
-  WSP_NEWLOC = 0x100,  ///< don't copy location list
+  WSP_ROOM    = 0x01,   ///< require enough room
+  WSP_VERT    = 0x02,   ///< split/equalize vertically
+  WSP_HOR     = 0x04,   ///< equalize horizontally
+  WSP_TOP     = 0x08,   ///< window at top-left of shell
+  WSP_BOT     = 0x10,   ///< window at bottom-right of shell
+  WSP_HELP    = 0x20,   ///< creating the help window
+  WSP_BELOW   = 0x40,   ///< put new window below/right
+  WSP_ABOVE   = 0x80,   ///< put new window above/left
+  WSP_NEWLOC  = 0x100,  ///< don't copy location list
+  WSP_NOENTER = 0x200,  ///< don't enter the new window
 };
 
 enum {
@@ -38,8 +39,12 @@ enum {
   STATUS_HEIGHT = 1,  ///< height of a status line under a window
 };
 
-/// Lowest number used for window ID. Cannot have this many windows per tab.
-enum { LOWEST_WIN_ID = 1000, };
+enum {
+  /// Lowest number used for window ID. Cannot have this many windows per tab.
+  LOWEST_WIN_ID = 1000,
+};
+
+EXTERN int tabpage_move_disallowed INIT( = 0);  ///< moving tabpages around disallowed
 
 /// Set to true if 'cmdheight' was explicitly set to 0.
 EXTERN bool p_ch_was_zero INIT( = false);