aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/nvim/CMakeLists.txt2
-rw-r--r--src/nvim/api/tabpage.c25
-rw-r--r--src/nvim/api/vim.c2
-rw-r--r--src/nvim/buffer.c20
-rw-r--r--src/nvim/diff.c21
-rw-r--r--src/nvim/eval.c50
-rw-r--r--src/nvim/ex_cmds.c21
-rw-r--r--src/nvim/ex_cmds2.c17
-rw-r--r--src/nvim/ex_docmd.c55
-rw-r--r--src/nvim/ex_getln.c5
-rw-r--r--src/nvim/fileio.c20
-rw-r--r--src/nvim/globals.h19
-rw-r--r--src/nvim/main.c8
-rw-r--r--src/nvim/mark.c73
-rw-r--r--src/nvim/memory.c10
-rw-r--r--src/nvim/misc1.c17
-rw-r--r--src/nvim/normal.c6
-rw-r--r--src/nvim/option.c21
-rw-r--r--src/nvim/os_unix.c41
-rw-r--r--src/nvim/po/CMakeLists.txt2
-rw-r--r--src/nvim/popupmnu.c2
-rw-r--r--src/nvim/quickfix.c17
-rw-r--r--src/nvim/regexp.c18
-rw-r--r--src/nvim/screen.c22
-rw-r--r--src/nvim/term.c44
-rw-r--r--src/nvim/version.c51
-rw-r--r--src/nvim/window.c125
27 files changed, 408 insertions, 306 deletions
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
index 83de3347bd..208df31596 100644
--- a/src/nvim/CMakeLists.txt
+++ b/src/nvim/CMakeLists.txt
@@ -174,7 +174,7 @@ if(NOT DEFINED ENV{SKIP_EXEC})
add_executable(nvim ${NEOVIM_GENERATED_SOURCES} ${NEOVIM_SOURCES}
${NEOVIM_HEADERS})
target_link_libraries(nvim ${NVIM_LINK_LIBRARIES})
- install(TARGETS nvim RUNTIME DESTINATION bin)
+ install_helper(TARGETS nvim)
endif()
if(NOT DEFINED ENV{SKIP_UNITTEST})
diff --git a/src/nvim/api/tabpage.c b/src/nvim/api/tabpage.c
index 72168d936a..3e5d00671a 100644
--- a/src/nvim/api/tabpage.c
+++ b/src/nvim/api/tabpage.c
@@ -7,6 +7,7 @@
#include "nvim/api/private/defs.h"
#include "nvim/api/private/helpers.h"
#include "nvim/memory.h"
+#include "nvim/window.h"
/// Gets the number of windows in a tabpage
///
@@ -18,27 +19,18 @@ ArrayOf(Window) tabpage_get_windows(Tabpage tabpage, Error *err)
Array rv = ARRAY_DICT_INIT;
tabpage_T *tab = find_tab_by_handle(tabpage, err);
- if (!tab) {
+ if (!tab || !valid_tabpage(tab)) {
return rv;
}
- tabpage_T *tp;
- win_T *wp;
-
- FOR_ALL_TAB_WINDOWS(tp, wp) {
- if (tp != tab) {
- break;
- }
+ FOR_ALL_WINDOWS_IN_TAB(wp, tab) {
rv.size++;
}
rv.items = xmalloc(sizeof(Object) * rv.size);
size_t i = 0;
- FOR_ALL_TAB_WINDOWS(tp, wp) {
- if (tp != tab) {
- break;
- }
+ FOR_ALL_WINDOWS_IN_TAB(wp, tab) {
rv.items[i++] = WINDOW_OBJ(wp->handle);
}
@@ -90,18 +82,15 @@ Window tabpage_get_window(Tabpage tabpage, Error *err)
Window rv = 0;
tabpage_T *tab = find_tab_by_handle(tabpage, err);
- if (!tab) {
+ if (!tab || !valid_tabpage(tab)) {
return rv;
}
if (tab == curtab) {
return vim_get_current_window();
} else {
- tabpage_T *tp;
- win_T *wp;
-
- FOR_ALL_TAB_WINDOWS(tp, wp) {
- if (tp == tab && wp == tab->tp_curwin) {
+ FOR_ALL_WINDOWS_IN_TAB(wp, tab) {
+ if (wp == tab->tp_curwin) {
return wp->handle;
}
}
diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index 93aa0439f0..5e0f3e0c32 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -380,8 +380,6 @@ void vim_set_current_buffer(Buffer buffer, Error *err)
ArrayOf(Window) vim_get_windows(void)
{
Array rv = ARRAY_DICT_INIT;
- tabpage_T *tp;
- win_T *wp;
FOR_ALL_TAB_WINDOWS(tp, wp) {
rv.size++;
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index 11171617ef..4eff8df9f5 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -514,13 +514,9 @@ void buf_freeall(buf_T *buf, int flags)
reset_synblock(curwin);
/* No folds in an empty buffer. */
- {
- win_T *win;
- tabpage_T *tp;
-
- FOR_ALL_TAB_WINDOWS(tp, win) {
- if (win->w_buffer == buf)
- clearFolding(win);
+ FOR_ALL_TAB_WINDOWS(tp, win) {
+ if (win->w_buffer == buf) {
+ clearFolding(win);
}
}
@@ -4206,8 +4202,6 @@ int read_viminfo_bufferlist(vir_T *virp, int writing)
void write_viminfo_bufferlist(FILE *fp)
{
- win_T *win;
- tabpage_T *tp;
char_u *line;
int max_buffers;
@@ -4284,8 +4278,12 @@ char_u *buf_spname(buf_T *buf)
*/
bool find_win_for_buf(buf_T *buf, win_T **wp, tabpage_T **tp)
{
- FOR_ALL_TAB_WINDOWS(*tp, *wp) {
- if ((*wp)->w_buffer == buf) {
+ *wp = NULL;
+ *tp = NULL;
+ FOR_ALL_TAB_WINDOWS(tp2, wp2) {
+ if (wp2->w_buffer == buf) {
+ *tp = tp2;
+ *wp = wp2;
return true;
}
}
diff --git a/src/nvim/diff.c b/src/nvim/diff.c
index 8f540fbe09..7927473439 100644
--- a/src/nvim/diff.c
+++ b/src/nvim/diff.c
@@ -62,8 +62,7 @@ static int diff_a_works = MAYBE;
/// @param buf
void diff_buf_delete(buf_T *buf)
{
- tabpage_T *tp;
- for (tp = first_tabpage; tp != NULL; tp = tp->tp_next) {
+ FOR_ALL_TABS(tp) {
int i = diff_buf_idx_tp(buf, tp);
if (i != DB_COUNT) {
@@ -175,8 +174,7 @@ static int diff_buf_idx_tp(buf_T *buf, tabpage_T *tp)
/// @param buf
void diff_invalidate(buf_T *buf)
{
- tabpage_T *tp;
- for (tp = first_tabpage; tp != NULL; tp = tp->tp_next) {
+ FOR_ALL_TABS(tp) {
int i = diff_buf_idx_tp(buf, tp);
if (i != DB_COUNT) {
tp->tp_diff_invalid = TRUE;
@@ -197,8 +195,7 @@ void diff_mark_adjust(linenr_T line1, linenr_T line2, long amount,
long amount_after)
{
// Handle all tab pages that use the current buffer in a diff.
- tabpage_T *tp;
- for (tp = first_tabpage; tp != NULL; tp = tp->tp_next) {
+ FOR_ALL_TABS(tp) {
int idx = diff_buf_idx_tp(curbuf, tp);
if (idx != DB_COUNT) {
diff_mark_adjust_tp(tp, idx, line1, line2, amount, amount_after);
@@ -1819,8 +1816,7 @@ int diffopt_changed(void)
// If "icase" or "iwhite" was added or removed, need to update the diff.
if (diff_flags != diff_flags_new) {
- tabpage_T *tp;
- for (tp = first_tabpage; tp != NULL; tp = tp->tp_next) {
+ FOR_ALL_TABS(tp) {
tp->tp_diff_invalid = TRUE;
}
}
@@ -2376,15 +2372,14 @@ static void diff_fold_update(diff_T *dp, int skip_idx)
/// @param buf The buffer to check.
///
/// @return TRUE if buffer "buf" is in diff-mode.
-int diff_mode_buf(buf_T *buf)
+bool diff_mode_buf(buf_T *buf)
{
- tabpage_T *tp;
- for (tp = first_tabpage; tp != NULL; tp = tp->tp_next) {
+ FOR_ALL_TABS(tp) {
if (diff_buf_idx_tp(buf, tp) != DB_COUNT) {
- return TRUE;
+ return true;
}
}
- return FALSE;
+ return false;
}
/// Move "count" times in direction "dir" to the next diff block.
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index a119cd6eac..28f16d0e92 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -5403,11 +5403,9 @@ static int list_join(garray_T *gap, list_T *l, char_u *sep, int echo_style, int
int garbage_collect(void)
{
int copyID;
- win_T *wp;
funccall_T *fc, **pfc;
int did_free;
int did_free_funccal = FALSE;
- tabpage_T *tp;
/* Only do this once. */
want_garbage_collect = FALSE;
@@ -5442,14 +5440,16 @@ int garbage_collect(void)
}
/* window-local variables */
- FOR_ALL_TAB_WINDOWS(tp, wp)
- set_ref_in_item(&wp->w_winvar.di_tv, copyID);
+ FOR_ALL_TAB_WINDOWS(tp, wp) {
+ set_ref_in_item(&wp->w_winvar.di_tv, copyID);
+ }
if (aucmd_win != NULL)
set_ref_in_item(&aucmd_win->w_winvar.di_tv, copyID);
/* tabpage-local variables */
- for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
+ FOR_ALL_TABS(tp) {
set_ref_in_item(&tp->tp_winvar.di_tv, copyID);
+ }
/* global variables */
set_ref_in_ht(&globvarht, copyID);
@@ -6388,6 +6388,7 @@ static struct fst {
{"getcmdline", 0, 0, f_getcmdline},
{"getcmdpos", 0, 0, f_getcmdpos},
{"getcmdtype", 0, 0, f_getcmdtype},
+ {"getcmdwintype", 0, 0, f_getcmdwintype},
{"getcurpos", 0, 0, f_getcurpos},
{"getcwd", 0, 0, f_getcwd},
{"getfontname", 0, 1, f_getfontname},
@@ -9156,6 +9157,17 @@ static void f_getcmdtype(typval_T *argvars, typval_T *rettv)
}
/*
+ * "getcmdwintype()" function
+ */
+static void f_getcmdwintype(typval_T *argvars, typval_T *rettv)
+{
+ rettv->v_type = VAR_STRING;
+ rettv->vval.v_string = NULL;
+ rettv->vval.v_string = xmallocz(1);
+ rettv->vval.v_string[0] = cmdwin_type;
+}
+
+/*
* "getcwd()" function
*/
static void f_getcwd(typval_T *argvars, typval_T *rettv)
@@ -9576,21 +9588,27 @@ find_win_by_nr (
tabpage_T *tp /* NULL for current tab page */
)
{
- win_T *wp;
- int nr;
-
- nr = get_tv_number_chk(vp, NULL);
+ int nr = get_tv_number_chk(vp, NULL);
- if (nr < 0)
+ if (nr < 0) {
return NULL;
- if (nr == 0)
+ }
+
+ if (nr == 0) {
return curwin;
+ }
- for (wp = (tp == NULL || tp == curtab) ? firstwin : tp->tp_firstwin;
- wp != NULL; wp = wp->w_next)
- if (--nr <= 0)
- break;
- return wp;
+ // This method accepts NULL as an alias for curtab.
+ if (tp == NULL) {
+ tp = curtab;
+ }
+
+ FOR_ALL_WINDOWS_IN_TAB(wp, tp) {
+ if (--nr <= 0) {
+ return wp;
+ }
+ }
+ return NULL;
}
/*
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
index b72d1941ec..44604b68c4 100644
--- a/src/nvim/ex_cmds.c
+++ b/src/nvim/ex_cmds.c
@@ -1648,11 +1648,13 @@ void write_viminfo(char_u *file, int forceit)
if (fp_in != NULL) {
fclose(fp_in);
- /*
- * In case of an error keep the original viminfo file.
- * Otherwise rename the newly written file.
- */
- if (viminfo_errcnt || vim_rename(tempname, fname) == -1) {
+ /* In case of an error keep the original viminfo file. Otherwise
+ * rename the newly written file. Give an error if that fails. */
+ if (viminfo_errcnt == 0 && vim_rename(tempname, fname) == -1) {
+ viminfo_errcnt++;
+ EMSG2(_("E886: Can't rename viminfo file to %s!"), fname);
+ }
+ if (viminfo_errcnt > 0) {
os_remove((char *)tempname);
}
}
@@ -2960,13 +2962,10 @@ do_ecmd (
/* It's possible that all lines in the buffer changed. Need to update
* automatic folding for all windows where it's used. */
- {
- win_T *win;
- tabpage_T *tp;
-
- FOR_ALL_TAB_WINDOWS(tp, win)
- if (win->w_buffer == curbuf)
+ FOR_ALL_TAB_WINDOWS(tp, win) {
+ if (win->w_buffer == curbuf) {
foldUpdateAll(win);
+ }
}
/* Change directories when the 'acd' option is set. */
diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c
index c3d34e9991..0703c76b8a 100644
--- a/src/nvim/ex_cmds2.c
+++ b/src/nvim/ex_cmds2.c
@@ -1204,7 +1204,6 @@ check_changed_any (
int bufnum = 0;
int bufcount = 0;
int *bufnrs;
- tabpage_T *tp;
FOR_ALL_BUFFERS(buf) {
++bufcount;
@@ -1225,9 +1224,9 @@ check_changed_any (
}
/* buf in other tab */
- for (tp = first_tabpage; tp != NULL; tp = tp->tp_next) {
+ FOR_ALL_TABS(tp) {
if (tp != curtab) {
- for (win_T *wp = tp->tp_firstwin; wp != NULL; wp = wp->w_next) {
+ FOR_ALL_WINDOWS_IN_TAB(wp, tp) {
add_bufnum(bufnrs, &bufnum, wp->w_buffer->b_fnum);
}
}
@@ -1282,7 +1281,6 @@ check_changed_any (
/* Try to find a window that contains the buffer. */
if (buf != curbuf) {
- win_T *wp;
FOR_ALL_TAB_WINDOWS(tp, wp) {
if (wp->w_buffer == buf) {
goto_tabpage_win(tp, wp);
@@ -1510,12 +1508,11 @@ do_arglist (
*/
static void alist_check_arg_idx(void)
{
- win_T *win;
- tabpage_T *tp;
-
- FOR_ALL_TAB_WINDOWS(tp, win)
- if (win->w_alist == curwin->w_alist)
- check_arg_idx(win);
+ FOR_ALL_TAB_WINDOWS(tp, win) {
+ if (win->w_alist == curwin->w_alist) {
+ check_arg_idx(win);
+ }
+ }
}
/*
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index 1117b6fbcf..7fb109403e 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -5267,9 +5267,6 @@ static void ex_tabclose(exarg_T *eap)
*/
static void ex_tabonly(exarg_T *eap)
{
- tabpage_T *tp;
- int done;
-
if (cmdwin_type != 0)
cmdwin_result = K_IGNORE;
else if (first_tabpage->tp_next == NULL)
@@ -5277,8 +5274,8 @@ static void ex_tabonly(exarg_T *eap)
else {
/* Repeat this up to a 1000 times, because autocommands may mess
* up the lists. */
- for (done = 0; done < 1000; ++done) {
- for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
+ for (int done = 0; done < 1000; ++done) {
+ FOR_ALL_TABS(tp) {
if (tp->tp_topframe != topframe) {
tabpage_close_other(tp, eap->forceit);
/* if we failed to close it quit */
@@ -5287,8 +5284,10 @@ static void ex_tabonly(exarg_T *eap)
/* start over, "tp" is now invalid */
break;
}
- if (first_tabpage->tp_next == NULL)
+ }
+ if (first_tabpage->tp_next == NULL) {
break;
+ }
}
}
}
@@ -5607,18 +5606,21 @@ alist_add (
*/
void alist_slash_adjust(void)
{
- int i;
- win_T *wp;
- tabpage_T *tp;
-
- for (i = 0; i < GARGCOUNT; ++i)
- if (GARGLIST[i].ae_fname != NULL)
+ for (int i = 0; i < GARGCOUNT; ++i) {
+ if (GARGLIST[i].ae_fname != NULL) {
slash_adjust(GARGLIST[i].ae_fname);
- FOR_ALL_TAB_WINDOWS(tp, wp)
- if (wp->w_alist != &global_alist)
- for (i = 0; i < WARGCOUNT(wp); ++i)
- if (WARGLIST(wp)[i].ae_fname != NULL)
- slash_adjust(WARGLIST(wp)[i].ae_fname);
+ }
+ }
+
+ FOR_ALL_TAB_WINDOWS(tp, wp) {
+ if (wp->w_alist != &global_alist) {
+ for (int i = 0; i < WARGCOUNT(wp); ++i) {
+ if (WARGLIST(wp)[i].ae_fname != NULL) {
+ slash_adjust(WARGLIST(wp)[i].ae_fname);
+ }
+ }
+ }
+ }
}
#endif
@@ -5808,24 +5810,27 @@ static void ex_tabmove(exarg_T *eap)
*/
static void ex_tabs(exarg_T *eap)
{
- tabpage_T *tp;
- win_T *wp;
int tabcount = 1;
msg_start();
msg_scroll = TRUE;
- for (tp = first_tabpage; tp != NULL && !got_int; tp = tp->tp_next) {
+
+ FOR_ALL_TABS(tp) {
+ if (got_int) {
+ break;
+ }
+
msg_putchar('\n');
vim_snprintf((char *)IObuff, IOSIZE, _("Tab page %d"), tabcount++);
msg_outtrans_attr(IObuff, hl_attr(HLF_T));
out_flush(); /* output one line at a time */
ui_breakcheck();
- if (tp == curtab)
- wp = firstwin;
- else
- wp = tp->tp_firstwin;
- for (; wp != NULL && !got_int; wp = wp->w_next) {
+ FOR_ALL_WINDOWS_IN_TAB(wp, tp) {
+ if (got_int) {
+ break;
+ }
+
msg_putchar('\n');
msg_putchar(wp == curwin ? '>' : ' ');
msg_putchar(' ');
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
index 810df627c1..b8d8837092 100644
--- a/src/nvim/ex_getln.c
+++ b/src/nvim/ex_getln.c
@@ -5200,9 +5200,14 @@ static int ex_window(void)
RedrawingDisabled = i;
+ int save_KeyTyped = KeyTyped;
+
/* Trigger CmdwinLeave autocommands. */
apply_autocmds(EVENT_CMDWINLEAVE, typestr, typestr, FALSE, curbuf);
+ /* Restore KeyTyped in case it is modified by autocommands */
+ KeyTyped = save_KeyTyped;
+
/* Restore the command line info. */
ccline = save_ccline;
cmdwin_type = 0;
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c
index 97daa035f8..ec91949def 100644
--- a/src/nvim/fileio.c
+++ b/src/nvim/fileio.c
@@ -5102,16 +5102,15 @@ void buf_reload(buf_T *buf, int orig_mode)
check_cursor();
update_topline();
keep_filetype = FALSE;
- {
- win_T *wp;
- tabpage_T *tp;
- /* Update folds unless they are defined manually. */
- FOR_ALL_TAB_WINDOWS(tp, wp)
+ /* Update folds unless they are defined manually. */
+ FOR_ALL_TAB_WINDOWS(tp, wp) {
if (wp->w_buffer == curwin->w_buffer
- && !foldmethodIsManual(wp))
+ && !foldmethodIsManual(wp)) {
foldUpdateAll(wp);
+ }
}
+
/* If the mode didn't change and 'readonly' was set, keep the old
* value; the user probably used the ":view" command. But don't
* reset it, might have had a read error. */
@@ -6269,14 +6268,11 @@ aucmd_restbuf (
* page. Do not trigger autocommands here. */
block_autocmds();
if (curwin != aucmd_win) {
- tabpage_T *tp;
- win_T *wp;
-
- FOR_ALL_TAB_WINDOWS(tp, wp)
- {
+ FOR_ALL_TAB_WINDOWS(tp, wp) {
if (wp == aucmd_win) {
- if (tp != curtab)
+ if (tp != curtab) {
goto_tabpage_tp(tp, TRUE, TRUE);
+ }
win_goto(aucmd_win);
goto win_found;
}
diff --git a/src/nvim/globals.h b/src/nvim/globals.h
index 674786ff08..465a48e5b2 100644
--- a/src/nvim/globals.h
+++ b/src/nvim/globals.h
@@ -519,15 +519,19 @@ EXTERN win_T *firstwin; /* first window */
EXTERN win_T *lastwin; /* last window */
EXTERN win_T *prevwin INIT(= NULL); /* previous window */
# define W_NEXT(wp) ((wp)->w_next)
-# define FOR_ALL_WINDOWS(wp) for (win_T *wp = firstwin; wp != NULL; wp = wp->w_next)
+# define FOR_ALL_WINDOWS(wp) \
+ FOR_ALL_WINDOWS_IN_TAB(wp, curtab)
/*
* When using this macro "break" only breaks out of the inner loop. Use "goto"
* to break out of the tabpage loop.
*/
# define FOR_ALL_TAB_WINDOWS(tp, wp) \
- for ((tp) = first_tabpage; (tp) != NULL; (tp) = (tp)->tp_next) \
- for ((wp) = ((tp) == curtab) \
- ? firstwin : (tp)->tp_firstwin; (wp); (wp) = (wp)->w_next)
+ FOR_ALL_TABS(tp) \
+ FOR_ALL_WINDOWS_IN_TAB(wp, tp)
+
+# define FOR_ALL_WINDOWS_IN_TAB(wp, tp) \
+ for (win_T *wp = ((tp) == curtab) \
+ ? firstwin : (tp)->tp_firstwin; wp != NULL; wp = wp->w_next)
EXTERN win_T *curwin; /* currently active window */
@@ -548,6 +552,9 @@ EXTERN tabpage_T *first_tabpage;
EXTERN tabpage_T *curtab;
EXTERN int redraw_tabline INIT(= FALSE); /* need to redraw tabline */
+// Iterates over all tabs in the tab list
+# define FOR_ALL_TABS(tp) for (tabpage_T *tp = first_tabpage; tp != NULL; tp = tp->tp_next)
+
/*
* All buffers are linked in a list. 'firstbuf' points to the first entry,
* 'lastbuf' to the last entry and 'curbuf' to the currently active buffer.
@@ -1059,6 +1066,10 @@ EXTERN int typebuf_was_filled INIT(= FALSE); /* received text from client
EXTERN int term_is_xterm INIT(= FALSE); /* xterm-like 'term' */
#endif
+#if defined(UNIX)
+EXTERN int xterm_conflict_mouse INIT(= FALSE);
+#endif
+
#ifdef BACKSLASH_IN_FILENAME
EXTERN char psepc INIT(= '\\'); /* normal path separator character */
EXTERN char psepcN INIT(= '/'); /* abnormal path separator character */
diff --git a/src/nvim/main.c b/src/nvim/main.c
index 7dc299e73b..e3f1d88dff 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -758,7 +758,6 @@ main_loop (
/* Exit properly */
void getout(int exitval)
{
- win_T *wp;
tabpage_T *tp, *next_tp;
exiting = TRUE;
@@ -780,11 +779,12 @@ void getout(int exitval)
/* Trigger BufWinLeave for all windows, but only once per buffer. */
for (tp = first_tabpage; tp != NULL; tp = next_tp) {
next_tp = tp->tp_next;
- for (wp = (tp == curtab)
- ? firstwin : tp->tp_firstwin; wp != NULL; wp = wp->w_next) {
- if (wp->w_buffer == NULL)
+ FOR_ALL_WINDOWS_IN_TAB(wp, tp) {
+ if (wp->w_buffer == NULL) {
/* Autocmd must have close the buffer already, skip. */
continue;
+ }
+
buf_T *buf = wp->w_buffer;
if (buf->b_changedtick != -1) {
apply_autocmds(EVENT_BUFWINLEAVE, buf->b_fname,
diff --git a/src/nvim/mark.c b/src/nvim/mark.c
index 6339cf8275..a66bf43c13 100644
--- a/src/nvim/mark.c
+++ b/src/nvim/mark.c
@@ -898,8 +898,6 @@ void mark_adjust(linenr_T line1, linenr_T line2, long amount, long amount_after)
int i;
int fnum = curbuf->b_fnum;
linenr_T *lp;
- win_T *win;
- tabpage_T *tab;
static pos_T initpos = INIT_POS_T(1, 0, 0);
if (line2 < line1 && amount_after == 0L) /* nothing to do */
@@ -939,8 +937,9 @@ void mark_adjust(linenr_T line1, linenr_T line2, long amount, long amount_after)
/* quickfix marks */
qf_mark_adjust(NULL, line1, line2, amount, amount_after);
/* location lists */
- FOR_ALL_TAB_WINDOWS(tab, win)
- qf_mark_adjust(win, line1, line2, amount, amount_after);
+ FOR_ALL_TAB_WINDOWS(tab, win) {
+ qf_mark_adjust(win, line1, line2, amount, amount_after);
+ }
sign_mark_adjust(line1, line2, amount, amount_after);
}
@@ -958,21 +957,26 @@ void mark_adjust(linenr_T line1, linenr_T line2, long amount, long amount_after)
/*
* Adjust items in all windows related to the current buffer.
*/
- FOR_ALL_TAB_WINDOWS(tab, win)
- {
- if (!cmdmod.lockmarks)
+ FOR_ALL_TAB_WINDOWS(tab, win) {
+ if (!cmdmod.lockmarks) {
/* Marks in the jumplist. When deleting lines, this may create
* duplicate marks in the jumplist, they will be removed later. */
- for (i = 0; i < win->w_jumplistlen; ++i)
- if (win->w_jumplist[i].fmark.fnum == fnum)
+ for (i = 0; i < win->w_jumplistlen; ++i) {
+ if (win->w_jumplist[i].fmark.fnum == fnum) {
one_adjust_nodel(&(win->w_jumplist[i].fmark.mark.lnum));
+ }
+ }
+ }
if (win->w_buffer == curbuf) {
- if (!cmdmod.lockmarks)
+ if (!cmdmod.lockmarks) {
/* marks in the tag stack */
- for (i = 0; i < win->w_tagstacklen; i++)
- if (win->w_tagstack[i].fmark.fnum == fnum)
+ for (i = 0; i < win->w_tagstacklen; i++) {
+ if (win->w_tagstack[i].fmark.fnum == fnum) {
one_adjust_nodel(&(win->w_tagstack[i].fmark.mark.lnum));
+ }
+ }
+ }
/* the displayed Visual area */
if (win->w_old_cursor_lnum != 0) {
@@ -985,12 +989,14 @@ void mark_adjust(linenr_T line1, linenr_T line2, long amount, long amount_after)
if (win != curwin) {
if (win->w_topline >= line1 && win->w_topline <= line2) {
if (amount == MAXLNUM) { /* topline is deleted */
- if (line1 <= 1)
+ if (line1 <= 1) {
win->w_topline = 1;
- else
+ } else {
win->w_topline = line1 - 1;
- } else /* keep topline on the same line */
+ }
+ } else { /* keep topline on the same line */
win->w_topline += amount;
+ }
win->w_topfill = 0;
} else if (amount_after && win->w_topline > line2) {
win->w_topline += amount_after;
@@ -998,15 +1004,18 @@ void mark_adjust(linenr_T line1, linenr_T line2, long amount, long amount_after)
}
if (win->w_cursor.lnum >= line1 && win->w_cursor.lnum <= line2) {
if (amount == MAXLNUM) { /* line with cursor is deleted */
- if (line1 <= 1)
+ if (line1 <= 1) {
win->w_cursor.lnum = 1;
- else
+ } else {
win->w_cursor.lnum = line1 - 1;
+ }
win->w_cursor.col = 0;
- } else /* keep cursor on the same line */
+ } else { /* keep cursor on the same line */
win->w_cursor.lnum += amount;
- } else if (amount_after && win->w_cursor.lnum > line2)
+ }
+ } else if (amount_after && win->w_cursor.lnum > line2) {
win->w_cursor.lnum += amount_after;
+ }
}
/* adjust folds */
@@ -1338,12 +1347,6 @@ int removable(char_u *name)
*/
int write_viminfo_marks(FILE *fp_out)
{
- int count;
- int is_mark_set;
- int i;
- win_T *win;
- tabpage_T *tp;
-
/*
* Set b_last_cursor for the all buffers that have a window.
*/
@@ -1352,22 +1355,22 @@ int write_viminfo_marks(FILE *fp_out)
}
fputs(_("\n# History of marks within files (newest to oldest):\n"), fp_out);
- count = 0;
+ int count = 0;
FOR_ALL_BUFFERS(buf) {
/*
* Only write something if buffer has been loaded and at least one
* mark is set.
*/
if (buf->b_marks_read) {
- if (buf->b_last_cursor.lnum != 0)
- is_mark_set = TRUE;
- else {
- is_mark_set = FALSE;
- for (i = 0; i < NMARKS; i++)
+ bool is_mark_set = true;
+ if (buf->b_last_cursor.lnum == 0) {
+ is_mark_set = false;
+ for (int i = 0; i < NMARKS; i++) {
if (buf->b_namedm[i].lnum != 0) {
- is_mark_set = TRUE;
+ is_mark_set = true;
break;
}
+ }
}
if (is_mark_set && buf->b_ffname != NULL
&& buf->b_ffname[0] != NUL && !removable(buf->b_ffname)) {
@@ -1378,10 +1381,12 @@ int write_viminfo_marks(FILE *fp_out)
write_one_mark(fp_out, '^', &buf->b_last_insert);
write_one_mark(fp_out, '.', &buf->b_last_change);
/* changelist positions are stored oldest first */
- for (i = 0; i < buf->b_changelistlen; ++i)
+ for (int i = 0; i < buf->b_changelistlen; ++i) {
write_one_mark(fp_out, '+', &buf->b_changelist[i]);
- for (i = 0; i < NMARKS; i++)
+ }
+ for (int i = 0; i < NMARKS; i++) {
write_one_mark(fp_out, 'a' + i, &buf->b_namedm[i]);
+ }
count++;
}
}
diff --git a/src/nvim/memory.c b/src/nvim/memory.c
index 1c3d6e372c..f4dffb0bcd 100644
--- a/src/nvim/memory.c
+++ b/src/nvim/memory.c
@@ -452,13 +452,9 @@ void free_all_mem(void)
p_hi = 0;
init_history();
- {
- win_T *win;
- tabpage_T *tab;
-
- qf_free_all(NULL);
- /* Free all location lists */
- FOR_ALL_TAB_WINDOWS(tab, win)
+ qf_free_all(NULL);
+ /* Free all location lists */
+ FOR_ALL_TAB_WINDOWS(tab, win) {
qf_free_all(win);
}
diff --git a/src/nvim/misc1.c b/src/nvim/misc1.c
index d7e9618639..52780b9a57 100644
--- a/src/nvim/misc1.c
+++ b/src/nvim/misc1.c
@@ -2027,8 +2027,6 @@ changed_lines_buf (
*/
static void changed_common(linenr_T lnum, colnr_T col, linenr_T lnume, long xtra)
{
- win_T *wp;
- tabpage_T *tp;
int i;
int cols;
pos_T *p;
@@ -2072,21 +2070,21 @@ static void changed_common(linenr_T lnum, colnr_T col, linenr_T lnume, long xtra
curbuf->b_changelistlen = JUMPLISTSIZE - 1;
memmove(curbuf->b_changelist, curbuf->b_changelist + 1,
sizeof(pos_T) * (JUMPLISTSIZE - 1));
- FOR_ALL_TAB_WINDOWS(tp, wp)
- {
+ FOR_ALL_TAB_WINDOWS(tp, wp) {
/* Correct position in changelist for other windows on
* this buffer. */
- if (wp->w_buffer == curbuf && wp->w_changelistidx > 0)
+ if (wp->w_buffer == curbuf && wp->w_changelistidx > 0) {
--wp->w_changelistidx;
+ }
}
}
- FOR_ALL_TAB_WINDOWS(tp, wp)
- {
+ FOR_ALL_TAB_WINDOWS(tp, wp) {
/* For other windows, if the position in the changelist is
* at the end it stays at the end. */
if (wp->w_buffer == curbuf
- && wp->w_changelistidx == curbuf->b_changelistlen)
+ && wp->w_changelistidx == curbuf->b_changelistlen) {
++wp->w_changelistidx;
+ }
}
++curbuf->b_changelistlen;
}
@@ -2098,8 +2096,7 @@ static void changed_common(linenr_T lnum, colnr_T col, linenr_T lnume, long xtra
curwin->w_changelistidx = curbuf->b_changelistlen;
}
- FOR_ALL_TAB_WINDOWS(tp, wp)
- {
+ FOR_ALL_TAB_WINDOWS(tp, wp) {
if (wp->w_buffer == curbuf) {
/* Mark this window to be redrawn later. */
if (wp->w_redr_type < VALID)
diff --git a/src/nvim/normal.c b/src/nvim/normal.c
index cc82630548..391828da28 100644
--- a/src/nvim/normal.c
+++ b/src/nvim/normal.c
@@ -845,7 +845,10 @@ getcount:
/* When getting a text character and the next character is a
* multi-byte character, it could be a composing character.
- * However, don't wait for it to arrive. */
+ * However, don't wait for it to arrive. Also, do enable mapping,
+ * because if it's put back with vungetc() it's too late to apply
+ * mapping. */
+ no_mapping--;
while (enc_utf8 && lang && (c = vpeekc()) > 0
&& (c >= 0x100 || MB_BYTE2LEN(vpeekc()) > 1)) {
c = plain_vgetc();
@@ -857,6 +860,7 @@ getcount:
else
ca.ncharC2 = c;
}
+ no_mapping++;
}
--no_mapping;
--allow_keys;
diff --git a/src/nvim/option.c b/src/nvim/option.c
index b26b6ed4cc..96265681df 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -2210,17 +2210,16 @@ set_options_default (
int opt_flags /* OPT_FREE, OPT_LOCAL and/or OPT_GLOBAL */
)
{
- int i;
- win_T *wp;
- tabpage_T *tp;
-
- for (i = 0; !istermoption(&options[i]); i++)
- if (!(options[i].flags & P_NODEFAULT))
+ for (int i = 0; !istermoption(&options[i]); i++) {
+ if (!(options[i].flags & P_NODEFAULT)) {
set_option_default(i, opt_flags, p_cp);
+ }
+ }
/* The 'scroll' option must be computed for all windows. */
- FOR_ALL_TAB_WINDOWS(tp, wp)
- win_comp_scroll(wp);
+ FOR_ALL_TAB_WINDOWS(tp, wp) {
+ win_comp_scroll(wp);
+ }
}
/// Set the Vi-default value of a string option.
@@ -5532,13 +5531,11 @@ set_num_option (
errmsg = e_positive;
curbuf->b_p_tw = 0;
}
- {
- win_T *wp;
- tabpage_T *tp;
- FOR_ALL_TAB_WINDOWS(tp, wp)
+ FOR_ALL_TAB_WINDOWS(tp, wp) {
check_colorcolumn(wp);
}
+
}
/*
diff --git a/src/nvim/os_unix.c b/src/nvim/os_unix.c
index a54ed000af..52f57f8262 100644
--- a/src/nvim/os_unix.c
+++ b/src/nvim/os_unix.c
@@ -761,11 +761,11 @@ void mch_setmouse(int on)
}
-/*
- * Set the mouse termcode, depending on the 'term' and 'ttymouse' options.
- */
+/// Sets the mouse termcode, depending on the 'term' and 'ttymouse' options.
void check_mouse_termcode(void)
{
+ xterm_conflict_mouse = false;
+
if (use_xterm_mouse()
&& use_xterm_mouse() != 3
) {
@@ -791,29 +791,31 @@ void check_mouse_termcode(void)
else
del_mouse_termcode(KS_NETTERM_MOUSE);
- /* conflicts with xterm mouse: "\033[" and "\033[M" */
- if (!use_xterm_mouse()
- )
+ // Conflicts with xterm mouse: "\033[" and "\033[M".
+ // Also conflicts with the xterm termresponse, skip this if it was requested
+ // already.
+ if (!use_xterm_mouse()) {
set_mouse_termcode(KS_DEC_MOUSE, (char_u *)(term_is_8bit(T_NAME)
? "\233" : "\033["));
- else
+ xterm_conflict_mouse = true;
+ }
+ else {
del_mouse_termcode(KS_DEC_MOUSE);
+ }
/* same as the dec mouse */
- if (use_xterm_mouse() == 3
- ) {
- set_mouse_termcode(KS_URXVT_MOUSE, (char_u *)(term_is_8bit(T_NAME)
- ? "\233"
- : "\033["));
-
+ if (use_xterm_mouse() == 3 && !did_request_esc_sequence()) {
+ set_mouse_termcode(KS_URXVT_MOUSE,
+ (char_u *)(term_is_8bit(T_NAME) ? "\233" : "\033["));
if (*p_mouse != NUL) {
- mch_setmouse(FALSE);
+ mch_setmouse(false);
setmouse();
}
- } else
+ resume_get_esc_sequence();
+ } else {
del_mouse_termcode(KS_URXVT_MOUSE);
- /* There is no conflict with xterm mouse */
- if (use_xterm_mouse() == 4
- ) {
+ }
+ // There is no conflict with xterm mouse.
+ if (use_xterm_mouse() == 4) {
set_mouse_termcode(KS_SGR_MOUSE, (char_u *)(term_is_8bit(T_NAME)
? "\233<"
: "\033[<"));
@@ -822,8 +824,9 @@ void check_mouse_termcode(void)
mch_setmouse(FALSE);
setmouse();
}
- } else
+ } else {
del_mouse_termcode(KS_SGR_MOUSE);
+ }
}
/*
diff --git a/src/nvim/po/CMakeLists.txt b/src/nvim/po/CMakeLists.txt
index 4a9c97dc20..0ed39e8c49 100644
--- a/src/nvim/po/CMakeLists.txt
+++ b/src/nvim/po/CMakeLists.txt
@@ -71,7 +71,7 @@ if(HAVE_WORKING_LIBINTL AND GETTEXT_FOUND AND XGETTEXT_PRG AND ICONV_PRG AND
-P ${CMAKE_MODULE_PATH}/RunMsgfmt.cmake
DEPENDS ${poFile} ${NVIM_POT})
- install(
+ install_helper(
FILES ${moFile}
DESTINATION share/locale/${name}/LC_MESSAGES
RENAME nvim.mo)
diff --git a/src/nvim/popupmnu.c b/src/nvim/popupmnu.c
index f4e60ddde9..19b92c5789 100644
--- a/src/nvim/popupmnu.c
+++ b/src/nvim/popupmnu.c
@@ -541,7 +541,9 @@ static int pum_set_selected(int n, int repeat)
if ((p_pvh > 0) && (p_pvh < g_do_tagpreview)) {
g_do_tagpreview = p_pvh;
}
+ RedrawingDisabled++;
resized = prepare_tagpreview(false);
+ RedrawingDisabled--;
g_do_tagpreview = 0;
if (curwin->w_p_pvw) {
diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c
index 3bc70b6b41..b2a6b01d96 100644
--- a/src/nvim/quickfix.c
+++ b/src/nvim/quickfix.c
@@ -1466,11 +1466,7 @@ void qf_jump(qf_info_T *qi, int dir, int errornr, int forceit)
* then search in other tabs.
*/
if (!usable_win && (swb_flags & SWB_USETAB)) {
- tabpage_T *tp;
- win_T *wp;
-
- FOR_ALL_TAB_WINDOWS(tp, wp)
- {
+ FOR_ALL_TAB_WINDOWS(tp, wp) {
if (wp->w_buffer->b_fnum == qf_ptr->qf_fnum) {
goto_tabpage_win(tp, wp);
usable_win = true;
@@ -2236,12 +2232,11 @@ static win_T *qf_find_win(qf_info_T *qi)
*/
static buf_T *qf_find_buf(qf_info_T *qi)
{
- tabpage_T *tp;
- win_T *win;
-
- FOR_ALL_TAB_WINDOWS(tp, win)
- if (is_qf_win(win, qi))
- return win->w_buffer;
+ FOR_ALL_TAB_WINDOWS(tp, win) {
+ if (is_qf_win(win, qi)) {
+ return win->w_buffer;
+ }
+ }
return NULL;
}
diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c
index 193c68860d..90da02bb1b 100644
--- a/src/nvim/regexp.c
+++ b/src/nvim/regexp.c
@@ -2790,17 +2790,29 @@ static int peekchr(void)
* either "\|", "\)", "\&", or "\n" */
if (reg_magic >= MAGIC_OFF) {
char_u *p = regparse + 1;
+ bool is_magic_all = (reg_magic == MAGIC_ALL);
- /* ignore \c \C \m and \M after '$' */
+ // ignore \c \C \m \M \v \V and \Z after '$'
while (p[0] == '\\' && (p[1] == 'c' || p[1] == 'C'
- || p[1] == 'm' || p[1] == 'M' || p[1] == 'Z'))
+ || p[1] == 'm' || p[1] == 'M'
+ || p[1] == 'v' || p[1] == 'V'
+ || p[1] == 'Z')) {
+ if (p[1] == 'v') {
+ is_magic_all = true;
+ } else if (p[1] == 'm' || p[1] == 'M' || p[1] == 'V') {
+ is_magic_all = false;
+ }
p += 2;
+ }
if (p[0] == NUL
|| (p[0] == '\\'
&& (p[1] == '|' || p[1] == '&' || p[1] == ')'
|| p[1] == 'n'))
- || reg_magic == MAGIC_ALL)
+ || (is_magic_all
+ && (p[0] == '|' || p[0] == '&' || p[0] == ')'))
+ || reg_magic == MAGIC_ALL) {
curchr = Magic('$');
+ }
}
break;
case '\\':
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 122c23ed84..e882935e39 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -6263,7 +6263,6 @@ int screen_valid(int doclear)
void screenalloc(bool doclear)
{
int new_row, old_row;
- win_T *wp;
int outofmem = FALSE;
int len;
schar_T *new_ScreenLines;
@@ -6275,7 +6274,6 @@ void screenalloc(bool doclear)
unsigned *new_LineOffset;
char_u *new_LineWraps;
short *new_TabPageIdxs;
- tabpage_T *tp;
static int entered = FALSE; /* avoid recursiveness */
static int done_outofmem_msg = FALSE; /* did outofmem message */
int retry_count = 0;
@@ -6328,8 +6326,9 @@ retry:
* Continuing with the old ScreenLines may result in a crash, because the
* size is wrong.
*/
- FOR_ALL_TAB_WINDOWS(tp, wp)
- win_free_lsize(wp);
+ FOR_ALL_TAB_WINDOWS(tp, wp) {
+ win_free_lsize(wp);
+ }
if (aucmd_win != NULL)
win_free_lsize(aucmd_win);
@@ -6349,8 +6348,7 @@ retry:
new_LineWraps = xmalloc((size_t)(Rows * sizeof(char_u)));
new_TabPageIdxs = xmalloc((size_t)(Columns * sizeof(short)));
- FOR_ALL_TAB_WINDOWS(tp, wp)
- {
+ FOR_ALL_TAB_WINDOWS(tp, wp) {
win_alloc_lines(wp);
}
if (aucmd_win != NULL && aucmd_win->w_lines == NULL) {
@@ -7632,7 +7630,6 @@ void unshowmode(int force)
static void draw_tabline(void)
{
int tabcount = 0;
- tabpage_T *tp;
int tabwidth;
int col = 0;
int scol = 0;
@@ -7675,8 +7672,9 @@ static void draw_tabline(void)
(char_u *)"", OPT_FREE, SID_ERROR);
called_emsg |= save_called_emsg;
} else {
- for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
+ FOR_ALL_TABS(tp) {
++tabcount;
+ }
tabwidth = (Columns - 1 + tabcount / 2) / tabcount;
if (tabwidth < 6)
@@ -7685,8 +7683,12 @@ static void draw_tabline(void)
attr = attr_nosel;
tabcount = 0;
scol = 0;
- for (tp = first_tabpage; tp != NULL && col < Columns - 4;
- tp = tp->tp_next) {
+
+ FOR_ALL_TABS(tp) {
+ if (col >= Columns - 4) {
+ break;
+ }
+
scol = col;
if (tp->tp_topframe == topframe)
diff --git a/src/nvim/term.c b/src/nvim/term.c
index d2c524e2e8..263b81fc3a 100644
--- a/src/nvim/term.c
+++ b/src/nvim/term.c
@@ -152,6 +152,9 @@ char *UP, *BC, PC;
# define TGETENT(b, t) tgetent((char *)(b), (char *)(t))
#endif /* HAVE_TGETENT */
+static int xt_index_in = 0;
+static int xt_index_out = 0;
+
static bool detected_8bit = false; // detected 8-bit terminal
static struct builtin_term builtin_termcaps[] =
@@ -2408,8 +2411,9 @@ void starttermcap(void)
may_req_termresponse();
/* Immediately check for a response. If t_Co changes, we don't
* want to redraw with wrong colors first. */
- if (crv_status != CRV_GET)
+ if (crv_status == CRV_SENT) {
check_for_codes_from_term();
+ }
}
}
}
@@ -2446,6 +2450,38 @@ void stoptermcap(void)
}
}
+#if defined(UNIX)
+/// Returns true when the xterm version was requested or anything else that
+/// would send an ESC sequence back to Vim.
+///
+/// If not sent yet, prevent it from being sent soon.
+/// Used to check whether it is OK to enable checking for DEC mouse codes,
+/// which conflict with may xterm ESC sequences.
+bool did_request_esc_sequence(void)
+{
+ if (crv_status == CRV_GET) {
+ crv_status = 0;
+ }
+ if (u7_status == U7_GET) {
+ u7_status = 0;
+ }
+ return crv_status == CRV_SENT || u7_status == U7_SENT
+ || xt_index_out > xt_index_in;
+}
+
+/// If requesting the version was disabled in did_request_esc_sequence(),
+/// enable it again.
+void resume_get_esc_sequence(void)
+{
+ if (crv_status == 0) {
+ crv_status = CRV_GET;
+ }
+ if (u7_status == 0) {
+ u7_status = U7_GET;
+ }
+}
+#endif
+
/*
* Request version string (for xterm) when needed.
* Only do this after switching to raw mode, otherwise the result will be
@@ -2458,6 +2494,8 @@ void stoptermcap(void)
* Insert mode.
* On Unix only do it when both output and input are a tty (avoid writing
* request to terminal while reading from a file).
+ * Do not do this when a mouse is being detected that starts with the same ESC
+ * sequence as the termresponse.
* The result is caught in check_termcode().
*/
void may_req_termresponse(void)
@@ -2470,6 +2508,7 @@ void may_req_termresponse(void)
# ifdef UNIX
&& isatty(1)
&& isatty(read_cmd_fd)
+ && !xterm_conflict_mouse
# endif
&& *T_CRV != NUL) {
LOG_TR("Sending CRV");
@@ -4130,9 +4169,6 @@ int show_one_termcode(char_u *name, char_u *code, int printit)
* termcap codes from the terminal itself.
* We get them one by one to avoid a very long response string.
*/
-static int xt_index_in = 0;
-static int xt_index_out = 0;
-
static void req_codes_from_term(void)
{
xt_index_out = 0;
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 1f3e7a7e38..38d123c644 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -184,8 +184,41 @@ static char *(features[]) = {
};
static int included_patches[] = {
- // Add new patch number below this line
- //410,
+ //444,
+ //443,
+ //442,
+ //441,
+ //440,
+ //439,
+ //438,
+ //437,
+ //436,
+ //435,
+ //434,
+ //433,
+ //432 NA
+ //431 NA
+ //430,
+ //429 NA
+ //428 NA
+ //427,
+ //426 NA
+ //425,
+ //424 NA
+ //423,
+ //422,
+ //421,
+ //420 NA
+ //419,
+ //418,
+ //417,
+ //416,
+ //415,
+ //414,
+ //413 NA
+ //412 NA
+ //411,
+ 410,
//409 NA
//408,
407,
@@ -203,7 +236,7 @@ static int included_patches[] = {
//395,
//394,
//393,
- //392,
+ 392,
//391,
//390,
//389,
@@ -221,7 +254,7 @@ static int included_patches[] = {
377,
376,
//375,
- //374,
+ 374,
373,
372,
371,
@@ -231,12 +264,12 @@ static int included_patches[] = {
367,
//366,
365,
- //364,
+ 364,
//363,
362,
- //361,
- //360,
- //359,
+ 361,
+ 360,
+ 359,
358,
357,
//356 NA
@@ -290,7 +323,7 @@ static int included_patches[] = {
308,
//307 NA
306,
- //305,
+ 305,
//304 NA
303,
302,
diff --git a/src/nvim/window.c b/src/nvim/window.c
index f5d8edc751..ebce53cdf4 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -1674,13 +1674,12 @@ close_windows (
int keep_curwin /* don't close "curwin" */
)
{
- win_T *wp;
tabpage_T *tp, *nexttp;
int h = tabline_height();
++RedrawingDisabled;
- for (wp = firstwin; wp != NULL && lastwin != firstwin; ) {
+ for (win_T *wp = firstwin; wp != NULL && lastwin != firstwin; ) {
if (wp->w_buffer == buf && (!keep_curwin || wp != curwin)
&& !(wp->w_closing || wp->w_buffer->b_closing)
) {
@@ -1695,8 +1694,8 @@ close_windows (
/* Also check windows in other tab pages. */
for (tp = first_tabpage; tp != NULL; tp = nexttp) {
nexttp = tp->tp_next;
- if (tp != curtab)
- for (wp = tp->tp_firstwin; wp != NULL; wp = wp->w_next)
+ if (tp != curtab) {
+ FOR_ALL_WINDOWS_IN_TAB(wp, tp) {
if (wp->w_buffer == buf
&& !(wp->w_closing || wp->w_buffer->b_closing)
) {
@@ -1707,6 +1706,8 @@ close_windows (
nexttp = first_tabpage;
break;
}
+ }
+ }
}
--RedrawingDisabled;
@@ -1963,7 +1964,6 @@ int win_close(win_T *win, int free_buf)
*/
void win_close_othertab(win_T *win, int free_buf, tabpage_T *tp)
{
- win_T *wp;
int dir;
tabpage_T *ptp = NULL;
int free_tp = FALSE;
@@ -1982,10 +1982,18 @@ void win_close_othertab(win_T *win, int free_buf, tabpage_T *tp)
return;
/* Autocommands may have closed the window already. */
- for (wp = tp->tp_firstwin; wp != NULL && wp != win; wp = wp->w_next)
- ;
- if (wp == NULL)
- return;
+ {
+ bool found_window = false;
+ FOR_ALL_WINDOWS_IN_TAB(wp, tp) {
+ if (wp == win) {
+ found_window = true;
+ break;
+ }
+ }
+ if (!found_window) {
+ return;
+ }
+ }
/* When closing the last window in a tab page remove the tab page. */
if (tp->tp_firstwin == tp->tp_lastwin) {
@@ -2986,14 +2994,14 @@ int make_tabpages(int maxcount)
/*
* Return TRUE when "tpc" points to a valid tab page.
*/
-int valid_tabpage(tabpage_T *tpc)
+bool valid_tabpage(tabpage_T *tpc)
{
- tabpage_T *tp;
-
- for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
- if (tp == tpc)
- return TRUE;
- return FALSE;
+ FOR_ALL_TABS(tp) {
+ if (tp == tpc) {
+ return true;
+ }
+ }
+ return false;
}
/*
@@ -3285,14 +3293,11 @@ void win_goto(win_T *wp)
*/
tabpage_T *win_find_tabpage(win_T *win)
{
- win_T *wp;
- tabpage_T *tp;
-
- for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
- for (wp = (tp == curtab ? firstwin : tp->tp_firstwin);
- wp != NULL; wp = wp->w_next)
- if (wp == win)
- return tp;
+ FOR_ALL_TAB_WINDOWS(tp, wp) {
+ if (wp == win) {
+ return tp;
+ }
+ }
return NULL;
}
@@ -3549,28 +3554,36 @@ win_T *buf_jump_open_win(buf_T *buf)
*/
win_T *buf_jump_open_tab(buf_T *buf)
{
- win_T *wp;
- tabpage_T *tp;
- /* First try the current tab page. */
- wp = buf_jump_open_win(buf);
- if (wp != NULL)
- return wp;
+ // First try the current tab page.
+ {
+ win_T *wp = buf_jump_open_win(buf);
+ if (wp != NULL)
+ return wp;
+ }
- for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
+ FOR_ALL_TABS(tp) {
+ // Skip the current tab since we already checked it.
if (tp != curtab) {
- for (wp = tp->tp_firstwin; wp != NULL; wp = wp->w_next)
- if (wp->w_buffer == buf)
- break;
- if (wp != NULL) {
- goto_tabpage_win(tp, wp);
- if (curwin != wp)
- wp = NULL; /* something went wrong */
- break;
+ FOR_ALL_WINDOWS_IN_TAB(wp, tp) {
+ if (wp->w_buffer == buf) {
+ goto_tabpage_win(tp, wp);
+
+ // If we the current window didn't switch,
+ // something went wrong.
+ if (curwin != wp) {
+ wp = NULL;
+ }
+
+ // Return the window we switched to.
+ return wp;
+ }
}
}
+ }
- return wp;
+ // If we made it this far, we didn't find the buffer.
+ return NULL;
}
/*
@@ -4963,18 +4976,15 @@ int tabline_height(void)
*/
int min_rows(void)
{
- int total;
- tabpage_T *tp;
- int n;
-
if (firstwin == NULL) /* not initialized yet */
return MIN_LINES;
- total = 0;
- for (tp = first_tabpage; tp != NULL; tp = tp->tp_next) {
- n = frame_minheight(tp->tp_topframe, NULL);
- if (total < n)
+ int total = 0;
+ FOR_ALL_TABS(tp) {
+ int n = frame_minheight(tp->tp_topframe, NULL);
+ if (total < n) {
total = n;
+ }
}
total += tabline_height();
total += 1; /* count the room for the command line */
@@ -5014,16 +5024,15 @@ int only_one_window(void)
*/
void check_lnums(int do_curwin)
{
- win_T *wp;
-
- tabpage_T *tp;
-
- FOR_ALL_TAB_WINDOWS(tp, wp)
- if ((do_curwin || wp != curwin) && wp->w_buffer == curbuf) {
- if (wp->w_cursor.lnum > curbuf->b_ml.ml_line_count)
- wp->w_cursor.lnum = curbuf->b_ml.ml_line_count;
- if (wp->w_topline > curbuf->b_ml.ml_line_count)
- wp->w_topline = curbuf->b_ml.ml_line_count;
+ FOR_ALL_TAB_WINDOWS(tp, wp) {
+ if ((do_curwin || wp != curwin) && wp->w_buffer == curbuf) {
+ if (wp->w_cursor.lnum > curbuf->b_ml.ml_line_count) {
+ wp->w_cursor.lnum = curbuf->b_ml.ml_line_count;
+ }
+ if (wp->w_topline > curbuf->b_ml.ml_line_count) {
+ wp->w_topline = curbuf->b_ml.ml_line_count;
+ }
+ }
}
}
generated by cgit (git 2.34.1) at 2025-06-01 15:58:25 +0000