Refactor InsetQuotes.h enums

[lyx.git] / src / LyXRC.cpp

diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index eb5d0dcf835eedf5fb0f11ce757a38eaa9118636..4fd5a287cafad9445c7f8640cb8217c501b19fc5 100644 (file)
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -28,23 +28,22 @@
 #include "Lexer.h"
 #include "LyX.h"
 #include "Mover.h"
-#include "Session.h"
 #include "SpellChecker.h"
 #include "version.h"
 
-#include "graphics/GraphicsTypes.h"
-
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/environment.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
-#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/os.h"
 #include "support/Package.h"
 #include "support/TempFile.h"
-#include "support/userinfo.h"
+
+#ifdef USE_MACOSX_PACKAGING
+#include "support/AppleSupport.h"
+#endif
 
 #include <fstream>
 #include <iostream>
@@ -61,7 +60,7 @@ namespace {
 
 // The format should also be updated in configure.py, and conversion code
 // should be added to prefs2prefs_prefs.py.
-static unsigned int const LYXRC_FILEFORMAT = 33; // sanda: add \citation_search_view
+static unsigned int const LYXRC_FILEFORMAT = 34; // yuriy: rename kmap files
 // when adding something to this array keep it sorted!
 LexerKeyword lyxrcTags[] = {
        { "\\accept_compound", LyXRC::RC_ACCEPT_COMPOUND },
@@ -286,6 +285,10 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
        // format prior to 2.0 and introduction of format tag
        unsigned int rc_format = 0;
 
+#ifdef USE_MACOSX_PACKAGING
+       open_buffers_in_tabs = appleUserTabbingPreferenceAlways();
+#endif
+
        while (lexrc.isOK()) {
                // By using two switches we take advantage of the compiler
                // telling us if we have missed a LyXRCTags element in