summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-01-23 13:41:00 +0100
committerBram Moolenaar <Bram@vim.org>2013-01-23 13:41:00 +0100
commitf939c4e6b176d89626eff5fe9a0b01a5bbb40ef5 (patch)
tree82977f073381d96fe0f95ceb93620d89f3b9a627
parentb5f7bf6ed9c59b8841efcd41c2ed1687f080f4cf (diff)
downloadvim-git-f939c4e6b176d89626eff5fe9a0b01a5bbb40ef5.tar.gz
updated for version 7.3.774v7.3.774
Problem: Tiny GUI version misses console dialog feature. Solution: Define FEAT_CON_DIALOG when apprpriate. (Christian Brabandt)
-rw-r--r--src/feature.h12
-rw-r--r--src/gui.h9
-rw-r--r--src/version.c2
3 files changed, 14 insertions, 9 deletions
diff --git a/src/feature.h b/src/feature.h
index 7ef654bb3..f54f59ac9 100644
--- a/src/feature.h
+++ b/src/feature.h
@@ -792,6 +792,15 @@
#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.
* When none of these defined there is no dialog support.
@@ -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
@@ -59,15 +59,6 @@
#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
@@ -726,6 +726,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 774,
+/**/
773,
/**/
772,