fix cursor when loading/creating document ; implement LFUN_SAVE_AS_DEFAULT

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8874 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index 822ff50fc7aa0b3cb6c7c58b52e82ef853e9ade4..2c264a7d207564cd85fc08dddef5699df77c75c9 100644 (file)
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -329,6 +329,7 @@ void BufferView::Pimpl::setBuffer(Buffer * b)
                cursor_.push(buffer_->inset());
                cursor_.resetAnchor();
                buffer_->text().init(bv_);
+               buffer_->text().setCurrentFont(cursor_);
 
                // If we don't have a text object for this, we make one
                //if (bv_->text() == 0)

diff --git a/src/ChangeLog b/src/ChangeLog
index 210ceb18b6c151c874e0134efdb00223d74fd703..9ddbeb412aa1a594dc78e98702c0ecfb1bffb5fc 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2004-08-08  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+       * lyxfunc.C (dispatch): implement LFUN_SAVE_AS_DEFAULT
+
+       * BufferView_pimpl.C (setBuffer): initialize the current font of
+       the underlying LyXText
+
 2004-08-05  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * kbsequence.C (print): use UI native formatting for menu

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index 934cb51fec74eda22eacc55d81683c132233c91a..5ed01e177f8468f08c44e66695f385ff943c4749 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -1317,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;