The branch, 2.0.x, has been updated. - Log -----------------------------------------------------------------
commit a27900e3ffdae707c326a8fd5789e8af0f0c7b0b Author: Scott Kostyshak <[email protected]> Date: Sat Jan 12 16:00:52 2013 -0500 LyXRC: escape existing quote characters in 'cmd' (cherry picked from commit a4a836916b1257b215546b2b7886e009df5876a9) diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp index 2a1e016..c59cb8e 100644 --- a/src/LyXRC.cpp +++ b/src/LyXRC.cpp @@ -2785,7 +2785,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c || sysfmt == sysend // format not found || sysfmt->second.count(cmd) == 0 // this command not found ) - os << "\\viewer_alternatives " << fmt << " \"" << cmd << "\"\n"; + os << "\\viewer_alternatives " << fmt << " \"" << escapeCommand(cmd) << "\"\n"; } } if (tag != RC_LAST) @@ -2810,7 +2810,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c || sysfmt == sysend // format not found || sysfmt->second.count(cmd) == 0 // this command not found ) - os << "\\editor_alternatives " << fmt << " \"" << cmd << "\"\n"; + os << "\\editor_alternatives " << fmt << " \"" << escapeCommand(cmd) << "\"\n"; } } if (tag != RC_LAST) commit 72b86d895cb5b1306e1a9dde9e2bb543adb250f8 Author: Scott Kostyshak <[email protected]> Date: Fri Jan 11 23:51:02 2013 -0500 LyXRC: allow space in {editor,viewer}_alternatives (cherry picked from commit 010f64735f86d018db5295293d174b9584a32566) diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp index 0821876..2a1e016 100644 --- a/src/LyXRC.cpp +++ b/src/LyXRC.cpp @@ -2785,7 +2785,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c || sysfmt == sysend // format not found || sysfmt->second.count(cmd) == 0 // this command not found ) - os << "\\viewer_alternatives " << fmt << " " << cmd << "\n"; + os << "\\viewer_alternatives " << fmt << " \"" << cmd << "\"\n"; } } if (tag != RC_LAST) @@ -2810,7 +2810,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c || sysfmt == sysend // format not found || sysfmt->second.count(cmd) == 0 // this command not found ) - os << "\\editor_alternatives " << fmt << " " << cmd << "\n"; + os << "\\editor_alternatives " << fmt << " \"" << cmd << "\"\n"; } } if (tag != RC_LAST) commit 247b7f3569e67983eabd29d329d5ddd8a2d889ae Author: Scott Kostyshak <[email protected]> Date: Fri Jan 11 04:51:46 2013 -0500 Fix editor and viewer combo boxes in prefs (#8237) (cherry picked from commit 47e98487838b6c99b2631f0b203abf89e2d739bd) diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp index 8c1f75b..0821876 100644 --- a/src/LyXRC.cpp +++ b/src/LyXRC.cpp @@ -1142,19 +1142,15 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format) } case RC_VIEWER_ALTERNATIVES: { string format, command; - if (lexrc.next()) - format = lexrc.getString(); - if (lexrc.eatLine()) - command = lexrc.getString(); + lexrc >> format; + lexrc >> command; viewer_alternatives[format].insert(command); break; } case RC_EDITOR_ALTERNATIVES: { string format, command; - if (lexrc.next()) - format = lexrc.getString(); - if (lexrc.eatLine()) - command = lexrc.getString(); + lexrc >> format; + lexrc >> command; editor_alternatives[format].insert(command); break; } ----------------------------------------------------------------------- Summary of changes: src/LyXRC.cpp | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) hooks/post-receive -- The LyX Source Repository
