]> git.lyx.org Git - lyx.git/blobdiff - src/Compare.cpp
tex2lyx/Preamble.cpp: whitespace fix
[lyx.git] / src / Compare.cpp
index 303a430b30b25f2decab9415ef1bf4f112c91766..c2a01a64df8a189b0e85ed73a7877a6cf1823500 100644 (file)
@@ -12,6 +12,7 @@
 
 #include "Compare.h"
 
+#include "Author.h"
 #include "BufferParams.h"
 #include "Changes.h"
 #include "Font.h"
@@ -375,10 +376,17 @@ void Compare::run()
        if (!dest_buffer || !new_buffer || !old_buffer)
                return;
 
-       // Copy the buffer params to the new buffer
+       // Copy the buffer params to the destination buffer
        dest_buffer->params() = options_.settings_from_new
                ? new_buffer->params() : old_buffer->params();
        
+       // Copy extra authors to the destination buffer
+       AuthorList const & extra_authors = options_.settings_from_new ?
+               old_buffer->params().authors() : new_buffer->params().authors();
+       AuthorList::Authors::const_iterator it = extra_authors.begin();
+       for (; it != extra_authors.end(); ++it)
+               dest_buffer->params().authors().record(*it);
+       
        doStatusMessage();
 
        // do the real work