From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 23 Jan 2013 12:41:00 +0000 (+0100)
Subject: updated for version 7.3.774
X-Git-Tag: v7.3.774
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f939c4e6b176d89626eff5fe9a0b01a5bbb40ef5;p=vim

updated for version 7.3.774
Problem:    Tiny GUI version misses console dialog feature.
Solution:   Define FEAT_CON_DIALOG when apprpriate. (Christian Brabandt)
---

diff --git a/src/feature.h b/src/feature.h
index 7ef654bb3..f54f59ac9 100644
--- a/src/feature.h
+++ b/src/feature.h
@@ -791,6 +791,15 @@
 # endif
 #endif
 
+/*
+ * On some systems, when we compile with the GUI, we always use it.  On Mac
+ * there is no terminal version, and on Windows we can't figure out how to
+ * fork one off with :gui.
+ */
+#if defined(FEAT_GUI_MSWIN) || (defined(FEAT_GUI_MAC) && !defined(MACOS_X_UNIX))
+# define ALWAYS_USE_GUI
+#endif
+
 /*
  * +dialog_gui		Use GUI dialog.
  * +dialog_con		May use Console dialog.
@@ -820,6 +829,9 @@
 	 || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MSWIN) \
 	 || defined(FEAT_GUI_PHOTON) || defined(FEAT_GUI_MAC))
 # define FEAT_GUI_TEXTDIALOG
+# ifndef ALWAYS_USE_GUI
+#  define FEAT_CON_DIALOG
+# endif
 #endif
 
 /* Mac specific thing: Codewarrior interface. */
diff --git a/src/gui.h b/src/gui.h
index e0c1c5c8a..aea450a19 100644
--- a/src/gui.h
+++ b/src/gui.h
@@ -58,15 +58,6 @@
 # include "photon/PxProto.h"
 #endif
 
-/*
- * On some systems, when we compile with the GUI, we always use it.  On Mac
- * there is no terminal version, and on Windows we can't figure out how to
- * fork one off with :gui.
- */
-#if defined(FEAT_GUI_MSWIN) || (defined(FEAT_GUI_MAC) && !defined(MACOS_X_UNIX))
-# define ALWAYS_USE_GUI
-#endif
-
 /*
  * On some systems scrolling needs to be done right away instead of in the
  * main loop.
diff --git a/src/version.c b/src/version.c
index b3e1c2903..019045706 100644
--- a/src/version.c
+++ b/src/version.c
@@ -725,6 +725,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    774,
 /**/
     773,
 /**/