Add LFUN_BRANCH_ACTIVATE and LFUN_BRANCH_DEACTIVATE, fixing bug 4341.

[lyx.git] / src / BufferView.cpp

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 85ac21a8e34dc280191ebd2e1d8190c0f1c905a6..a3f3672e5c0996d77813ec0f23e7223b3999c54b 100644 (file)
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -16,6 +16,7 @@
 
 #include "BufferView.h"
 
+#include "BranchList.h"
 #include "Buffer.h"
 #include "buffer_funcs.h"
 #include "BufferList.h"
@@ -971,6 +972,16 @@ FuncStatus BufferView::getStatus(FuncRequest const & cmd)
                }
                break;
 
+       case LFUN_BRANCH_ACTIVATE: 
+       case LFUN_BRANCH_DEACTIVATE: {
+               bool enable = false;
+               docstring const branchName = cmd.argument();
+               if (!branchName.empty())
+                       enable = buffer_.params().branchlist().find(branchName);
+               flag.enabled(enable);
+               break;
+       }
+
        default:
                flag.enabled(false);
        }
@@ -1383,6 +1394,12 @@ bool BufferView::dispatch(FuncRequest const & cmd)
                break;
        }
 
+       case LFUN_BRANCH_ACTIVATE:
+       case LFUN_BRANCH_DEACTIVATE:
+               buffer_.dispatch(cmd);
+               processUpdateFlags(Update::Force);
+               break;
+
        default:
                return false;
        }