Applied Angus patch to compile on DEC C++ and to avoid name clashes

[lyx.git] / src / lyxrc.h

diff --git a/src/lyxrc.h b/src/lyxrc.h
index 6de67fc60a26173a603452c96488837f225670c9..5b0882b51e18d26016ce673d7c6889bdca03ba6a 100644 (file)
--- a/src/lyxrc.h
+++ b/src/lyxrc.h
@@ -74,11 +74,6 @@ enum LyXRCTags {
        RC_KBMAP,
        RC_KBMAP_PRIMARY,
        RC_KBMAP_SECONDARY,
-#if 0
-       RC_FAX_COMMAND,
-       RC_PHONEBOOK,
-       RC_FAXPROGRAM,
-#endif
        RC_ASCIIROFF_COMMAND,
        RC_ASCII_LINELEN,
        RC_NUMLASTFILES,
@@ -110,6 +105,9 @@ enum LyXRCTags {
        RC_LANGUAGE_AUTO_END,
        RC_LANGUAGE_COMMAND_BEGIN,
        RC_LANGUAGE_COMMAND_END,
+       RC_LANGUAGE_COMMAND_LOCAL,
+       RC_LANGUAGE_GLOBAL_OPTIONS,
+       RC_LANGUAGE_USE_BABEL,
        RC_DATE_INSERT_FORMAT,
        RC_SHOW_BANNER,
        RC_WHEEL_JUMP,
@@ -260,14 +258,6 @@ enum LyXRCTags {
        string font_norm_menu;
        ///
        unsigned int autosave;
-#if 0
-       ///
-       string fax_command;
-       ///
-       string phone_book;
-       ///
-       string fax_program;
-#endif
        ///
        string ascii_roff_command;
        ///
@@ -315,6 +305,12 @@ enum LyXRCTags {
        ///
        string language_command_end;
        ///
+       string language_command_local;
+       ///
+       bool language_global_options; 
+       ///
+       bool language_use_babel;
+       ///
        bool rtl_support;
        ///
        bool auto_number;