From 36aa11863b8087ee09b50eb1d2b8fe7802eb6ede Mon Sep 17 00:00:00 2001 From: Vincent van Ravesteijn Date: Thu, 26 Feb 2009 00:24:12 +0000 Subject: [PATCH] Fix bug 5806: http://bugzilla.lyx.org/show_bug.cgi?id=5806. Branch names with spaces impossible Read the whole line to catch the whole branch name. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28620 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/BufferParams.cpp | 2 +- src/insets/InsetBranch.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp index 280db235fd..f04c964b16 100644 --- a/src/BufferParams.cpp +++ b/src/BufferParams.cpp @@ -566,7 +566,7 @@ string BufferParams::readToken(Lexer & lex, string const & token, } else if (token == "\\output_changes") { lex >> outputChanges; } else if (token == "\\branch") { - lex.next(); + lex.eatLine(); docstring branch = lex.getDocString(); branchlist().add(branch); while (true) { diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp index 80bfbf4131..68dfe19385 100644 --- a/src/insets/InsetBranch.cpp +++ b/src/insets/InsetBranch.cpp @@ -298,7 +298,8 @@ void InsetBranchParams::write(ostream & os) const void InsetBranchParams::read(Lexer & lex) { - lex >> branch; + lex.eatLine(); + branch = lex.getDocString(); } } // namespace lyx -- 2.39.2