# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1590524103 -7200
# Node ID 2c808d01a9fde8dfc6bfa2bd651b85304e398e59
# Parent  74e3316c1d5a4c573c3d14a706da33a4ad9eaeb8
patch 8.2.0830: Motif: can't map "!"

Commit: https://github.com/vim/vim/commit/80a20df86a1ceefa3506cc578ba0ba35da979e38
Author: Bram Moolenaar <Bram@vim.org>
Date:   Tue May 26 22:14:27 2020 +0200

    patch 8.2.0830: Motif: can't map "!"

    Problem:    Motif: can't map "!". (Ben Jackson)
    Solution:   Remove the shift modifier if it's already included in the key.
                (closes #6147)

diff --git a/src/gui_x11.c b/src/gui_x11.c
--- a/src/gui_x11.c
+++ b/src/gui_x11.c
@@ -948,6 +948,11 @@ gui_x11_key_hit_cb(
     {
 	string[0] = key;
 	len = 1;
+
+	// Remove the SHIFT modifier for keys where it's already included,
+	// e.g., '(', '!' and '*'.
+	if (!ASCII_ISALPHA(key) && key > 0x20 && key < 0x7f)
+	    modifiers &= ~MOD_MASK_SHIFT;
     }
 
     if (modifiers != 0)
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    830,
+/**/
     829,
 /**/
     828,