This patch prevents the shortcut dialog from silently over-writing existing bindings...

[lyx.git] / src / LyXAction.cpp

diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp
index bcd72be2666e39458a56d9fc745ded5fd205120e..a33ffdb6b9b174574fa2f815b7be6d84efd4cabd 100644 (file)
--- a/src/LyXAction.cpp
+++ b/src/LyXAction.cpp
@@ -1092,11 +1092,19 @@ void LyXAction::init()
 
 /*!
  * \var lyx::FuncCode lyx::LFUN_FONT_BOLD
- * \li Action: Toggles the bold font (selection-wise).
+ * \li Action: Toggles the bold font (selection-wise) using mathbf in math.
  * \li Syntax: font-bold
  * \endvar
  */
                { LFUN_FONT_BOLD, "font-bold", Noop, Layout },
+
+/*!
+ * \var lyx::FuncCode lyx::LFUN_FONT_BOLDSYMBOL
+ * \li Action: Toggles the bold font (selection-wise) using boldsymbol in math.
+ * \li Syntax: font-boldsymbol
+ * \endvar
+ */
+               { LFUN_FONT_BOLDSYMBOL, "font-boldsymbol", Noop, Layout },
 /*!
  * \var lyx::FuncCode lyx::LFUN_FONT_TYPEWRITER
  * \li Action: Toggles the typewriter family font (selection-wise).
@@ -3006,11 +3014,20 @@ void LyXAction::init()
 /*!
  * \var lyx::FuncCode lyx::LFUN_COMPLETION_CANCEL
  * \li Action: Try to cancel completion, either the popup or the inline completion
- * \li Syntax: completion-escape
+ * \li Syntax: completion-cancel
  * \li Origin: sts, Sep 07 2008
  * \endvar
  */
                { LFUN_COMPLETION_CANCEL, "completion-cancel", SingleParUpdate, Edit },
+/*!
+ * \var lyx::FuncCode lyx::LFUN_COMPLETION_ACCEPT
+ * \li Action: Accept suggested completion.
+ * \li Syntax: completion-accept
+ * \li Origin: sanda, Sep 08 2008
+ * \endvar
+ */
+               { LFUN_COMPLETION_ACCEPT, "completion-accept", SingleParUpdate, Edit },
+
 
 /*!
  * \var lyx::FuncCode lyx::LFUN_BRANCH_ACTIVATE
@@ -3109,5 +3126,11 @@ LyXAction::const_func_iterator LyXAction::func_end() const
        return lyx_func_map.end();
 }
 
+LyXErr & operator<<(LyXErr & l, FuncCode code)
+{
+       if (l.enabled()) 
+               l.stream() << lyxaction.getActionName(code); 
+       return l;
+}
 
 } // namespace lyx