Merge branch 'master' of https://git.gnus.org/gnus

diff --combined lisp/gnus-cloud.el
index 8acea09,ec016ee..a42bcc0
--- 1/lisp/gnus-cloud.el
--- 2/lisp/gnus-cloud.el
+++ b/lisp/gnus-cloud.el
@@@ -30,6 -30,7 +30,7 @@@
  
  (defgroup gnus-cloud nil
    "Syncing Gnus data via IMAP."
+   :version "25.1"
    :group 'gnus)
  
  (defcustom gnus-cloud-synced-files
@@@ -39,6 -40,7 +40,7 @@@
      (:directory "~/News" :match ".*.SCORE\\'"))
    "List of file regexps that should be kept up-to-date via the cloud."
    :group 'gnus-cloud
+   ;; FIXME this type does not match the default.  Nor does the documentation.
    :type '(repeat regexp))
  
  (defvar gnus-cloud-group-name "*Emacs Cloud*")
@@@ -125,7 -127,7 +127,7 @@@
        (let ((spec (ignore-errors (read (current-buffer))))
              length)
          (when (and (consp spec)
-                    (memq (plist-get spec :type) '(:file :data :deleta)))
+                    (memq (plist-get spec :type) '(:file :data :delete)))
            (setq length (plist-get spec :length))
            (push (append spec
                          (list
@@@ -327,15 -329,6 +329,15 @@@
  (defun gnus-cloud-server-p (server)
    (member server gnus-cloud-covered-servers))
  
 +(defun gnus-cloud-collect-full-newsrc ()
 +  (let ((infos nil))
 +    (dolist (info (cdr gnus-newsrc-alist))
 +      (when (gnus-cloud-server-p
 +           (gnus-method-to-server
 +            (gnus-find-method-for-group (gnus-info-group info))))
 +      (push info infos)))
 +    ))
 +
  (provide 'gnus-cloud)
  
  ;;; gnus-cloud.el ends here