(nnweb-gmane-create-mapping): Put back code to merge the headers read

from disk with the ones newly found in the current search.  This
should no longer cause problems, because the article numbers in
Gmane's `nov.php' output are ignored since the previous change.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 96a5051..31fff72 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-01  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
+
+       * nnweb.el (nnweb-gmane-create-mapping): Put back code to merge the
+       headers read from disk with the ones newly found in the current search.
+       This should no longer cause problems, because the article numbers in
+       Gmane's `nov.php' output are ignored since the previous change.
+
 2007-01-01  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * lpath.el: Fbind clear-string and cp-supported-codepages; don't fbind

diff --git a/lisp/nnweb.el b/lisp/nnweb.el
index ec450e7..bbade23 100644 (file)
--- a/lisp/nnweb.el
+++ b/lisp/nnweb.el
@@ -502,7 +502,7 @@ Valid types include `google', `dejanews', and `gmane'.")
          (forward-line 1)))
       (nnheader-message 7 "Searching Gmane...done")
       (setq nnweb-articles
-           (sort map 'car-less-than-car)))))
+           (sort (nconc nnweb-articles map) 'car-less-than-car)))))
 
 (defun nnweb-gmane-wash-article ()
   (let ((case-fold-search t))