Mercurial > emacs

changeset 109778:e253995f955c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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'.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Sat, 14 Aug 2010 10:50:20 +0000
parents 729aca322fce
children d2d95919c4db
files lisp/gnus/ChangeLog lisp/gnus/gnus-sync.el
diffstat 2 files changed, 11 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog	Sat Aug 14 10:45:32 2010 +0000
+++ b/lisp/gnus/ChangeLog	Sat Aug 14 10:50:20 2010 +0000
@@ -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'.
--- a/lisp/gnus/gnus-sync.el	Sat Aug 14 10:45:32 2010 +0000
+++ b/lisp/gnus/gnus-sync.el	Sat Aug 14 10:50:20 2010 +0000
@@ -105,7 +105,7 @@
                                           (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 @@
                                     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"