summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2022-08-26 10:33:54 +0100
committerBram Moolenaar <Bram@vim.org>2022-08-26 10:33:54 +0100
commit9b7d2a959646560f5770329f4428c4739eed4656 (patch)
treec5fa6511c16a9429fc9c35bf20b7661416d73705
parent2bd9dbc19fc67395cfa1226dda7326071ab22464 (diff)
downloadvim-git-9b7d2a959646560f5770329f4428c4739eed4656.tar.gz
patch 9.0.0271: using INIT() in non-header filesv9.0.0271
Problem: Using INIT() in non-header files. Solution: Remove INIT(). (closes #10981)
-rw-r--r--src/ex_getln.c2
-rw-r--r--src/gui_xim.c2
-rw-r--r--src/os_unix.c2
-rw-r--r--src/version.c2
4 files changed, 5 insertions, 3 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c
index 7b84af615..022c40516 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -59,7 +59,7 @@ static int empty_pattern_magic(char_u *pat, size_t len, magic_T magic_val);
#ifdef FEAT_CMDWIN
static int open_cmdwin(void);
-static int cedit_key INIT(= -1); // key value of 'cedit' option
+static int cedit_key = -1; // key value of 'cedit' option
#endif
diff --git a/src/gui_xim.c b/src/gui_xim.c
index 4d8706a10..d384cbc05 100644
--- a/src/gui_xim.c
+++ b/src/gui_xim.c
@@ -154,7 +154,7 @@ set_ref_in_im_funcs(int copyID UNUSED)
#if defined(FEAT_XIM) || defined(PROTO)
# if defined(FEAT_GUI_GTK) || defined(PROTO)
-static int xim_has_preediting INIT(= FALSE); // IM current status
+static int xim_has_preediting = FALSE; // IM current status
/*
* Set preedit_start_col to the current cursor position.
diff --git a/src/os_unix.c b/src/os_unix.c
index 2f0061495..7aa3d1f0c 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -959,7 +959,7 @@ static volatile sig_atomic_t lc_signal;
// TRUE when lc_jump_env is valid.
// Volatile because it is used in signal handler deathtrap().
-static volatile sig_atomic_t lc_active INIT(= FALSE);
+static volatile sig_atomic_t lc_active = FALSE;
/*
* A simplistic version of setjmp() that only allows one level of using.
diff --git a/src/version.c b/src/version.c
index 255725f22..59e36e4fa 100644
--- a/src/version.c
+++ b/src/version.c
@@ -724,6 +724,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 271,
+/**/
270,
/**/
269,