mirror of
https://github.com/vim/vim.git
synced 2025-09-27 04:14:06 -04:00
patch 9.0.1158: code is indented more than necessary
Problem: Code is indented more than necessary. Solution: Use an early return where it makes sense. (Yegappan Lakshmanan, closes #11787)
This commit is contained in:
committed by
Bram Moolenaar
parent
df8f947359
commit
7f8b2559a3
46
src/fold.c
46
src/fold.c
@@ -513,13 +513,14 @@ newFoldLevelWin(win_T *wp)
|
||||
void
|
||||
foldCheckClose(void)
|
||||
{
|
||||
if (*p_fcl != NUL) // can only be "all" right now
|
||||
{
|
||||
checkupdate(curwin);
|
||||
if (checkCloseRec(&curwin->w_folds, curwin->w_cursor.lnum,
|
||||
(int)curwin->w_p_fdl))
|
||||
changed_window_setting();
|
||||
}
|
||||
if (*p_fcl == NUL)
|
||||
return;
|
||||
|
||||
// can only be "all" right now
|
||||
checkupdate(curwin);
|
||||
if (checkCloseRec(&curwin->w_folds, curwin->w_cursor.lnum,
|
||||
(int)curwin->w_p_fdl))
|
||||
changed_window_setting();
|
||||
}
|
||||
|
||||
// checkCloseRec() {{{2
|
||||
@@ -1077,16 +1078,17 @@ foldAdjustVisual(void)
|
||||
}
|
||||
if (hasFolding(start->lnum, &start->lnum, NULL))
|
||||
start->col = 0;
|
||||
if (hasFolding(end->lnum, NULL, &end->lnum))
|
||||
{
|
||||
ptr = ml_get(end->lnum);
|
||||
end->col = (colnr_T)STRLEN(ptr);
|
||||
if (end->col > 0 && *p_sel == 'o')
|
||||
--end->col;
|
||||
// prevent cursor from moving on the trail byte
|
||||
if (has_mbyte)
|
||||
mb_adjust_cursor();
|
||||
}
|
||||
|
||||
if (!hasFolding(end->lnum, NULL, &end->lnum))
|
||||
return;
|
||||
|
||||
ptr = ml_get(end->lnum);
|
||||
end->col = (colnr_T)STRLEN(ptr);
|
||||
if (end->col > 0 && *p_sel == 'o')
|
||||
--end->col;
|
||||
// prevent cursor from moving on the trail byte
|
||||
if (has_mbyte)
|
||||
mb_adjust_cursor();
|
||||
}
|
||||
|
||||
// cursor_foldstart() {{{2
|
||||
@@ -1215,11 +1217,11 @@ foldLevelWin(win_T *wp, linenr_T lnum)
|
||||
static void
|
||||
checkupdate(win_T *wp)
|
||||
{
|
||||
if (wp->w_foldinvalid)
|
||||
{
|
||||
foldUpdate(wp, (linenr_T)1, (linenr_T)MAXLNUM); // will update all
|
||||
wp->w_foldinvalid = FALSE;
|
||||
}
|
||||
if (!wp->w_foldinvalid)
|
||||
return;
|
||||
|
||||
foldUpdate(wp, (linenr_T)1, (linenr_T)MAXLNUM); // will update all
|
||||
wp->w_foldinvalid = FALSE;
|
||||
}
|
||||
|
||||
// setFoldRepeat() {{{2
|
||||
|
Reference in New Issue
Block a user