diff options
author | Bram Moolenaar <Bram@vim.org> | 2012-07-10 13:41:14 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2012-07-10 13:41:14 +0200 |
commit | 77c604d3ffaaa0e3e9c572e820aa68fa8b2d7492 (patch) | |
tree | 124424b6df8f81f2205a018447dcb13065962a7e | |
parent | 6c4b646d84836ac1adf881cf325f580ceb8ab7f6 (diff) | |
download | vim-git-77c604d3ffaaa0e3e9c572e820aa68fa8b2d7492.tar.gz |
updated for version 7.3.593v7.3.593
Problem: No easy way to decide if b:browsefilter will work.
Solution: Add the browsefilter feature.
-rw-r--r-- | src/eval.c | 5 | ||||
-rw-r--r-- | src/gui_gtk.c | 3 | ||||
-rw-r--r-- | src/version.c | 2 | ||||
-rw-r--r-- | src/vim.h | 6 |
4 files changed, 13 insertions, 3 deletions
diff --git a/src/eval.c b/src/eval.c index b2ab0adf0..5fc32e21d 100644 --- a/src/eval.c +++ b/src/eval.c @@ -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 diff --git a/src/gui_gtk.c b/src/gui_gtk.c index c62201e22..4b63d513d 100644 --- a/src/gui_gtk.c +++ b/src/gui_gtk.c @@ -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 diff --git a/src/version.c b/src/version.c index 5f615edc4..1b04aed8d 100644 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 593, +/**/ 592, /**/ 591, @@ -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 |