diff options
| -rw-r--r-- | runtime/doc/if_pyth.txt | 22 | ||||
| -rw-r--r-- | src/if_py_both.h | 74 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 95 insertions, 3 deletions
diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt index a358f86ca..852c5c081 100644 --- a/runtime/doc/if_pyth.txt +++ b/runtime/doc/if_pyth.txt @@ -242,9 +242,9 @@ vim.current *python-current* An object providing access (via specific attributes) to various "current" objects available in vim: vim.current.line The current line (RW) String - vim.current.buffer The current buffer (RO) Buffer - vim.current.window The current window (RO) Window - vim.current.tabpage The current tab page (RO) TabPage + vim.current.buffer The current buffer (RW) Buffer + vim.current.window The current window (RW) Window + vim.current.tabpage The current tab page (RW) TabPage vim.current.range The current line range (RO) Range The last case deserves a little explanation. When the :python or @@ -252,6 +252,22 @@ vim.current *python-current* "current range". A range is a bit like a buffer, but with all access restricted to a subset of lines. See |python-range| for more details. + Note: When assigning to vim.current.{buffer,window,tabpage} it expects + valid |python-buffer|, |python-window| or |python-tabpage| objects + respectively. Assigning triggers normal (with |autocommand|s) + switching to given buffer, window or tab page. It is the only way to + switch UI objects in python: you can't assign to + |python-tabpage|.window attribute. To switch without triggering + autocommands use > + py << EOF + saved_eventignore = vim.options['eventignore'] + vim.options['eventignore'] = 'all' + try: + vim.current.buffer = vim.buffers[2] # Switch to buffer 2 + finally: + vim.options['eventignore'] = saved_eventignore + EOF +< vim.vars *python-vars* vim.vvars *python-vvars* Dictionary-like objects holding dictionaries with global (|g:|) and diff --git a/src/if_py_both.h b/src/if_py_both.h index 3267f8147..9e6c6752b 100644 --- a/src/if_py_both.h +++ b/src/if_py_both.h @@ -3244,6 +3244,80 @@ CurrentSetattr(PyObject *self UNUSED, char *name, PyObject *value) return 0; } + else if (strcmp(name, "buffer") == 0) + { + int count; + + if (value->ob_type != &BufferType) + { + PyErr_SetString(PyExc_TypeError, _("expected vim.buffer object")); + return -1; + } + + if (CheckBuffer((BufferObject *)(value))) + return -1; + count = ((BufferObject *)(value))->buf->b_fnum; + + if (do_buffer(DOBUF_GOTO, DOBUF_FIRST, FORWARD, count, 0) == FAIL) + { + PyErr_SetVim(_("failed to switch to given buffer")); + return -1; + } + + return 0; + } + else if (strcmp(name, "window") == 0) + { + int count; + + if (value->ob_type != &WindowType) + { + PyErr_SetString(PyExc_TypeError, _("expected vim.window object")); + return -1; + } + + if (CheckWindow((WindowObject *)(value))) + return -1; + count = get_win_number(((WindowObject *)(value))->win, firstwin); + + if (!count) + { + PyErr_SetString(PyExc_ValueError, + _("failed to find window in the current tab page")); + return -1; + } + + win_goto(((WindowObject *)(value))->win); + if (((WindowObject *)(value))->win != curwin) + { + PyErr_SetString(PyExc_RuntimeError, + _("did not switch to the specified window")); + return -1; + } + + return 0; + } + else if (strcmp(name, "tabpage") == 0) + { + if (value->ob_type != &TabPageType) + { + PyErr_SetString(PyExc_TypeError, _("expected vim.tabpage object")); + return -1; + } + + if (CheckTabPage((TabPageObject *)(value))) + return -1; + + goto_tabpage_tp(((TabPageObject *)(value))->tab, TRUE, TRUE); + if (((TabPageObject *)(value))->tab != curtab) + { + PyErr_SetString(PyExc_RuntimeError, + _("did not switch to the specified tab page")); + return -1; + } + + return 0; + } else { PyErr_SetString(PyExc_AttributeError, name); diff --git a/src/version.c b/src/version.c index 3f09459cc..7b283f18e 100644 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 952, +/**/ 951, /**/ 950, |