mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-19 01:38:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #10391 from janlazo/vim-8.1.0495

Browse Source 
vim-patch:8.1.{495,505,531,533,583,623,630,641,686,715,833,1012,1221,1651}
This commit is contained in:
Justin M. Keyes
2019-07-16 19:52:23 +02:00
committed by GitHub
parent b9a2b3f014 64f4ee39aa
commit b35ad86024
15 changed files with 319 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/nvim/ex_docmd.c
View File

@@ -9322,26 +9322,30 @@ static frame_T *ses_skipframe(frame_T *fr)
{
frame_T *frc;
for (frc = fr; frc != NULL; frc = frc->fr_next)
if (ses_do_frame(frc))
FOR_ALL_FRAMES(frc, fr) {
if (ses_do_frame(frc)) {
break;
}
}
return frc;
}
/*
* Return TRUE if frame "fr" has a window somewhere that we want to save in
* the Session.
*/
static int ses_do_frame(frame_T *fr)
// Return true if frame "fr" has a window somewhere that we want to save in
// the Session.
static bool ses_do_frame(const frame_T *fr)
FUNC_ATTR_NONNULL_ARG(1)
{
frame_T *frc;
const frame_T *frc;
if (fr->fr_layout == FR_LEAF)
if (fr->fr_layout == FR_LEAF) {
return ses_do_win(fr->fr_win);
for (frc = fr->fr_child; frc != NULL; frc = frc->fr_next)
if (ses_do_frame(frc))
return TRUE;
return FALSE;
}
FOR_ALL_FRAMES(frc, fr->fr_child) {
if (ses_do_frame(frc)) {
return true;
}
}
return false;
}
/// Return non-zero if window "wp" is to be stored in the Session.