diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-06-24 15:14:07 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-06-24 15:14:07 +0200 |
| commit | defe6424aee6201241b7cb231b62db4bbb9f4a9f (patch) | |
| tree | c0d9a3675bbbb00ea18de33f22c171c4829e3e00 | |
| parent | eee3e9466951e6619e7db51cd027bafdfbebb08d (diff) | |
| download | vim-defe6424aee6201241b7cb231b62db4bbb9f4a9f.zip | |
patch 8.1.0107: Python: getting buffer option clears message
Problem: Python: getting buffer option clears message. (Jacob Niehus)
Solution: Don't use aucmd_prepbuf(). (closes #3079)
| -rw-r--r-- | src/option.c | 18 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 13 insertions, 7 deletions
diff --git a/src/option.c b/src/option.c index 94cd7aa52..d7d411772 100644 --- a/src/option.c +++ b/src/option.c @@ -9692,7 +9692,7 @@ get_option_value_strict( * consider it set when 'ff' or 'fenc' changed. */ if (p->indir == PV_MOD) { - *numval = bufIsChanged((buf_T *) from); + *numval = bufIsChanged((buf_T *)from); varp = NULL; } #ifdef FEAT_CRYPT @@ -9705,17 +9705,21 @@ get_option_value_strict( #endif else { - aco_save_T aco; - aucmd_prepbuf(&aco, (buf_T *) from); + buf_T *save_curbuf = curbuf; + + // only getting a pointer, no need to use aucmd_prepbuf() + curbuf = (buf_T *)from; + curwin->w_buffer = curbuf; varp = get_varp(p); - aucmd_restbuf(&aco); + curbuf = save_curbuf; + curwin->w_buffer = curbuf; } } else if (opt_type == SREQ_WIN) { - win_T *save_curwin; - save_curwin = curwin; - curwin = (win_T *) from; + win_T *save_curwin = curwin; + + curwin = (win_T *)from; curbuf = curwin->w_buffer; varp = get_varp(p); curwin = save_curwin; diff --git a/src/version.c b/src/version.c index 196907221..e51addcb3 100644 --- a/src/version.c +++ b/src/version.c @@ -790,6 +790,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 107, +/**/ 106, /**/ 105, |