summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Takata <kentkt@csc.jp>2023-12-19 20:12:29 +0100
committerChristian Brabandt <cb@256bit.org>2023-12-19 20:12:29 +0100
commit18d0d29b420543efd4938619d821df7b67988de5 (patch)
tree90e2167079ce1fdb9c89e2485ea4ee083421f8bf
parent5872bcb6e8dfc15d7a5c0aaaf94d8029f3a1fa3f (diff)
patch 9.0.2175: Compile error with Motif UI + mouse supportv9.0.2176
Problem: Compile error with Motif UI + mouse support (after v9.0.1262) Solution: Use correct oldval option pointer Fix compilation error introduced by 9.0.1262 and found in #13704. closes: #13726 Signed-off-by: Ken Takata <kentkt@csc.jp> Signed-off-by: Christian Brabandt <cb@256bit.org>
-rw-r--r--src/optionstr.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/optionstr.c b/src/optionstr.c
index ad1dc81a84..326e625526 100644
--- a/src/optionstr.c
+++ b/src/optionstr.c
@@ -2956,7 +2956,7 @@ did_set_mousemodel(optset_T *args UNUSED)
if (check_opt_strings(p_mousem, p_mousem_values, FALSE) != OK)
return e_invalid_argument;
#if defined(FEAT_GUI_MOTIF) && defined(FEAT_MENU) && (XmVersion <= 1002)
- else if (*p_mousem != *oldval)
+ else if (*p_mousem != *args->os_oldval.string)
// Changed from "extend" to "popup" or "popup_setpos" or vv: need
// to create or delete the popup menus.
gui_motif_update_mousemodel(root_menu);
diff --git a/src/version.c b/src/version.c
index 78fb3e01f6..e65c2310cd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2176,
+/**/
2175,
/**/
2174,