fix reading the author field.

[lyx.git] / src / lyxfunc.C

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index defcbe968966c9fbb70760d854e8dce6b6123a78..2103bdb1974c90d50d099b5e78544b08821198f7 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -87,9 +87,10 @@
 #include "support/path_defines.h"
 #include "support/systemcall.h"
 #include "support/tostr.h"
-#include "support/std_sstream.h"
 #include "support/os.h"
 
+#include <sstream>
+
 using bv_funcs::freefont2string;
 
 using lyx::support::AddName;
@@ -299,6 +300,8 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
 
        // the default error message if we disable the command
        setStatusMessage(N_("Command disabled"));
+       if (!flag.enabled())
+               return flag;
 
        // Check whether we need a buffer
        if (!lyxaction.funcHasFlag(cmd.action, LyXAction::NoBuffer) && !buf) {
@@ -1314,6 +1317,32 @@ void LyXFunc::dispatch(FuncRequest const & cmd, bool verbose)
                        break;
                }
 
+               case LFUN_SAVE_AS_DEFAULT: {
+                       string const fname =
+                               AddName(AddPath(user_lyxdir(), "templates/"),
+                                       "defaults.lyx");
+                       Buffer defaults(fname);
+
+                       istringstream ss(argument);
+                       LyXLex lex(0,0);
+                       lex.setStream(ss);
+                       int const unknown_tokens = defaults.readHeader(lex);
+
+                       if (unknown_tokens != 0) {
+                               lyxerr << "Warning in LFUN_SAVE_AS_DEFAULT!\n"
+                                      << unknown_tokens << " unknown token"
+                                      << (unknown_tokens == 1 ? "" : "s")
+                                      << endl;
+                       }
+                       
+                       if (defaults.writeFile(defaults.fileName()))
+                               setMessage(_("Document defaults saved in ")
+                                          + MakeDisplayPath(fname));
+                       else
+                               setErrorMessage(_("Unable to save document defaults"));
+                       break;
+               }
+
                case LFUN_BUFFERPARAMS_APPLY: {
                        biblio::CiteEngine const engine =
                                owner->buffer()->params().cite_engine;
@@ -1393,9 +1422,9 @@ void LyXFunc::dispatch(FuncRequest const & cmd, bool verbose)
 
                default: {
                        update = false;
-                       DispatchResult res = view()->cursor().dispatch(cmd);
-                       if (res.dispatched())
-                               update |= res.update();
+                       view()->cursor().dispatch(cmd);
+                       if (view()->cursor().result().dispatched())
+                               update |= view()->cursor().result().update();
                        else
                                update |= view()->dispatch(cmd);
 
@@ -1404,7 +1433,16 @@ void LyXFunc::dispatch(FuncRequest const & cmd, bool verbose)
                }
 
                if (view()->available()) {
-                       if (view()->fitCursor() || update)
+                       // Redraw screen unless explicitly told otherwise.
+                       // This also initializes the position cache for all insets
+                       // in (at least partially) visible top-level paragraphs.
+                       if (update)
+                               view()->update();
+
+                       // fitCursor() needs valid inset position. The previous call to
+                       // update() makes sure we have such even for freshly created
+                       // insets.
+                       if (view()->fitCursor())
                                view()->update();
                        // if we executed a mutating lfun, mark the buffer as dirty
                        if (getStatus(cmd).enabled()
@@ -1449,7 +1487,7 @@ void LyXFunc::sendDispatchMessage(string const & msg,
                }
        }
 
-       string const shortcuts = toplevel_keymap->findbinding(cmd);
+       string const shortcuts = toplevel_keymap->printbindings(cmd);
 
        if (!shortcuts.empty()) {
                comname += ": " + shortcuts;