bool explicit_userdir = true;
if (user_lyxdir.empty()) {
- // LYX_USERDIR_11x environment variable
+ // LYX_USERDIR_11x environment variable
user_lyxdir = GetEnvPath("LYX_USERDIR_11x");
- // default behaviour
+ // default behaviour
if (user_lyxdir.empty())
user_lyxdir = AddPath(GetEnvPath("HOME"),
string(".") + PACKAGE);
lyxerr[Debug::INIT] << "User LyX directory: '"
<< user_lyxdir << '\'' << endl;
- // Check that user LyX directory is ok.
- queryUserLyXDir(explicit_userdir);
+ // Check that user LyX directory is ok. We don't do that if
+ // running in batch mode.
+ if (gui)
+ queryUserLyXDir(explicit_userdir);
//
// Shine up lyxrc defaults
// Ensure that we have really read a bind file, so that LyX is
// usable.
- if (!lyxrc.hasBindFile)
- lyxrc.ReadBindFile();
+ lyxrc.readBindFileIfNeeded();
// Read menus
ReadUIFile(lyxrc.ui_file);