aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

patch 7.4.2024

Browse Source 
Problem:    More buf_valid() calls can be optimized.
Solution:   Use bufref_valid() instead.
This commit is contained in:
Bram Moolenaar
2016-07-10 22:11:16 +02:00
parent ea3f2e7be4
commit 7c0a2f367f
21 changed files with 218 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/ex_getln.c
View File

@@ -1666,7 +1666,7 @@ getcmdline(
case Ctrl__: /* CTRL-_: switch language mode */
if (!p_ari)
break;
#ifdef FEAT_FKMAP
# ifdef FEAT_FKMAP
if (p_altkeymap)
{
cmd_fkmap = !cmd_fkmap;
@@ -1674,7 +1674,7 @@ getcmdline(
ccline.overstrike = FALSE;
}
else /* Hebrew is default */
#endif
# endif
cmd_hkmap = !cmd_hkmap;
goto cmdline_not_changed;
#endif
@@ -6655,9 +6655,9 @@ cmd_gchar(int offset)
ex_window(void)
{
struct cmdline_info save_ccline;
buf_T *old_curbuf = curbuf;
bufref_T old_curbuf;
win_T *old_curwin = curwin;
buf_T *bp;
bufref_T bufref;
win_T *wp;
int i;
linenr_T lnum;
@@ -6686,6 +6686,7 @@ ex_window(void)
beep_flush();
return K_IGNORE;
}
set_bufref(&old_curbuf, curbuf);
/* Save current window sizes. */
win_size_save(&winsizes);
@@ -6832,7 +6833,7 @@ ex_window(void)
/* Safety check: The old window or buffer was deleted: It's a bug when
* this happens! */
if (!win_valid(old_curwin) || !buf_valid(old_curbuf))
if (!win_valid(old_curwin) || !bufref_valid(&old_curbuf))
{
cmdwin_result = Ctrl_C;
EMSG(_("E199: Active window or buffer deleted"));
@@ -6903,14 +6904,14 @@ ex_window(void)
curwin->w_p_cole = 0;
# endif
wp = curwin;
bp = curbuf;
set_bufref(&bufref, curbuf);
win_goto(old_curwin);
win_close(wp, TRUE);
/* win_close() may have already wiped the buffer when 'bh' is
* set to 'wipe' */
if (buf_valid(bp))
close_buffer(NULL, bp, DOBUF_WIPE, FALSE);
if (bufref_valid(&bufref))
close_buffer(NULL, bufref.br_buf, DOBUF_WIPE, FALSE);
/* Restore window sizes. */
win_size_restore(&winsizes);