diff options
| author | Bram Moolenaar <Bram@vim.org> | 2009-04-29 09:52:12 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2009-04-29 09:52:12 +0000 |
| commit | 04c0f8a9b0d4b16b003219b9a0a5d5e4115c58e0 (patch) | |
| tree | ba6221c6f4ec99913c174d3f103414ca3fd869b6 | |
| parent | bd1e5d2e1d74e5c0a2543e87da42603b00589ebc (diff) | |
updated for version 7.2-162v7.2.162
| -rw-r--r-- | src/quickfix.c | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/quickfix.c b/src/quickfix.c index ee84160200..e7f8982731 100644 --- a/src/quickfix.c +++ b/src/quickfix.c @@ -2346,7 +2346,13 @@ ex_copen(eap) set_option_value((char_u *)"bt", 0L, (char_u *)"quickfix", OPT_LOCAL); set_option_value((char_u *)"bh", 0L, (char_u *)"wipe", OPT_LOCAL); - set_option_value((char_u *)"diff", 0L, NULL, OPT_LOCAL); +#ifdef FEAT_DIFF + curwin->w_p_diff = FALSE; +#endif +#ifdef FEAT_FOLDING + set_option_value((char_u *)"fdm", 0L, (char_u *)"manual", + OPT_LOCAL); +#endif } /* Only set the height when still in the same tab page and there is no @@ -2607,10 +2613,12 @@ qf_fill_buffer(qi) curbuf->b_p_ma = FALSE; #ifdef FEAT_AUTOCMD + keep_filetype = TRUE; /* don't detect 'filetype' */ apply_autocmds(EVENT_BUFREADPOST, (char_u *)"quickfix", NULL, FALSE, curbuf); apply_autocmds(EVENT_BUFWINENTER, (char_u *)"quickfix", NULL, FALSE, curbuf); + keep_filetype = FALSE; #endif /* make sure it will be redrawn */ diff --git a/src/version.c b/src/version.c index d5adfab5dd..3bb98bf277 100644 --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 162, +/**/ 161, /**/ 160, |