]> granicus.if.org Git - vim/commitdiff
updated for version 7.3.593 v7.3.593
authorBram Moolenaar <Bram@vim.org>
Tue, 10 Jul 2012 11:41:14 +0000 (13:41 +0200)
committerBram Moolenaar <Bram@vim.org>
Tue, 10 Jul 2012 11:41:14 +0000 (13:41 +0200)
Problem:    No easy way to decide if b:browsefilter will work.
Solution:   Add the browsefilter feature.

src/eval.c
src/gui_gtk.c
src/version.c
src/vim.h

index b2ab0adf06699c33671319f0d8467b336f6c1822..5fc32e21d094f03f6187d76eef0535d113370562 100644 (file)
@@ -12044,6 +12044,11 @@ f_has(argvars, rettv)
        "all_builtin_terms",
 # endif
 #endif
+#if defined(FEAT_BROWSE) && (defined(USE_FILE_CHOOSER) \
+       || defined(FEAT_GUI_W32) \
+       || defined(FEAT_GUI_MOTIF))
+       "browsefilter",
+#endif
 #ifdef FEAT_BYTEOFF
        "byte_offset",
 #endif
index c62201e22727d557422ac7527cbbbb1bbec61085..4b63d513debf781c34b05b47e8f538ba8c0d6448 100644 (file)
@@ -779,9 +779,6 @@ gui_mch_destroy_scrollbar(scrollbar_T *sb)
 /*
  * Implementation of the file selector related stuff
  */
-#if GTK_CHECK_VERSION(2,4,0)
-# define USE_FILE_CHOOSER
-#endif
 
 #ifndef USE_FILE_CHOOSER
     static void
index 5f615edc40f1a93ae8d59c531a1b992bba4179c5..1b04aed8d1659fb42045f20278758f93862aca90 100644 (file)
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    593,
 /**/
     592,
 /**/
index 562c883b106bdd617df00f2a30cc9f2ba1cdac06..7fd6df9a37e9eee9b21ac5941a411e158c7a7cf7 100644 (file)
--- a/src/vim.h
+++ b/src/vim.h
@@ -2125,6 +2125,12 @@ typedef int VimClipboard;        /* This is required for the prototypes. */
 # endif
 #endif
 
+#if defined(FEAT_BROWSE) && defined(GTK_CHECK_VERSION)
+# if GTK_CHECK_VERSION(2,4,0)
+#  define USE_FILE_CHOOSER
+# endif
+#endif
+
 #ifndef FEAT_NETBEANS_INTG
 # undef NBDEBUG
 #endif