don't rm emergency saves ever

[lyx.git] / src / lyx_cb.C

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index ac98e2fcb5989dba3de0d433850fdaa759e1b3db..0b944b6d01e9ddd0f23664abf2d5ef46339aba04 100644 (file)
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -63,7 +63,7 @@ void ShowMessage(Buffer const * buf,
                 string const & msg2,
                 string const & msg3)
 {
-       if (lyxrc.use_gui
+       if (lyx_gui::use_gui
            && buf && buf->getUser() && buf->getUser()->owner()) {
                        string const str = msg1 + ' ' + msg2 + ' ' + msg3;
                        buf->getUser()->owner()->message(str);
@@ -96,7 +96,7 @@ bool MenuWrite(BufferView * bv, Buffer * buffer)
        text += file + _(" could not be saved.\n\nDo you want to rename the document and try again?");
 #endif
        int const ret = Alert::prompt(_("Rename and save?"),
-               text, 0, _("&Rename"), _("&Cancel"));
+               text, 0, 1, _("&Rename"), _("&Cancel"));
 
        if (ret == 0)
                return WriteAs(bv, buffer);
@@ -155,7 +155,7 @@ bool WriteAs(BufferView * bv, Buffer * buffer, string const & filename)
                text += file + _(" already exists.\n\nDo you want to over-write that document?");
 #endif
                int const ret = Alert::prompt(_("Over-write document?"),
-                       text, 1, _("&Over-write"), _("&Cancel"));
+                       text, 0, 1, _("&Over-write"), _("&Cancel"));
 
                if (ret == 1)
                        return false;
@@ -182,7 +182,7 @@ void QuitLyX()
 {
        lyxerr[Debug::INFO] << "Running QuitLyX." << endl;
 
-       if (lyxrc.use_gui) {
+       if (lyx_gui::use_gui) {
                if (!bufferlist.quitWriteAll())
                        return;
 
@@ -366,9 +366,6 @@ void InsertAsciiFile(BufferView * bv, string const & f, bool asParagraph)
        if (tmpstr.empty())
                return;
 
-       // insert the string
-       bv->hideCursor();
-
        // clear the selection
        bool flag = (bv->text == bv->getLyXText());
        if (flag)
@@ -462,7 +459,7 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap
 
 string const getPossibleLabel(BufferView const & bv)
 {
-       Paragraph * par = bv.getLyXText()->cursor.par();
+       Paragraph * par = &*bv.getLyXText()->cursor.par();
        LyXLayout_ptr layout = par->layout();
        if (layout->latextype == LATEX_PARAGRAPH && par->previous()) {
                Paragraph * par2 = par->previous();