revert recent change to development/FORMAT (don't change history)

[lyx.git] / src / lyx_cb.C

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index fbaab73305bd5c5f4586389d2a4c69c6551cfecd..028cd74f4b8aeb3ef692be403e68e004bf782ff3 100644 (file)
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -19,6 +19,7 @@
 #include "buffer.h"
 #include "bufferlist.h"
 #include "BufferView.h"
+#include "buffer_funcs.h"
 #include "cursor.h"
 #include "debug.h"
 #include "gettext.h"
@@ -129,7 +130,7 @@ bool writeAs(Buffer * buffer, string const & filename)
        if (filename.empty()) {
 
                FileDialog fileDlg(_("Choose a filename to save document as"),
-                       LFUN_WRITEAS,
+                       LFUN_BUFFER_WRITE_AS,
                        make_pair(string(_("Documents|#o#O")),
                                  string(lyxrc.document_path)),
                        make_pair(string(_("Templates|#T#t")),
@@ -216,7 +217,7 @@ void quitLyX(bool noask)
                Alert::warning(_("Unable to remove temporary directory"), msg);
        }
 
-       lyx_gui::exit();
+       lyx_gui::exit(0);
 }
 
 
@@ -338,20 +339,13 @@ void newFile(BufferView * bv, string const & filename)
        // Split argument by :
        string name;
        string tmpname = split(filename, name, ':');
-#ifdef __EMX__ // Fix me! lyx_cb.C may not be low level enough to allow this.
-       if (name.length() == 1
-           && isalpha(static_cast<unsigned char>(name[0]))
-           && (prefixIs(tmpname, "/") || prefixIs(tmpname, "\\"))) {
-               name += ':';
-               name += token(tmpname, ':', 0);
-               tmpname = split(tmpname, ':');
-       }
-#endif
        lyxerr[Debug::INFO] << "Arg is " << filename
                            << "\nName is " << name
                            << "\nTemplate is " << tmpname << endl;
 
-       bv->newFile(name, tmpname);
+       Buffer * const b = newFile(name, tmpname);
+       if (b)
+               bv->setBuffer(b);
 }