anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 06:49:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* src/lyx_main.C (readRcFile): do not report an error if file is not

Browse Source 
found. 
	(init): read lyxrc.dist before lyxrc.defaults; remove code to read
	lyxrc (LyX 1.1.5 compatibility code).

	* src/encoding.C (read): 
	* src/language.C (read): set debug to the INFO channel.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13788 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2006-05-02 12:53:48 +00:00
parent f5ca956ab1
commit c1cd75a877
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/encoding.C
View File

@ -336,7 +336,7 @@ void Encodings::read(string const & filename)
string const name = lex.getString();
lex.next();
string const latexname = lex.getString();
lyxerr[Debug::INIT] << "Reading encoding " << name << endl;
lyxerr[Debug::INFO] << "Reading encoding " << name << endl;
Uchar table[256];
for (unsigned int i = 0; i < 256; ++i) {
lex.next();

2
src/language.C
View File

@ -54,7 +54,7 @@ void Languages::read(string const & filename)
lang = lex.getString();
else
break;
lyxerr[Debug::INIT] << "Reading language " << lang << endl;
lyxerr[Debug::INFO] << "Reading language " << lang << endl;
if (lex.next())
babel = lex.getString();

25
src/lyx_main.C
View File

@ -440,19 +440,19 @@ void LyX::init(bool gui)
// Read configuration files
//
// This one may have been distributed along with LyX.
readRcFile("lyxrc.dist");
// This one is generated in user_support directory by lib/configure.py.
readRcFile("lyxrc.defaults");
system_lyxrc = lyxrc;
system_formats = formats;
system_converters = converters;
system_movers = movers;
system_lcolor = lcolor;
string prefsfile = "preferences";
// back compatibility to lyxs < 1.1.6
if (libFileSearch(string(), prefsfile).empty())
prefsfile = "lyxrc";
if (!libFileSearch(string(), prefsfile).empty())
readRcFile(prefsfile);
// This one is edited through the preferences dialog.
readRcFile("preferences");
readEncodingsFile("encodings");
readLanguagesFile("languages");
@ -666,19 +666,18 @@ bool LyX::queryUserLyXDir(bool explicit_userdir)
void LyX::readRcFile(string const & name)
{
lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
lyxerr[Debug::INIT] << "About to read " << name << "... ";
string const lyxrc_path = libFileSearch(string(), name);
if (!lyxrc_path.empty()) {
lyxerr[Debug::INIT] << "Found " << name
<< " in " << lyxrc_path << endl;
lyxerr[Debug::INIT] << "Found in " << lyxrc_path << endl;
if (lyxrc.read(lyxrc_path) >= 0)
return;
}
if (lyxrc.read(lyxrc_path) < 0)
showFileError(name);
} else
lyxerr[Debug::INIT] << "Not found." << lyxrc_path << endl;
showFileError(name);
}