Consider masked modifiers (~S etc.) when writing to bind file

Fixes #12973

(cherry picked from commit eb1ac06a9ad9bafd50c26fb951dd38a8d970c199)

diff --git a/src/KeyMap.cpp b/src/KeyMap.cpp
index c34fe7eefb9726afbc5d46bba821883e28895448..d841c08ca13db600f8c29c3d32405982c43acd50 100644 (file)
--- a/src/KeyMap.cpp
+++ b/src/KeyMap.cpp
@@ -568,11 +568,11 @@ void KeyMap::listBindings(BindingList & list,
                // a LFUN_COMMAND_PREFIX
                if (it->prefixes) {
                        KeySequence seq = prefix;
-                       seq.addkey(it->code, it->mod.first);
+                       seq.addkey(it->code, it->mod.first, it->mod.second);
                        it->prefixes->listBindings(list, seq, tag);
                } else {
                        KeySequence seq = prefix;
-                       seq.addkey(it->code, it->mod.first);
+                       seq.addkey(it->code, it->mod.first, it->mod.second);
                        list.push_back(Binding(it->func, seq, tag));
                }
        }

diff --git a/src/KeySequence.cpp b/src/KeySequence.cpp
index c0985b78b9b75d8f252437812a307798ad89cbc9..80cd6dae0e59875f69c9f562da6426532ff8da82 100644 (file)
--- a/src/KeySequence.cpp
+++ b/src/KeySequence.cpp
@@ -147,16 +147,27 @@ docstring const KeySequence::print(outputFormat format, bool const untranslated)
                        break;
                case BindFile:
                        KeyModifier mod = modifiers[i].first;
+                       KeyModifier nmod = modifiers[i].second;
                        if (mod & ControlModifier)
                                buf += "C-";
+                       else if (nmod & ControlModifier)
+                               buf += "~C-";
                        if (mod & AltModifier)
 #if defined(USE_MACOSX_PACKAGING) || defined(USE_META_KEYBINDING)
                                buf += "A-";
+                       else if (nmod & AltModifier)
+                               buf += "~A-";
                        if (mod & MetaModifier)
 #endif
                                buf += "M-";
+#if defined(USE_MACOSX_PACKAGING) || defined(USE_META_KEYBINDING)
+                       else if (nmod & MetaModifier)
+                               buf += "~M-";
+#endif
                        if (mod & ShiftModifier)
                                buf += "S-";
+                       else if (nmod & ShiftModifier)
+                               buf += "~S-";
 
                        buf += from_utf8(sequence[i].getSymbolName());
                        break;

diff --git a/status.24x b/status.24x
index cf29d67ff84424a72da2bf0e92514c8fb4de6963..d3b70a0f5cdc32a06825adf78b122cc9dfe45e2f 100644 (file)
--- a/status.24x
+++ b/status.24x
@@ -74,6 +74,9 @@ What's new
 
 - Fix performance problems with references with (very) many authors.
 
+- Fix problem that key bindings that include optional modifier keys could not
+  be un- or re-bound (bug 12973)
+
 - Enable OK/Apply button in tabular dialog when "Additional Space" combo has
   been set to different value.