X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FKeySequence.cpp;h=cc6a5bd9855da6fd4535b1813f5821903da1bcac;hb=a648c39b70a85d8b9fd7a98c2501bec8fcb77ab1;hp=5a7623b7f626fc86afb4c8f601596091525573f9;hpb=91baeb2c5579790ecac82e71f963da649b3808c2;p=lyx.git diff --git a/src/KeySequence.cpp b/src/KeySequence.cpp index 5a7623b7f6..cc6a5bd985 100644 --- a/src/KeySequence.cpp +++ b/src/KeySequence.cpp @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Lars Gullik Bjønnes + * \author Lars Gullik Bjønnes * \author Jean-Marc Lasgouttes * \author John Levon * @@ -40,8 +40,7 @@ FuncRequest const & KeySequence::addkey(KeySymbol const & key, if (curmap) return curmap->lookup(key, mod, this); - static FuncRequest unknown(LFUN_UNKNOWN_ACTION); - return unknown; + return FuncRequest::unknown; } @@ -170,15 +169,9 @@ docstring const KeySequence::printOptions(bool forgui) const } -void KeySequence::mark_deleted() -{ - deleted_ = true; -} - - void KeySequence::reset() { - mark_deleted(); + deleted_ = true; curmap = stdmap; } @@ -196,6 +189,8 @@ void KeySequence::removeKey() return; sequence.pop_back(); modifiers.pop_back(); + if (sequence.empty()) + deleted_ = true; }