Dekel's patch -- I didn't fix the xforms-0.88 keysyms stuff so it still doesn't finis...

[lyx.git] / src / lyxrc.C

diff --git a/src/lyxrc.C b/src/lyxrc.C
index 145899be6549f62f6e85d4cb9af911dd44f5d1d2..414080eae20db6afa73dd86252b10e7125515b5b 100644 (file)
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -155,6 +155,7 @@ enum LyXRCTags {
        RC_DOCBOOK_TO_HTML_COMMAND,
        RC_DOCBOOK_TO_PDF_COMMAND,
        RC_WHEEL_JUMP,
+       RC_NEW_ASK_FILENAME,
        RC_LAST
 };
 
@@ -211,6 +212,7 @@ keyword_item lyxrcTags[] = {
         { "\\literate_extension", RC_LITERATE_EXTENSION },
        { "\\make_backup", RC_MAKE_BACKUP },
        { "\\mark_foreign_language", RC_MARK_FOREIGN_LANGUAGE },
+       { "\\new_ask_filename", RC_NEW_ASK_FILENAME },
        { "\\num_lastfiles", RC_NUMLASTFILES },
        { "\\override_x_deadkeys", RC_OVERRIDE_X_DEADKEYS },
        { "\\pdf_mode", RC_PDF_MODE },
@@ -376,6 +378,8 @@ void LyXRC::setDefaults() {
        language_auto_end = true;
        language_command_begin = "\\selectlanguage{$$lang}";
        language_command_end = "\\selectlanguage{$$lang}";
+       ///
+       new_ask_filename = false;
 
        ///
        date_insert_format = "%A, %e %B %Y";
@@ -925,7 +929,7 @@ int LyXRC::read(string const & filename)
                        }
                        
                        if ((action = lyxaction.LookupFunc(cmd.c_str()))>= 0) {
-                               if (lyxerr.debugging(Debug::KEY)) {
+                               if (lyxerr.debugging(Debug::KBMAP)) {
                                        lyxerr << "RC_BIND: Sequence `"
                                               << seq << "' Command `"
                                               << cmd << "' Action `"
@@ -1097,6 +1101,11 @@ int LyXRC::read(string const & filename)
                        if ( lexrc.next())
                                docbook_to_pdf_command = lexrc.GetString();
                        break;
+                       
+               case RC_NEW_ASK_FILENAME:
+                       if ( lexrc.next())
+                               new_ask_filename = lexrc.GetBool();
+                       break;
 
                case RC_LAST: break; // this is just a dummy
                }
@@ -1526,6 +1535,8 @@ void LyXRC::output(ostream & os) const
                os << "\\auto_number " << tostr(auto_number) << "\n";
        case RC_USE_GUI:
                os << "\\use_gui " << tostr(use_gui) << "\n";
+       case RC_NEW_ASK_FILENAME:
+               os << "\\new_ask_filename " << tostr(new_ask_filename) << "\n";
        }
        os.flush();
 }
@@ -1542,3 +1553,6 @@ void LyXRC::set_font_norm_type()
 
 // The global instance
 LyXRC lyxrc;
+
+// The global copy of the system lyxrc entries (everything except preferences)
+//LyXRC system_lyxrc;