[Emacs-diffs] /srv/bzr/emacs/trunk r101077: Ammended for bug fix on the loader nunion.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 101077
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Sat 2010-08-14 10:50:20 +0000
message:
  Ammended for bug fix on the loader nunion.
  From Ted Zlatanov <address@hidden>.
  
  * (gnus-sync-save): Keep unknown groups in `gnus-sync-newsrc-loader'.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-sync.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-08-14 10:45:32 +0000
+++ b/lisp/gnus/ChangeLog       2010-08-14 10:50:20 +0000
@@ -4,7 +4,7 @@
 
 2010-08-13  Teodor Zlatanov  <address@hidden>
 
-       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'.

=== modified file 'lisp/gnus/gnus-sync.el'
--- a/lisp/gnus/gnus-sync.el    2010-08-14 10:45:32 +0000
+++ b/lisp/gnus/gnus-sync.el    2010-08-14 10:50:20 +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"