Patch 9.0.0170

[Bram Moolenaar]

Patch 9.0.0170
Problem: Various minor code formatting issues.
Solution: Improve code formatting.
Files: src/change.c, src/popupwin.c, src/textformat.c, src/vim.h,
src/if_lua.c, src/if_tcl.c


*** ../vim-9.0.0169/src/change.c 2022-07-23 09:52:00.333814262 +0100
--- src/change.c 2022-08-07 16:55:47.628660301 +0100
***************
*** 1298,1304 ****
// fixpos is TRUE, we don't want to end up positioned at the NUL,
// unless "restart_edit" is set or 'virtualedit' contains "onemore".
if (col > 0 && fixpos && restart_edit == 0
! && (get_ve_flags() & VE_ONEMORE) == 0)
{
--curwin->w_cursor.col;
curwin->w_cursor.coladd = 0;
--- 1298,1304 ----
// fixpos is TRUE, we don't want to end up positioned at the NUL,
// unless "restart_edit" is set or 'virtualedit' contains "onemore".
if (col > 0 && fixpos && restart_edit == 0
! && (get_ve_flags() & VE_ONEMORE) == 0)
{
--curwin->w_cursor.col;
curwin->w_cursor.coladd = 0;
*** ../vim-9.0.0169/src/popupwin.c 2022-07-25 18:13:33.050580738 +0100
--- src/popupwin.c 2022-07-31 12:36:13.254209611 +0100
***************
*** 1087,1093 ****
{
int col = dict_get_number(dict, "col");

! prop_add_common( lnum, col, dict, buf, NULL);
}
}
}
--- 1087,1093 ----
{
int col = dict_get_number(dict, "col");

! prop_add_common(lnum, col, dict, buf, NULL);
}
}
}
*** ../vim-9.0.0169/src/textformat.c 2022-07-06 13:31:25.299369947 +0100
--- src/textformat.c 2022-08-07 16:55:57.420653796 +0100
***************
*** 1189,1195 ****
{
(void)del_bytes(indent, FALSE, FALSE);
mark_col_adjust(curwin->w_cursor.lnum,
! (colnr_T)0, 0L, (long)-indent, 0);
}
}
curwin->w_cursor.lnum--;
--- 1189,1195 ----
{
(void)del_bytes(indent, FALSE, FALSE);
mark_col_adjust(curwin->w_cursor.lnum,
! (colnr_T)0, 0L, (long)-indent, 0);
}
}
curwin->w_cursor.lnum--;
*** ../vim-9.0.0169/src/vim.h 2022-07-23 06:24:56.405106035 +0100
--- src/vim.h 2022-07-31 12:54:26.657001634 +0100
***************
*** 2829,2832 ****
--- 2829,2833 ----
#define FFED_NO_GLOBAL 2 // only check for script-local functions

#define MAX_LSHIFT_BITS (varnumber_T)((sizeof(uvarnumber_T) * 8) - 1)
+
#endif // VIM__H
*** ../vim-9.0.0169/src/if_lua.c 2022-05-09 19:09:20.000000000 +0100
--- src/if_lua.c 2022-08-07 16:18:27.853322293 +0100
***************
*** 1501,1507 ****
curbuf = buf;
luaL_error(L, "cannot replace line");
}
! else changed_bytes(n, 0);
curbuf = buf;
if (b == curwin->w_buffer)
check_cursor_col();
--- 1501,1508 ----
curbuf = buf;
luaL_error(L, "cannot replace line");
}
! else
! changed_bytes(n, 0);
curbuf = buf;
if (b == curwin->w_buffer)
check_cursor_col();
*** ../vim-9.0.0169/src/if_tcl.c 2022-06-21 20:16:03.000000000 +0100
--- src/if_tcl.c 2022-08-07 16:18:57.165298681 +0100
***************
*** 651,657 ****
err = TCL_ERROR;
}
}
! else { // objc == 3
line = (char *)ml_get_buf(buf, (linenr_T)val1, FALSE);
Tcl_SetResult(interp, line, TCL_VOLATILE);
}
--- 651,658 ----
err = TCL_ERROR;
}
}
! else
! { // objc == 3
line = (char *)ml_get_buf(buf, (linenr_T)val1, FALSE);
Tcl_SetResult(interp, line, TCL_VOLATILE);
}
***************
*** 1090,1096 ****
if (err != TCL_OK)
break;
}
! else { // objc == 4
err = tclgetlinenum(interp, objv[2], &val1, win->w_buffer);
if (err != TCL_OK)
break;
--- 1091,1098 ----
if (err != TCL_OK)
break;
}
! else
! { // objc == 4
err = tclgetlinenum(interp, objv[2], &val1, win->w_buffer);
if (err != TCL_OK)
break;
*** ../vim-9.0.0169/src/version.c 2022-08-08 14:59:44.109986834 +0100
--- src/version.c 2022-08-08 15:46:20.988367259 +0100
***************
*** 737,738 ****
--- 737,740 ----
{ /* Add new patch number below this line */
+ /**/
+ 170,
/**/

--
We're knights of the Round Table
Our shows are formidable
But many times
We're given rhymes
That are quite unsingable
We're opera mad in Camelot
We sing from the diaphragm a lot.
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///