convert author names and status messages to docstring

[lyx.git] / src / lyxfunc.C

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index 35edfe2e1bc7ef27f324a84583660ede2f8eebcc..f8fe702f076bdc9281e0902e06f0808f2ed4c64f 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -1246,6 +1246,11 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                                InsetCommandParams p(name);
                                data = InsetCommandMailer::params2string(name, p);
                        } else if (name == "include") {
+                               // data is the include type: one of "include",
+                               // "input", "verbatiminput" or "verbatiminput*"
+                               if (data.empty())
+                                       // default type is requested
+                                       data = "include";
                                InsetCommandParams p(data);
                                data = InsetIncludeMailer::params2string(p);
                        } else if (name == "box") {
@@ -2024,19 +2029,19 @@ void LyXFunc::setMessage(docstring const & m) const
 }
 
 
-string const LyXFunc::viewStatusMessage()
+docstring const LyXFunc::viewStatusMessage()
 {
        // When meta-fake key is pressed, show the key sequence so far + "M-".
        if (wasMetaKey())
-               return to_utf8(keyseq->print() + "M-");
+               return keyseq->print() + "M-";
 
        // Else, when a non-complete key sequence is pressed,
        // show the available options.
        if (keyseq->length() > 0 && !keyseq->deleted())
-               return to_utf8(keyseq->printOptions());
+               return keyseq->printOptions();
 
        if (!view()->buffer())
-               return to_utf8(_("Welcome to LyX!"));
+               return _("Welcome to LyX!");
 
        return view()->cursor().currentState();
 }