From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Sat, 14 Aug 2010 10:50:20 +0000 (+0000)
Subject: Ammended for bug fix on the loader nunion.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~48^2~299
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f5a62bb4a36e413f9f9eb8f30e932b0919eeceaf;p=emacs.git

Ammended for bug fix on the loader nunion.
From Ted Zlatanov <tzz@lifelogs.com>.

* (gnus-sync-save): Keep unknown groups in `gnus-sync-newsrc-loader'.
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 0d3cfd64a60..eef77da20ab 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -4,7 +4,7 @@
 
 2010-08-13  Teodor Zlatanov  <tzz@lifelogs.com>
 
-	Doc fixes and keep unknown groups.
+	Doc fixes and keep unknown groups (ammended for nunion bug fix).
 
 	* gnus-sync.el: Fix docs.
 	(gnus-sync-save): Keep unknown groups in `gnus-sync-newsrc-loader'.
diff --git a/lisp/gnus/gnus-sync.el b/lisp/gnus/gnus-sync.el
index c704ed73ff8..e68b3d82dbd 100644
--- a/lisp/gnus/gnus-sync.el
+++ b/lisp/gnus/gnus-sync.el
@@ -105,7 +105,7 @@ synchronized, I believe).  Also see `gnus-variable-list'."
                                           (cons offset (nth offset entry)))
                                         gnus-sync-newsrc-offsets))))
            (gnus-sync-newsrc-loader
-            (nunion gnus-sync-newsrc-loader
+            (nunion loader
                     (set-difference gnus-sync-newsrc-loader loader :key 'car)
                     :key 'car)))
 
@@ -128,13 +128,16 @@ synchronized, I believe).  Also see `gnus-variable-list'."
                                     gnus-sync-global-vars))
                    variable)
               (while variables
-                (when (and (boundp (setq variable (pop variables)))
+                (if (and (boundp (setq variable (pop variables)))
                            (symbol-value variable))
-                  (princ "\n(setq ")
-                  (princ (symbol-name variable))
-                  (princ " '")
-                  (prin1 (symbol-value variable))
-                  (princ ")\n"))))
+                    (progn
+                      (princ "\n(setq ")
+                      (princ (symbol-name variable))
+                      (princ " '")
+                      (prin1 (symbol-value variable))
+                      (princ ")\n"))
+                  (princ "\n;;; skipping empty variable ")
+                  (princ (symbol-name variable)))))
             (gnus-message
              7
              "gnus-sync: stored variables %s and %d groups in %s"