The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 6f4b2dd4b073bb3848cdee097a54d264b23d1c51 Author: Juergen Spitzmueller <[email protected]> Date: Sun Sep 30 16:12:52 2012 +0200 Whitespace diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp index 6407fb6..f9d3025 100644 --- a/src/insets/InsetBranch.cpp +++ b/src/insets/InsetBranch.cpp @@ -143,16 +143,16 @@ void InsetBranch::doDispatch(Cursor & cur, FuncRequest & cmd) case LFUN_BRANCH_MASTER_ACTIVATE: case LFUN_BRANCH_MASTER_DEACTIVATE: { bool const master = (cmd.action() == LFUN_BRANCH_MASTER_ACTIVATE - || cmd.action() == LFUN_BRANCH_MASTER_DEACTIVATE); + || cmd.action() == LFUN_BRANCH_MASTER_DEACTIVATE); Buffer * buf = master ? const_cast<Buffer *>(buffer().masterBuffer()) - : &buffer(); + : &buffer(); Branch * our_branch = buf->params().branchlist().find(params_.branch); if (!our_branch) break; bool const activate = (cmd.action() == LFUN_BRANCH_ACTIVATE - || cmd.action() == LFUN_BRANCH_MASTER_ACTIVATE); + || cmd.action() == LFUN_BRANCH_MASTER_ACTIVATE); if (our_branch->isSelected() != activate) { // FIXME If the branch is in the master document, we cannot // call recordUndo..., because the master may be hidden, and ----------------------------------------------------------------------- Summary of changes: src/insets/InsetBranch.cpp | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- The LyX Source Repository
