IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1024 from war1025/dev/for_all_buffers

Browse Source 
Add FOR_ALL_BUFFERS helper
This commit is contained in:
Justin M. Keyes 2014-08-19 23:49:25 -04:00
commit e1c330a486
16 changed files with 145 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/nvim/buffer.c
View File

@ -115,9 +115,15 @@ open_buffer (
* If we can't create one for the current buffer, take another buffer * If we can't create one for the current buffer, take another buffer
*/ */
close_buffer(NULL, curbuf, 0, FALSE); close_buffer(NULL, curbuf, 0, FALSE);
for (curbuf = firstbuf; curbuf != NULL; curbuf = curbuf->b_next)
if (curbuf->b_ml.ml_mfp != NULL) curbuf = NULL;
FOR_ALL_BUFFERS(buf) {
if (buf->b_ml.ml_mfp != NULL) {
curbuf = buf;
break; break;
}
}
/* /*
* if there is no memfile at all, exit * if there is no memfile at all, exit
* This is OK, since there are no changes to lose. * This is OK, since there are no changes to lose.
@ -260,11 +266,11 @@ open_buffer (
*/ */
int buf_valid(buf_T *buf) int buf_valid(buf_T *buf)
{ {
buf_T *bp; FOR_ALL_BUFFERS(bp) {
if (bp == buf) {
for (bp = firstbuf; bp != NULL; bp = bp->b_next)
if (bp == buf)
return TRUE; return TRUE;
}
}
return FALSE; return FALSE;
} }
@ -946,9 +952,13 @@ do_buffer (
* If deleting the last (listed) buffer, make it empty. * If deleting the last (listed) buffer, make it empty.
* The last (listed) buffer cannot be unloaded. * The last (listed) buffer cannot be unloaded.
*/ */
for (bp = firstbuf; bp != NULL; bp = bp->b_next) bp = NULL;
if (bp->b_p_bl && bp != buf) FOR_ALL_BUFFERS(bp2) {
if (bp2->b_p_bl && bp2 != buf) {
bp = bp2;
break; break;
}
}
if (bp == NULL && buf == curbuf) if (bp == NULL && buf == curbuf)
return empty_curbuf(TRUE, forceit, action); return empty_curbuf(TRUE, forceit, action);
@ -1047,9 +1057,12 @@ do_buffer (
if (buf == NULL) /* No loaded buffer, use unloaded one */ if (buf == NULL) /* No loaded buffer, use unloaded one */
buf = bp; buf = bp;
if (buf == NULL) { /* No loaded buffer, find listed one */ if (buf == NULL) { /* No loaded buffer, find listed one */
for (buf = firstbuf; buf != NULL; buf = buf->b_next) FOR_ALL_BUFFERS(buf2) {
if (buf->b_p_bl && buf != curbuf) if (buf2->b_p_bl && buf2 != curbuf) {
buf = buf2;
break; break;
}
}
} }
if (buf == NULL) { /* Still no buffer, just take one */ if (buf == NULL) { /* Still no buffer, just take one */
if (curbuf->b_next != NULL) if (curbuf->b_next != NULL)
@ -1670,9 +1683,7 @@ buf_T *buflist_findname(char_u *ffname)
static buf_T *buflist_findname_file_id(char_u *ffname, FileID *file_id, static buf_T *buflist_findname_file_id(char_u *ffname, FileID *file_id,
bool file_id_valid) bool file_id_valid)
{ {
buf_T *buf; FOR_ALL_BUFFERS(buf) {
for (buf = firstbuf; buf != NULL; buf = buf->b_next) {
if ((buf->b_flags & BF_DUMMY) == 0 if ((buf->b_flags & BF_DUMMY) == 0
&& !otherfile_buf(buf, ffname, file_id, file_id_valid)) { && !otherfile_buf(buf, ffname, file_id, file_id_valid)) {
return buf; return buf;
@ -1695,7 +1706,6 @@ buflist_findpat (
int curtab_only /* find buffers in current tab only */ int curtab_only /* find buffers in current tab only */
) )
{ {
buf_T *buf;
regprog_T *prog; regprog_T *prog;
int match = -1; int match = -1;
int find_listed; int find_listed;
@ -1746,7 +1756,7 @@ buflist_findpat (
return -1; return -1;
} }
for (buf = firstbuf; buf != NULL; buf = buf->b_next) FOR_ALL_BUFFERS(buf) {
if (buf->b_p_bl == find_listed if (buf->b_p_bl == find_listed
&& (!diffmode || diff_mode_buf(buf)) && (!diffmode || diff_mode_buf(buf))
&& buflist_match(prog, buf) != NULL) { && buflist_match(prog, buf) != NULL) {
@ -1767,6 +1777,7 @@ buflist_findpat (
} }
match = buf->b_fnum; /* remember first match */ match = buf->b_fnum; /* remember first match */
} }
}
vim_regfree(prog); vim_regfree(prog);
if (match >= 0) /* found one match */ if (match >= 0) /* found one match */
@ -1799,7 +1810,6 @@ buflist_findpat (
int ExpandBufnames(char_u *pat, int *num_file, char_u ***file, int options) int ExpandBufnames(char_u *pat, int *num_file, char_u ***file, int options)
{ {
int count = 0; int count = 0;
buf_T *buf;
int round; int round;
char_u *p; char_u *p;
int attempt; int attempt;
@ -1837,7 +1847,7 @@ int ExpandBufnames(char_u *pat, int *num_file, char_u ***file, int options)
*/ */
for (round = 1; round <= 2; ++round) { for (round = 1; round <= 2; ++round) {
count = 0; count = 0;
for (buf = firstbuf; buf != NULL; buf = buf->b_next) { FOR_ALL_BUFFERS(buf) {
if (!buf->b_p_bl) /* skip unlisted buffers */ if (!buf->b_p_bl) /* skip unlisted buffers */
continue; continue;
p = buflist_match(prog, buf); p = buflist_match(prog, buf);
@ -1921,13 +1931,15 @@ static char_u *fname_match(regprog_T *prog, char_u *name)
*/ */
buf_T *buflist_findnr(int nr) buf_T *buflist_findnr(int nr)
{ {
buf_T *buf; if (nr == 0) {
if (nr == 0)
nr = curwin->w_alt_fnum; nr = curwin->w_alt_fnum;
for (buf = firstbuf; buf != NULL; buf = buf->b_next) }
if (buf->b_fnum == nr)
FOR_ALL_BUFFERS(buf) {
if (buf->b_fnum == nr) {
return buf; return buf;
}
}
return NULL; return NULL;
} }
@ -2344,9 +2356,7 @@ int buflist_add(char_u *fname, int flags)
*/ */
void buflist_slash_adjust(void) void buflist_slash_adjust(void)
{ {
buf_T *bp; FOR_ALL_BUFFERS(bp) {
for (bp = firstbuf; bp != NULL; bp = bp->b_next) {
if (bp->b_ffname != NULL) if (bp->b_ffname != NULL)
slash_adjust(bp->b_ffname); slash_adjust(bp->b_ffname);
if (bp->b_sfname != NULL) if (bp->b_sfname != NULL)
@ -4192,7 +4202,6 @@ int read_viminfo_bufferlist(vir_T *virp, int writing)
void write_viminfo_bufferlist(FILE *fp) void write_viminfo_bufferlist(FILE *fp)
{ {
buf_T *buf;
win_T *win; win_T *win;
tabpage_T *tp; tabpage_T *tp;
char_u *line; char_u *line;
@ -4213,7 +4222,7 @@ void write_viminfo_bufferlist(FILE *fp)
} }
fputs(_("\n# Buffer list:\n"), fp); fputs(_("\n# Buffer list:\n"), fp);
for (buf = firstbuf; buf != NULL; buf = buf->b_next) { FOR_ALL_BUFFERS(buf) {
if (buf->b_fname == NULL if (buf->b_fname == NULL
|| !buf->b_p_bl || !buf->b_p_bl
|| bt_quickfix(buf) || bt_quickfix(buf)
@ -4488,13 +4497,11 @@ void buf_delete_signs(buf_T *buf)
*/ */
void buf_delete_all_signs(void) void buf_delete_all_signs(void)
{ {
buf_T *buf; /* buffer we are checking for signs */ FOR_ALL_BUFFERS(buf) {
if (buf->b_signlist != NULL) {
for (buf = firstbuf; buf != NULL; buf = buf->b_next) { buf_delete_signs(buf);
if (buf->b_signlist != NULL) {
buf_delete_signs(buf);
}
} }
}
} }
/* /*

5
src/nvim/edit.c
View File

@ -3436,8 +3436,9 @@ static int ins_compl_get_exp(pos_T *ini)
int set_match_pos; int set_match_pos;
if (!compl_started) { if (!compl_started) {
for (ins_buf = firstbuf; ins_buf != NULL; ins_buf = ins_buf->b_next) FOR_ALL_BUFFERS(buf) {
ins_buf->b_scanned = 0; buf->b_scanned = 0;
}
found_all = FALSE; found_all = FALSE;
ins_buf = curbuf; ins_buf = curbuf;
e_cpt = (compl_cont_status & CONT_LOCAL) e_cpt = (compl_cont_status & CONT_LOCAL)

24
src/nvim/eval.c
View File

@ -5405,7 +5405,6 @@ static int list_join(garray_T *gap, list_T *l, char_u *sep, int echo_style, int
int garbage_collect(void) int garbage_collect(void)
{ {
int copyID; int copyID;
buf_T *buf;
win_T *wp; win_T *wp;
funccall_T *fc, **pfc; funccall_T *fc, **pfc;
int did_free; int did_free;
@ -5440,8 +5439,9 @@ int garbage_collect(void)
set_ref_in_ht(&SCRIPT_VARS(i), copyID); set_ref_in_ht(&SCRIPT_VARS(i), copyID);
/* buffer-local variables */ /* buffer-local variables */
for (buf = firstbuf; buf != NULL; buf = buf->b_next) FOR_ALL_BUFFERS(buf) {
set_ref_in_item(&buf->b_bufvar.di_tv, copyID); set_ref_in_item(&buf->b_bufvar.di_tv, copyID);
}
/* window-local variables */ /* window-local variables */
FOR_ALL_TAB_WINDOWS(tp, wp) FOR_ALL_TAB_WINDOWS(tp, wp)
@ -7223,13 +7223,16 @@ static buf_T *find_buffer(typval_T *avar)
if (buf == NULL) { if (buf == NULL) {
/* No full path name match, try a match with a URL or a "nofile" /* No full path name match, try a match with a URL or a "nofile"
* buffer, these don't use the full path. */ * buffer, these don't use the full path. */
for (buf = firstbuf; buf != NULL; buf = buf->b_next) FOR_ALL_BUFFERS(bp) {
if (buf->b_fname != NULL if (bp->b_fname != NULL
&& (path_with_url(buf->b_fname) && (path_with_url(bp->b_fname)
|| bt_nofile(buf) || bt_nofile(bp)
) )
&& STRCMP(buf->b_fname, avar->vval.v_string) == 0) && STRCMP(bp->b_fname, avar->vval.v_string) == 0) {
buf = bp;
break; break;
}
}
} }
} }
return buf; return buf;
@ -10635,11 +10638,12 @@ static void f_keys(typval_T *argvars, typval_T *rettv)
static void f_last_buffer_nr(typval_T *argvars, typval_T *rettv) static void f_last_buffer_nr(typval_T *argvars, typval_T *rettv)
{ {
int n = 0; int n = 0;
buf_T *buf;
for (buf = firstbuf; buf != NULL; buf = buf->b_next) FOR_ALL_BUFFERS(buf) {
if (n < buf->b_fnum) if (n < buf->b_fnum) {
n = buf->b_fnum; n = buf->b_fnum;
}
}
rettv->vval.v_number = n; rettv->vval.v_number = n;
} }

23
src/nvim/ex_cmds.c
View File

@ -1211,7 +1211,6 @@ do_shell (
int flags /* may be SHELL_DOOUT when output is redirected */ int flags /* may be SHELL_DOOUT when output is redirected */
) )
{ {
buf_T *buf;
int save_nwr; int save_nwr;
/* /*
@ -1239,11 +1238,12 @@ do_shell (
if (p_warn if (p_warn
&& !autocmd_busy && !autocmd_busy
&& msg_silent == 0) && msg_silent == 0)
for (buf = firstbuf; buf; buf = buf->b_next) FOR_ALL_BUFFERS(buf) {
if (bufIsChanged(buf)) { if (bufIsChanged(buf)) {
MSG_PUTS(_("[No write since last change]\n")); MSG_PUTS(_("[No write since last change]\n"));
break; break;
} }
}
/* This windgoto is required for when the '\n' resulted in a "delete line /* This windgoto is required for when the '\n' resulted in a "delete line
* 1" command to the terminal. */ * 1" command to the terminal. */
@ -1753,7 +1753,6 @@ static void do_viminfo(FILE *fp_in, FILE *fp_out, int flags)
static int read_viminfo_up_to_marks(vir_T *virp, int forceit, int writing) static int read_viminfo_up_to_marks(vir_T *virp, int forceit, int writing)
{ {
int eof; int eof;
buf_T *buf;
prepare_viminfo_history(forceit ? 9999 : 0, writing); prepare_viminfo_history(forceit ? 9999 : 0, writing);
eof = viminfo_readline(virp); eof = viminfo_readline(virp);
@ -1816,8 +1815,9 @@ static int read_viminfo_up_to_marks(vir_T *virp, int forceit, int writing)
finish_viminfo_history(); finish_viminfo_history();
/* Change file names to buffer numbers for fmarks. */ /* Change file names to buffer numbers for fmarks. */
for (buf = firstbuf; buf != NULL; buf = buf->b_next) FOR_ALL_BUFFERS(buf) {
fmarks_check_names(buf); fmarks_check_names(buf);
}
return eof; return eof;
} }
@ -2362,14 +2362,13 @@ void ex_wnext(exarg_T *eap)
*/ */
void do_wqall(exarg_T *eap) void do_wqall(exarg_T *eap)
{ {
buf_T *buf;
int error = 0; int error = 0;
int save_forceit = eap->forceit; int save_forceit = eap->forceit;
if (eap->cmdidx == CMD_xall || eap->cmdidx == CMD_wqall) if (eap->cmdidx == CMD_xall || eap->cmdidx == CMD_wqall)
exiting = TRUE; exiting = TRUE;
for (buf = firstbuf; buf != NULL; buf = buf->b_next) { FOR_ALL_BUFFERS(buf) {
if (bufIsChanged(buf)) { if (bufIsChanged(buf)) {
/* /*
* Check if there is a reason the buffer cannot be written: * Check if there is a reason the buffer cannot be written:
@ -5679,7 +5678,6 @@ void ex_sign(exarg_T *eap)
int idx; int idx;
sign_T *sp; sign_T *sp;
sign_T *sp_prev; sign_T *sp_prev;
buf_T *buf;
/* Parse the subcommand. */ /* Parse the subcommand. */
p = skiptowhite(arg); p = skiptowhite(arg);
@ -5906,10 +5904,11 @@ void ex_sign(exarg_T *eap)
if (idx == SIGNCMD_UNPLACE && *arg == NUL) if (idx == SIGNCMD_UNPLACE && *arg == NUL)
{ {
/* ":sign unplace {id}": remove placed sign by number */ /* ":sign unplace {id}": remove placed sign by number */
for (buf = firstbuf; buf != NULL; buf = buf->b_next) FOR_ALL_BUFFERS(buf) {
if ((lnum = buf_delsign(buf, id)) != 0) if ((lnum = buf_delsign(buf, id)) != 0)
update_debug_sign(buf, lnum); update_debug_sign(buf, lnum);
return; return;
}
} }
} }
} }
@ -5918,6 +5917,8 @@ void ex_sign(exarg_T *eap)
* Check for line={lnum} name={name} and file={fname} or buffer={nr}. * Check for line={lnum} name={name} and file={fname} or buffer={nr}.
* Leave "arg" pointing to {fname}. * Leave "arg" pointing to {fname}.
*/ */
buf_T *buf = NULL;
for (;;) for (;;)
{ {
if (STRNCMP(arg, "line=", 5) == 0) if (STRNCMP(arg, "line=", 5) == 0)

47
src/nvim/ex_cmds2.c
View File

@ -1044,17 +1044,18 @@ int autowrite(buf_T *buf, int forceit)
*/ */
void autowrite_all(void) void autowrite_all(void)
{ {
buf_T *buf; if (!(p_aw || p_awa) || !p_write) {
if (!(p_aw || p_awa) || !p_write)
return; return;
for (buf = firstbuf; buf; buf = buf->b_next) }
FOR_ALL_BUFFERS(buf) {
if (bufIsChanged(buf) && !buf->b_p_ro) { if (bufIsChanged(buf) && !buf->b_p_ro) {
(void)buf_write_all(buf, FALSE); (void)buf_write_all(buf, FALSE);
/* an autocommand may have deleted the buffer */ /* an autocommand may have deleted the buffer */
if (!buf_valid(buf)) if (!buf_valid(buf))
buf = firstbuf; buf = firstbuf;
} }
}
} }
/* /*
@ -1070,15 +1071,14 @@ int check_changed(buf_T *buf, int flags)
&& ((flags & CCGD_MULTWIN) || buf->b_nwindows <= 1) && ((flags & CCGD_MULTWIN) || buf->b_nwindows <= 1)
&& (!(flags & CCGD_AW) || autowrite(buf, forceit) == FAIL)) { && (!(flags & CCGD_AW) || autowrite(buf, forceit) == FAIL)) {
if ((p_confirm || cmdmod.confirm) && p_write) { if ((p_confirm || cmdmod.confirm) && p_write) {
buf_T *buf2;
int count = 0; int count = 0;
if (flags & CCGD_ALLBUF) if (flags & CCGD_ALLBUF)
for (buf2 = firstbuf; buf2 != NULL; buf2 = buf2->b_next) FOR_ALL_BUFFERS(buf2) {
if (bufIsChanged(buf2) if (bufIsChanged(buf2) && (buf2->b_ffname != NULL)) {
&& (buf2->b_ffname != NULL
))
++count; ++count;
}
}
if (!buf_valid(buf)) if (!buf_valid(buf))
/* Autocommand deleted buffer, oops! It's not changed now. */ /* Autocommand deleted buffer, oops! It's not changed now. */
return FALSE; return FALSE;
@ -1111,7 +1111,6 @@ dialog_changed (
{ {
char_u buff[DIALOG_MSG_SIZE]; char_u buff[DIALOG_MSG_SIZE];
int ret; int ret;
buf_T *buf2;
exarg_T ea; exarg_T ea;
dialog_msg(buff, _("Save changes to \"%s\"?"), dialog_msg(buff, _("Save changes to \"%s\"?"),
@ -1139,7 +1138,7 @@ dialog_changed (
* Skip readonly buffers, these need to be confirmed * Skip readonly buffers, these need to be confirmed
* individually. * individually.
*/ */
for (buf2 = firstbuf; buf2 != NULL; buf2 = buf2->b_next) { FOR_ALL_BUFFERS(buf2) {
if (bufIsChanged(buf2) if (bufIsChanged(buf2)
&& (buf2->b_ffname != NULL && (buf2->b_ffname != NULL
) )
@ -1157,8 +1156,9 @@ dialog_changed (
/* /*
* mark all buffers as unchanged * mark all buffers as unchanged
*/ */
for (buf2 = firstbuf; buf2 != NULL; buf2 = buf2->b_next) FOR_ALL_BUFFERS(buf2) {
unchanged(buf2, TRUE); unchanged(buf2, TRUE);
}
} }
} }
@ -1200,7 +1200,6 @@ check_changed_any (
) )
{ {
int ret = FALSE; int ret = FALSE;
buf_T *buf;
int save; int save;
int i; int i;
int bufnum = 0; int bufnum = 0;
@ -1209,8 +1208,9 @@ check_changed_any (
tabpage_T *tp; tabpage_T *tp;
win_T *wp; win_T *wp;
for (buf = firstbuf; buf != NULL; buf = buf->b_next) FOR_ALL_BUFFERS(buf) {
++bufcount; ++bufcount;
}
if (bufcount == 0) if (bufcount == 0)
return FALSE; return FALSE;
@ -1230,9 +1230,11 @@ check_changed_any (
for (wp = tp->tp_firstwin; wp != NULL; wp = wp->w_next) for (wp = tp->tp_firstwin; wp != NULL; wp = wp->w_next)
add_bufnum(bufnrs, &bufnum, wp->w_buffer->b_fnum); add_bufnum(bufnrs, &bufnum, wp->w_buffer->b_fnum);
/* any other buf */ /* any other buf */
for (buf = firstbuf; buf != NULL; buf = buf->b_next) FOR_ALL_BUFFERS(buf) {
add_bufnum(bufnrs, &bufnum, buf->b_fnum); add_bufnum(bufnrs, &bufnum, buf->b_fnum);
}
buf_T *buf = NULL;
for (i = 0; i < bufnum; ++i) { for (i = 0; i < bufnum; ++i) {
buf = buflist_findnr(bufnrs[i]); buf = buflist_findnr(bufnrs[i]);
if (buf == NULL) if (buf == NULL)
@ -1817,7 +1819,6 @@ void ex_listdo(exarg_T *eap)
int i; int i;
win_T *wp; win_T *wp;
tabpage_T *tp; tabpage_T *tp;
buf_T *buf;
int next_fnum = 0; int next_fnum = 0;
char_u *save_ei = NULL; char_u *save_ei = NULL;
char_u *p_shm_save; char_u *p_shm_save;
@ -1882,7 +1883,7 @@ void ex_listdo(exarg_T *eap)
/* Remember the number of the next listed buffer, in case /* Remember the number of the next listed buffer, in case
* ":bwipe" is used or autocommands do something strange. */ * ":bwipe" is used or autocommands do something strange. */
next_fnum = -1; next_fnum = -1;
for (buf = curbuf->b_next; buf != NULL; buf = buf->b_next) for (buf_T *buf = curbuf->b_next; buf != NULL; buf = buf->b_next)
if (buf->b_p_bl) { if (buf->b_p_bl) {
next_fnum = buf->b_fnum; next_fnum = buf->b_fnum;
break; break;
@ -1897,12 +1898,18 @@ void ex_listdo(exarg_T *eap)
/* Done? */ /* Done? */
if (next_fnum < 0) if (next_fnum < 0)
break; break;
/* Check if the buffer still exists. */ /* Check if the buffer still exists. */
for (buf = firstbuf; buf != NULL; buf = buf->b_next) bool buf_still_exists = false;
if (buf->b_fnum == next_fnum) FOR_ALL_BUFFERS(bp) {
if (bp->b_fnum == next_fnum) {
buf_still_exists = true;
break; break;
if (buf == NULL) }
}
if (buf_still_exists) {
break; break;
}
/* Go to the next buffer. Clear 'shm' to avoid that the file /* Go to the next buffer. Clear 'shm' to avoid that the file
* message overwrites any output from the command. */ * message overwrites any output from the command. */

3
src/nvim/ex_docmd.c
View File

@ -7871,7 +7871,6 @@ makeopens (
char_u *dirnow /* Current directory name */ char_u *dirnow /* Current directory name */
) )
{ {
buf_T *buf;
int only_save_windows = TRUE; int only_save_windows = TRUE;
int nr; int nr;
int cnr = 1; int cnr = 1;
@ -7943,7 +7942,7 @@ makeopens (
return FAIL; return FAIL;
/* Now put the other buffers into the buffer list */ /* Now put the other buffers into the buffer list */
for (buf = firstbuf; buf != NULL; buf = buf->b_next) { FOR_ALL_BUFFERS(buf) {
if (!(only_save_windows && buf->b_nwindows == 0) if (!(only_save_windows && buf->b_nwindows == 0)
&& !(buf->b_help && !(ssop_flags & SSOP_HELP)) && !(buf->b_help && !(ssop_flags & SSOP_HELP))
&& buf->b_fname != NULL && buf->b_fname != NULL

6
src/nvim/fileio.c
View File

@ -4345,11 +4345,10 @@ static int make_bom(char_u *buf, char_u *name)
void shorten_fnames(int force) void shorten_fnames(int force)
{ {
char_u dirname[MAXPATHL]; char_u dirname[MAXPATHL];
buf_T *buf;
char_u *p; char_u *p;
os_dirname(dirname, MAXPATHL); os_dirname(dirname, MAXPATHL);
for (buf = firstbuf; buf != NULL; buf = buf->b_next) { FOR_ALL_BUFFERS(buf) {
if (buf->b_fname != NULL if (buf->b_fname != NULL
&& !bt_nofile(buf) && !bt_nofile(buf)
&& !path_with_url(buf->b_fname) && !path_with_url(buf->b_fname)
@ -6109,7 +6108,6 @@ void ex_doautoall(exarg_T *eap)
{ {
int retval; int retval;
aco_save_T aco; aco_save_T aco;
buf_T *buf;
char_u *arg = eap->arg; char_u *arg = eap->arg;
int call_do_modelines = check_nomodeline(&arg); int call_do_modelines = check_nomodeline(&arg);
@ -6120,7 +6118,7 @@ void ex_doautoall(exarg_T *eap)
* gives problems when the autocommands make changes to the list of * gives problems when the autocommands make changes to the list of
* buffers or windows... * buffers or windows...
*/ */
for (buf = firstbuf; buf != NULL; buf = buf->b_next) { FOR_ALL_BUFFERS(buf) {
if (buf->b_ml.ml_mfp != NULL) { if (buf->b_ml.ml_mfp != NULL) {
/* find a window for this buffer and save some values */ /* find a window for this buffer and save some values */
aucmd_prepbuf(&aco, buf); aucmd_prepbuf(&aco, buf);

3
src/nvim/globals.h
View File

@ -556,6 +556,9 @@ EXTERN buf_T *firstbuf INIT(= NULL); /* first buffer */
EXTERN buf_T *lastbuf INIT(= NULL); /* last buffer */ EXTERN buf_T *lastbuf INIT(= NULL); /* last buffer */
EXTERN buf_T *curbuf INIT(= NULL); /* currently active buffer */ EXTERN buf_T *curbuf INIT(= NULL); /* currently active buffer */
// Iterates over all buffers in the buffer list.
# define FOR_ALL_BUFFERS(buf) for (buf_T *buf = firstbuf; buf != NULL; buf = buf->b_next)
/* Flag that is set when switching off 'swapfile'. It means that all blocks /* Flag that is set when switching off 'swapfile'. It means that all blocks
* are to be loaded into memory. Shouldn't be global... */ * are to be loaded into memory. Shouldn't be global... */
EXTERN int mf_dont_release INIT(= FALSE); /* don't release blocks */ EXTERN int mf_dont_release INIT(= FALSE); /* don't release blocks */

6
src/nvim/main.c
View File

@ -744,7 +744,6 @@ main_loop (
/* Exit properly */ /* Exit properly */
void getout(int exitval) void getout(int exitval)
{ {
buf_T *buf;
win_T *wp; win_T *wp;
tabpage_T *tp, *next_tp; tabpage_T *tp, *next_tp;
@ -772,7 +771,7 @@ void getout(int exitval)
if (wp->w_buffer == NULL) if (wp->w_buffer == NULL)
/* Autocmd must have close the buffer already, skip. */ /* Autocmd must have close the buffer already, skip. */
continue; continue;
buf = wp->w_buffer; buf_T *buf = wp->w_buffer;
if (buf->b_changedtick != -1) { if (buf->b_changedtick != -1) {
apply_autocmds(EVENT_BUFWINLEAVE, buf->b_fname, apply_autocmds(EVENT_BUFWINLEAVE, buf->b_fname,
buf->b_fname, FALSE, buf); buf->b_fname, FALSE, buf);
@ -785,13 +784,14 @@ void getout(int exitval)
} }
/* Trigger BufUnload for buffers that are loaded */ /* Trigger BufUnload for buffers that are loaded */
for (buf = firstbuf; buf != NULL; buf = buf->b_next) FOR_ALL_BUFFERS(buf) {
if (buf->b_ml.ml_mfp != NULL) { if (buf->b_ml.ml_mfp != NULL) {
apply_autocmds(EVENT_BUFUNLOAD, buf->b_fname, buf->b_fname, apply_autocmds(EVENT_BUFUNLOAD, buf->b_fname, buf->b_fname,
FALSE, buf); FALSE, buf);
if (!buf_valid(buf)) /* autocmd may delete the buffer */ if (!buf_valid(buf)) /* autocmd may delete the buffer */
break; break;
} }
}
apply_autocmds(EVENT_VIMLEAVEPRE, NULL, NULL, FALSE, curbuf); apply_autocmds(EVENT_VIMLEAVEPRE, NULL, NULL, FALSE, curbuf);
} }

20
src/nvim/mark.c
View File

@ -1337,7 +1337,6 @@ int removable(char_u *name)
int write_viminfo_marks(FILE *fp_out) int write_viminfo_marks(FILE *fp_out)
{ {
int count; int count;
buf_T *buf;
int is_mark_set; int is_mark_set;
int i; int i;
win_T *win; win_T *win;
@ -1346,12 +1345,13 @@ int write_viminfo_marks(FILE *fp_out)
/* /*
* Set b_last_cursor for the all buffers that have a window. * Set b_last_cursor for the all buffers that have a window.
*/ */
FOR_ALL_TAB_WINDOWS(tp, win) FOR_ALL_TAB_WINDOWS(tp, win) {
set_last_cursor(win); set_last_cursor(win);
}
fputs(_("\n# History of marks within files (newest to oldest):\n"), fp_out); fputs(_("\n# History of marks within files (newest to oldest):\n"), fp_out);
count = 0; count = 0;
for (buf = firstbuf; buf != NULL; buf = buf->b_next) { FOR_ALL_BUFFERS(buf) {
/* /*
* Only write something if buffer has been loaded and at least one * Only write something if buffer has been loaded and at least one
* mark is set. * mark is set.
@ -1467,12 +1467,16 @@ void copy_viminfo_marks(vir_T *virp, FILE *fp_out, int count, int eof, int flags
} }
} else { /* fp_out != NULL */ } else { /* fp_out != NULL */
/* This is slow if there are many buffers!! */ /* This is slow if there are many buffers!! */
for (buf = firstbuf; buf != NULL; buf = buf->b_next) buf = NULL;
if (buf->b_ffname != NULL) { FOR_ALL_BUFFERS(bp) {
home_replace(NULL, buf->b_ffname, name_buf, LSIZE, TRUE); if (bp->b_ffname != NULL) {
if (fnamecmp(str, name_buf) == 0) home_replace(NULL, bp->b_ffname, name_buf, LSIZE, TRUE);
if (fnamecmp(str, name_buf) == 0) {
buf = bp;
break; break;
}
} }
}
/* /*
* copy marks if the buffer has not been loaded * copy marks if the buffer has not been loaded

15
src/nvim/memfile.c
View File

@ -613,7 +613,6 @@ static bhdr_T *mf_release(memfile_T *mfp, int page_count)
{ {
bhdr_T *hp; bhdr_T *hp;
int need_release; int need_release;
buf_T *buf;
/* don't release while in mf_close_file() */ /* don't release while in mf_close_file() */
if (mf_dont_release) if (mf_dont_release)
@ -632,11 +631,16 @@ static bhdr_T *mf_release(memfile_T *mfp, int page_count)
*/ */
if (mfp->mf_fd < 0 && need_release && p_uc) { if (mfp->mf_fd < 0 && need_release && p_uc) {
/* find for which buffer this memfile is */ /* find for which buffer this memfile is */
for (buf = firstbuf; buf != NULL; buf = buf->b_next) buf_T *buf = NULL;
if (buf->b_ml.ml_mfp == mfp) FOR_ALL_BUFFERS(bp) {
if (bp->b_ml.ml_mfp == mfp) {
buf = bp;
break; break;
if (buf != NULL && buf->b_may_swap) }
}
if (buf != NULL && buf->b_may_swap) {
ml_open_file(buf); ml_open_file(buf);
}
} }
/* /*
@ -686,12 +690,11 @@ static bhdr_T *mf_release(memfile_T *mfp, int page_count)
*/ */
int mf_release_all(void) int mf_release_all(void)
{ {
buf_T *buf;
memfile_T *mfp; memfile_T *mfp;
bhdr_T *hp; bhdr_T *hp;
int retval = FALSE; int retval = FALSE;
for (buf = firstbuf; buf != NULL; buf = buf->b_next) { FOR_ALL_BUFFERS(buf) {
mfp = buf->b_ml.ml_mfp; mfp = buf->b_ml.ml_mfp;
if (mfp != NULL) { if (mfp != NULL) {
/* If no swap file yet, may open one */ /* If no swap file yet, may open one */

25
src/nvim/memline.c
View File

@ -466,11 +466,11 @@ void ml_setname(buf_T *buf)
*/ */
void ml_open_files(void) void ml_open_files(void)
{ {
buf_T *buf; FOR_ALL_BUFFERS(buf) {
if (!buf->b_p_ro || buf->b_changed) {
for (buf = firstbuf; buf != NULL; buf = buf->b_next)
if (!buf->b_p_ro || buf->b_changed)
ml_open_file(buf); ml_open_file(buf);
}
}
} }
/* /*
@ -584,11 +584,10 @@ void ml_close(buf_T *buf, int del_file)
*/ */
void ml_close_all(int del_file) void ml_close_all(int del_file)
{ {
buf_T *buf; FOR_ALL_BUFFERS(buf) {
for (buf = firstbuf; buf != NULL; buf = buf->b_next)
ml_close(buf, del_file && ((buf->b_flags & BF_PRESERVED) == 0 ml_close(buf, del_file && ((buf->b_flags & BF_PRESERVED) == 0
|| vim_strchr(p_cpo, CPO_PRESERVE) == NULL)); || vim_strchr(p_cpo, CPO_PRESERVE) == NULL));
}
spell_delete_wordlist(); /* delete the internal wordlist */ spell_delete_wordlist(); /* delete the internal wordlist */
vim_deltempdir(); /* delete created temp directory */ vim_deltempdir(); /* delete created temp directory */
} }
@ -599,11 +598,11 @@ void ml_close_all(int del_file)
*/ */
void ml_close_notmod(void) void ml_close_notmod(void)
{ {
buf_T *buf; FOR_ALL_BUFFERS(buf) {
if (!bufIsChanged(buf)) {
for (buf = firstbuf; buf != NULL; buf = buf->b_next)
if (!bufIsChanged(buf))
ml_close(buf, TRUE); /* close all not-modified buffers */ ml_close(buf, TRUE); /* close all not-modified buffers */
}
}
} }
/* /*
@ -1617,9 +1616,7 @@ static int recov_file_names(char_u **names, char_u *path, int prepend_dot)
*/ */
void ml_sync_all(int check_file, int check_char) void ml_sync_all(int check_file, int check_char)
{ {
buf_T *buf; FOR_ALL_BUFFERS(buf) {
for (buf = firstbuf; buf != NULL; buf = buf->b_next) {
if (buf->b_ml.ml_mfp == NULL || buf->b_ml.ml_mfp->mf_fname == NULL) if (buf->b_ml.ml_mfp == NULL || buf->b_ml.ml_mfp->mf_fname == NULL)
continue; /* no file */ continue; /* no file */

4
src/nvim/misc1.c
View File

@ -3329,8 +3329,6 @@ void prepare_to_exit(void)
*/ */
void preserve_exit(void) void preserve_exit(void)
{ {
buf_T *buf;
// Prevent repeated calls into this method. // Prevent repeated calls into this method.
if (really_exiting) { if (really_exiting) {
exit(2); exit(2);
@ -3346,7 +3344,7 @@ void preserve_exit(void)
ml_close_notmod(); /* close all not-modified buffers */ ml_close_notmod(); /* close all not-modified buffers */
for (buf = firstbuf; buf != NULL; buf = buf->b_next) { FOR_ALL_BUFFERS(buf) {
if (buf->b_ml.ml_mfp != NULL && buf->b_ml.ml_mfp->mf_fname != NULL) { if (buf->b_ml.ml_mfp != NULL && buf->b_ml.ml_mfp->mf_fname != NULL) {
OUT_STR("Vim: preserving files...\n"); OUT_STR("Vim: preserving files...\n");
screen_start(); /* don't know where cursor is now */ screen_start(); /* don't know where cursor is now */

7
src/nvim/option.c
View File

@ -7677,7 +7677,6 @@ static void paste_option_changed(void)
static int save_ru = 0; static int save_ru = 0;
static int save_ri = 0; static int save_ri = 0;
static int save_hkmap = 0; static int save_hkmap = 0;
buf_T *buf;
if (p_paste) { if (p_paste) {
/* /*
@ -7686,7 +7685,7 @@ static void paste_option_changed(void)
*/ */
if (!old_p_paste) { if (!old_p_paste) {
/* save options for each buffer */ /* save options for each buffer */
for (buf = firstbuf; buf != NULL; buf = buf->b_next) { FOR_ALL_BUFFERS(buf) {
buf->b_p_tw_nopaste = buf->b_p_tw; buf->b_p_tw_nopaste = buf->b_p_tw;
buf->b_p_wm_nopaste = buf->b_p_wm; buf->b_p_wm_nopaste = buf->b_p_wm;
buf->b_p_sts_nopaste = buf->b_p_sts; buf->b_p_sts_nopaste = buf->b_p_sts;
@ -7710,7 +7709,7 @@ static void paste_option_changed(void)
* already on. * already on.
*/ */
/* set options for each buffer */ /* set options for each buffer */
for (buf = firstbuf; buf != NULL; buf = buf->b_next) { FOR_ALL_BUFFERS(buf) {
buf->b_p_tw = 0; /* textwidth is 0 */ buf->b_p_tw = 0; /* textwidth is 0 */
buf->b_p_wm = 0; /* wrapmargin is 0 */ buf->b_p_wm = 0; /* wrapmargin is 0 */
buf->b_p_sts = 0; /* softtabstop is 0 */ buf->b_p_sts = 0; /* softtabstop is 0 */
@ -7735,7 +7734,7 @@ static void paste_option_changed(void)
*/ */
else if (old_p_paste) { else if (old_p_paste) {
/* restore options for each buffer */ /* restore options for each buffer */
for (buf = firstbuf; buf != NULL; buf = buf->b_next) { FOR_ALL_BUFFERS(buf) {
buf->b_p_tw = buf->b_p_tw_nopaste; buf->b_p_tw = buf->b_p_tw_nopaste;
buf->b_p_wm = buf->b_p_wm_nopaste; buf->b_p_wm = buf->b_p_wm_nopaste;
buf->b_p_sts = buf->b_p_sts_nopaste; buf->b_p_sts = buf->b_p_sts_nopaste;

4
src/nvim/spell.c
View File

@ -4131,11 +4131,11 @@ void spell_delete_wordlist(void)
void spell_free_all(void) void spell_free_all(void)
{ {
slang_T *slang; slang_T *slang;
buf_T *buf;
// Go through all buffers and handle 'spelllang'. <VN> // Go through all buffers and handle 'spelllang'. <VN>
for (buf = firstbuf; buf != NULL; buf = buf->b_next) FOR_ALL_BUFFERS(buf) {
ga_clear(&buf->b_s.b_langp); ga_clear(&buf->b_s.b_langp);
}
while (first_lang != NULL) { while (first_lang != NULL) {
slang = first_lang; slang = first_lang;

11
src/nvim/window.c
View File

@ -3576,7 +3576,6 @@ win_free (
) )
{ {
int i; int i;
buf_T *buf;
wininfo_T *wip; wininfo_T *wip;
handle_unregister_window(wp); handle_unregister_window(wp);
@ -3589,13 +3588,6 @@ win_free (
* gui_mch_destroy_scrollbar() may trigger a FocusGained event. */ * gui_mch_destroy_scrollbar() may trigger a FocusGained event. */
block_autocmds(); block_autocmds();
clear_winopt(&wp->w_onebuf_opt); clear_winopt(&wp->w_onebuf_opt);
clear_winopt(&wp->w_allbuf_opt); clear_winopt(&wp->w_allbuf_opt);
@ -3614,10 +3606,11 @@ win_free (
/* Remove the window from the b_wininfo lists, it may happen that the /* Remove the window from the b_wininfo lists, it may happen that the
* freed memory is re-used for another window. */ * freed memory is re-used for another window. */
for (buf = firstbuf; buf != NULL; buf = buf->b_next) FOR_ALL_BUFFERS(buf) {
for (wip = buf->b_wininfo; wip != NULL; wip = wip->wi_next) for (wip = buf->b_wininfo; wip != NULL; wip = wip->wi_next)
if (wip->wi_win == wp) if (wip->wi_win == wp)
wip->wi_win = NULL; wip->wi_win = NULL;
}
clear_matches(wp); clear_matches(wp);