summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/gui_gtk_x11.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index e1de83a68b..b76aacd9cc 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -6320,7 +6320,7 @@ gui_mch_wait_for_chars(long wtime)
// This timeout makes sure that we will return if no characters arrived in
// time. If "wtime" is zero just use one.
if (wtime >= 0)
- timer = timeout_add(wtime <= 0 ? 1L : wtime,
+ timer = timeout_add(wtime == 0 ? 1L : wtime,
input_timer_cb, &timed_out);
else
timer = 0;
diff --git a/src/version.c b/src/version.c
index 3d24067e40..71fd1c1eea 100644
--- a/src/version.c
+++ b/src/version.c
@@ -784,6 +784,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 872,
+/**/
871,
/**/
870,