// 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
break;
case RC_OPEN_BUFFERS_IN_TABS:
lexrc >> open_buffers_in_tabs;
+#ifdef USE_MACOSX_PACKAGING
+ if (appleUserTabbingPreferenceAlways())
+ open_buffers_in_tabs = true;
+#endif
break;
case RC_SINGLE_CLOSE_TAB_BUTTON:
lexrc >> single_close_tab_button;
else if (tmp == "margin")
bookmarks_visibility = BMK_MARGIN;
else if (tmp == "inline")
- bookmarks_visibility = BMK_MARGIN;
+ bookmarks_visibility = BMK_INLINE;
else {
bookmarks_visibility = BMK_NONE;
LYXERR0("Unrecognized bookmark visibility " << tmp <<'"');
}
if (tag != RC_LAST)
break;
-
+ // fall through
case RC_MAC_DONTSWAP_CTRL_META:
if (ignore_system_lyxrc ||
mac_dontswap_ctrl_meta