Jean-Marc Lasgouttes wrote:
As I just wrote, I think this is the simplest solution indeed. The
only thing I do not like is the name :) We should find consistent
names for this and lyxrc.dist that show how these files are used.
Maybe lyxrc.predefaults and lyxrc.postdefaults?
You're right, these names are better. Can I upload the attached patch to
1.4 and 1.5?
Joost
Index: lyx_main.C
===================================================================
--- lyx_main.C (revision 15338)
+++ lyx_main.C (working copy)
@@ -448,7 +448,7 @@
//
// This one may have been distributed along with LyX.
- readRcFile("lyxrc.dist");
+ readRcFile("lyxrc.predefaults");
// Set the PATH correctly.
#if !defined (USE_POSIX_PACKAGING)
@@ -474,6 +474,9 @@
// Query the OS to know what formats are viewed natively
formats.setAutoOpen();
+
+ // This one may have been distributed along with LyX.
+ readRcFile("lyxrc.postdefaults");
system_lyxrc = lyxrc;
system_formats = formats;
