summaryrefslogtreecommitdiff
path: root/src/if_py_both.h
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-07-17 17:15:25 +0200
committerBram Moolenaar <Bram@vim.org>2013-07-17 17:15:25 +0200
commit95064ece73a72fce696607ccc8896bc9e52af718 (patch)
tree505ada105acb2691d3cc9f94c7edb970838825b8 /src/if_py_both.h
parent33ca6bf240981363f3dfb259e3715ce4ee3302b3 (diff)
downloadvim-git-95064ece73a72fce696607ccc8896bc9e52af718.tar.gz
updated for version 7.4a.027v7.4a.027
Problem: When Python adds lines to another buffer the cursor position is wrong, it might be below the last line causing ml_get errors. (Vlad Irnov) Solution: Temporarily change the current window, so that marks are corrected properly.
Diffstat (limited to 'src/if_py_both.h')
-rw-r--r--src/if_py_both.h39
1 files changed, 28 insertions, 11 deletions
diff --git a/src/if_py_both.h b/src/if_py_both.h
index 48b7be7be..4ac2ebfad 100644
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -3997,30 +3997,43 @@ SetBufferLineList(
static int
InsertBufferLines(buf_T *buf, PyInt n, PyObject *lines, PyInt *len_change)
{
+ buf_T *save_curbuf = NULL;
+ win_T *wp;
+ win_T *save_curwin = NULL;
+ tabpage_T *tp;
+ tabpage_T *save_curtab = NULL;
+
/* First of all, we check the type of the supplied Python object.
* It must be a string or a list, or the call is in error.
*/
if (PyBytes_Check(lines) || PyUnicode_Check(lines))
{
- char *str = StringToLine(lines);
- buf_T *savebuf;
+ char *str = StringToLine(lines);
if (str == NULL)
return FAIL;
PyErr_Clear();
VimTryStart();
- switch_buffer(&savebuf, buf);
+ if (find_win_for_buf(buf, &wp, &tp) == FAIL
+ || switch_win(&save_curwin, &save_curtab, wp, tp, TRUE)
+ == FAIL)
+ switch_buffer(&save_curbuf, buf);
- if (u_save((linenr_T)n, (linenr_T)(n+1)) == FAIL)
+ if (u_save((linenr_T)n, (linenr_T)(n + 1)) == FAIL)
RAISE_UNDO_FAIL;
else if (ml_append((linenr_T)n, (char_u *)str, 0, FALSE) == FAIL)
RAISE_INSERT_LINE_FAIL;
- else
+ else if (save_curbuf == NULL)
+ /* Only adjust marks if we managed to switch to a window that
+ * holds the buffer, otherwise line numbers will be invalid. */
appended_lines_mark((linenr_T)n, 1L);
vim_free(str);
- restore_buffer(savebuf);
+ if (save_curbuf == NULL)
+ restore_win(save_curwin, save_curtab, TRUE);
+ else
+ restore_buffer(save_curbuf);
update_screen(VALID);
if (VimTryEnd())
@@ -4036,7 +4049,6 @@ InsertBufferLines(buf_T *buf, PyInt n, PyObject *lines, PyInt *len_change)
PyInt i;
PyInt size = PyList_Size(lines);
char **array;
- buf_T *savebuf;
array = PyMem_New(char *, size);
if (array == NULL)
@@ -4061,7 +4073,10 @@ InsertBufferLines(buf_T *buf, PyInt n, PyObject *lines, PyInt *len_change)
PyErr_Clear();
VimTryStart();
- switch_buffer(&savebuf, buf);
+ if (find_win_for_buf(buf, &wp, &tp) == FAIL
+ || switch_win(&save_curwin, &save_curtab, wp, tp, TRUE)
+ == FAIL)
+ switch_buffer(&save_curbuf, buf);
if (u_save((linenr_T)n, (linenr_T)(n + 1)) == FAIL)
RAISE_UNDO_FAIL;
@@ -4087,11 +4102,13 @@ InsertBufferLines(buf_T *buf, PyInt n, PyObject *lines, PyInt *len_change)
}
/* Free the array of lines. All of its contents have now
- * been freed.
- */
+ * been freed. */
PyMem_Free(array);
- restore_buffer(savebuf);
+ if (save_curbuf == NULL)
+ restore_win(save_curwin, save_curtab, TRUE);
+ else
+ restore_buffer(save_curbuf);
update_screen(VALID);
if (VimTryEnd())