Context menu item to add unknown branch (rest of #7643)

[lyx.git] / src / Compare.cpp

diff --git a/src/Compare.cpp b/src/Compare.cpp
index 590303e519408a2a9393bad8157d41dba85fc915..cd54e43bb4b938274276bd539b933af031e507c3 100644 (file)
--- a/src/Compare.cpp
+++ b/src/Compare.cpp
@@ -14,6 +14,7 @@
 
 #include "BufferParams.h"
 #include "Changes.h"
+#include "Font.h"
 
 #include "insets/InsetText.h"
 
@@ -271,7 +272,7 @@ private:
        /// around the middle snake.
        void diff_i(DocRangePair const & rp);
 
-       /// Processes the splitted chunks. It either adds them as deleted,
+       /// Processes the split chunks. It either adds them as deleted,
        /// as added, or call diff_i for further processing.
        void diffPart(DocRangePair const & rp);
 
@@ -691,7 +692,9 @@ bool Compare::Impl::diff(Buffer const * new_buf, Buffer const * old_buf,
        processSnake(snake);
        
        // Start the recursive algorithm
-       diff_i(rp);
+       DocRangePair rp_new(from, rp.to());
+       if (!rp_new.o.empty() || !rp_new.n.empty())
+               diff_i(rp_new);
 
        for (pit_type p = 0; p < (pit_type)dest_pars_->size(); ++p) {
                (*dest_pars_)[p].setBuffer(const_cast<Buffer &>(*dest_buf));