diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/gnus/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/gnus/gnus-sync.el | 17 |
2 files changed, 11 insertions, 8 deletions
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" |