summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-08-27 22:05:13 +0100
committerBram Moolenaar <Bram@vim.org>2022-08-27 22:05:13 +0100
commitd54af2e550c6c34efbad748de36e42b318f39243 (patch)
tree9e14e3540a06934b00b05a7b39bf91fcc6eba7f7 /src
parentbeedd0a266cfe524fe2a851caec8316f2e37885c (diff)
patch 9.0.0290: compiler warning for variable set but not usedv9.0.0290
Problem: Compiler warning for variable set but not used. Solution: Add #ifdef.
Diffstat (limited to 'src')
-rw-r--r--src/message.c9
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 2 deletions
diff --git a/src/message.c b/src/message.c
index 108ea22f74..a2803650ad 100644
--- a/src/message.c
+++ b/src/message.c
@@ -1459,6 +1459,7 @@ msg_start(void)
}
#endif
+#ifdef HAS_MESSAGE_WINDOW
if (use_message_window())
{
if (popup_message_win_visible() && msg_col > 0)
@@ -1472,7 +1473,9 @@ msg_start(void)
}
msg_col = 0;
}
- else if (!msg_scroll && full_screen) // overwrite last message
+ else
+#endif
+ if (!msg_scroll && full_screen) // overwrite last message
{
msg_row = cmdline_row;
msg_col =
@@ -2302,8 +2305,8 @@ msg_puts_display(
int sb_col = msg_col;
int wrap;
int did_last_char;
- int where = PUT_APPEND;
#ifdef HAS_MESSAGE_WINDOW
+ int where = PUT_APPEND;
win_T *msg_win = NULL;
linenr_T lnum = 1;
@@ -2513,7 +2516,9 @@ msg_puts_display(
else if (*s == '\r') // go to column 0
{
msg_col = 0;
+#ifdef HAS_MESSAGE_WINDOW
where = PUT_TRUNC;
+#endif
}
else if (*s == '\b') // go to previous char
{
diff --git a/src/version.c b/src/version.c
index 32c132ca43..35df02cb9a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -708,6 +708,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 290,
+/**/
289,
/**/
288,