>>>>> "Lars" == Lars Gullik Bj�nnes <[EMAIL PROTECTED]> writes:

| This works. Do you want me to commit that?

Lars> Let's see the patch first...

It is very basic really.

JMarc

Index: po/POTFILES.in
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/po/POTFILES.in,v
retrieving revision 1.364
diff -u -p -r1.364 POTFILES.in
--- po/POTFILES.in	29 Oct 2003 13:24:53 -0000	1.364
+++ po/POTFILES.in	30 Oct 2003 16:06:49 -0000
@@ -194,7 +194,6 @@ src/mathed/ref_inset.C
 src/paragraph.C
 src/paragraph_funcs.C
 src/rowpainter.C
-src/support/path_defines.C
 src/text.C
 src/text2.C
 src/text3.C
Index: src/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ChangeLog,v
retrieving revision 1.1666
diff -u -p -r1.1666 ChangeLog
--- src/ChangeLog	30 Oct 2003 08:47:13 -0000	1.1666
+++ src/ChangeLog	30 Oct 2003 16:06:52 -0000
@@ -1,3 +1,9 @@
+2003-10-30  Jean-Marc Lasgouttes  <[EMAIL PROTECTED]>
+
+	* debug.C: do not make lyxerr point to std::cerr here...
+
+	* main.C (main): but do it there.
+
 2003-10-30  Jos� Matos  <[EMAIL PROTECTED]>
 
 	* buffer.C (makeLinuxDocFile, makeDocBookFile):
Index: src/debug.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/debug.C,v
retrieving revision 1.39
diff -u -p -r1.39 debug.C
--- src/debug.C	6 Oct 2003 15:42:13 -0000	1.39
+++ src/debug.C	30 Oct 2003 16:06:52 -0000
@@ -123,4 +123,4 @@ void lyx_debug_trait::showTags(ostream &
 	os.flush();
 }
 
-LyXErr lyxerr(std::cerr.rdbuf());
+LyXErr lyxerr(0);
Index: src/main.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/main.C,v
retrieving revision 1.27
diff -u -p -r1.27 main.C
--- src/main.C	14 Oct 2003 21:30:20 -0000	1.27
+++ src/main.C	30 Oct 2003 16:06:52 -0000
@@ -13,6 +13,7 @@
 
 #include "lyx_main.h"
 #include "gettext.h"
+#include "debug.h"
 #include "support/os.h"
 
 #ifdef HAVE_IOS
@@ -33,6 +34,9 @@ int main(int argc, char * argv[])
 
 	// initialize for internationalized version *EK*
 	locale_init();
+
+	// Initialize lyxerr here to work around a problem with STLport.
+	lyxerr.rdbuf(std::cerr.rdbuf());
 
 	LyX::exec(argc, argv);
 	return 0;

Reply via email to