summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-01-03 22:12:15 +0100
committerBram Moolenaar <Bram@vim.org>2021-01-03 22:12:15 +0100
commitbb0956fc65ebe8df1da823f9c4d6a0013d9ba5c1 (patch)
tree47c4f36565bb24d64060daacfddec66d9c23a58e
parent5f63938447f3eebd1fc4add999ff8d5b42899178 (diff)
patch 8.2.2293: build failure with Motifv8.2.2293
Problem: Build failure with Motif. (Tony Mechelynck) Solution: Use empty_option instead of empty_options.
-rw-r--r--src/gui_motif.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gui_motif.c b/src/gui_motif.c
index 1863fa69ab..a9845b28f5 100644
--- a/src/gui_motif.c
+++ b/src/gui_motif.c
@@ -3525,7 +3525,7 @@ find_replace_callback(
char_u *save_cpo = p_cpo;
// No need to be Vi compatible here.
- p_cpo = empty_options;
+ p_cpo = empty_option;
u_undo(1);
p_cpo = save_cpo;
gui_update_screen();
diff --git a/src/version.c b/src/version.c
index 6b966286e5..258c7d9067 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2293,
+/**/
2292,
/**/
2291,