next step...

[lyx.git] / src / lyx_main.C

diff --git a/src/lyx_main.C b/src/lyx_main.C
index 69c9aa84969fa35d1fded3a07696b247263c61cd..b085903939e1c8531b2ff1ba4ce3a2e6610e3f79 100644 (file)
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -17,7 +17,7 @@
 #pragma implementation
 #endif
 
-#include "version.h"
+#include <version.h>
 #include "lyx_main.h"
 #include "lyx_gui.h"
 #include "LyXView.h"
@@ -220,7 +220,7 @@ void error_handler(int err_sig)
        signal(SIGSEGV, SIG_DFL);
        signal(SIGTERM, SIG_DFL);
 
-       bufferlist.emergencyWriteAll();
+       LyX::emergencyCleanup();
 
        lyxerr << "Bye." << endl;
        if (err_sig!= SIGHUP && 
@@ -374,7 +374,6 @@ void LyX::init(bool gui)
                system_lyxdir = LYX_DIR;
                path_shown = true;
        }
-
        // Report the system directory if debugging is on
        if (!path_shown)
                lyxerr[Debug::INIT] << "System directory: '"
@@ -557,6 +556,19 @@ void LyX::defaultKeyBindings(kb_keymap  * kbmap)
 }
 
 
+void LyX::emergencyCleanup()
+{
+       // what to do about tmpfiles is non-obvious. we would
+       // like to delete any we find, but our lyxdir might
+       // contain documents etc. which might be helpful on
+       // a crash
+ 
+       bufferlist.emergencyWriteAll();
+       if (lyxserver)
+               lyxserver->emergencyCleanup();
+}
+
+ 
 // LyX can optionally take over the handling of deadkeys
 void LyX::deadKeyBindings(kb_keymap * kbmap)
 {
@@ -776,10 +788,11 @@ void commandLineHelp()
 // Give command line version information
 void commandLineVersionInfo()
 {
-       lyxerr << "LyX " LYX_VERSION << " of " LYX_RELEASE << endl;
+       lyxerr << "LyX " << lyx_version
+              << " of " << lyx_release_date << endl;
        lyxerr << "Built on " << __DATE__ << ", " << __TIME__ << endl;
 
-       lyxerr << VERSION_INFO << endl;
+       lyxerr << lyx_version_info << endl;
 }