[Emacs-diffs] scratch/gnus-cloud 218995d 3/4: Gnus/Emacs Cloud whitespace cleanups

[Teodor Zlatanov]

branch: scratch/gnus-cloud
commit 218995d7a012390678789f0f2a1474ecf9f70594
Author: Ted Zlatanov <address@hidden>
Commit: Ted Zlatanov <address@hidden>

    Gnus/Emacs Cloud whitespace cleanups
---
 lisp/gnus/gnus-cloud.el |  210 +++++++++++++++++++++++------------------------
 1 file changed, 105 insertions(+), 105 deletions(-)

diff --git a/lisp/gnus/gnus-cloud.el b/lisp/gnus/gnus-cloud.el
index f5a8a7b..a4b4922 100644
--- a/lisp/gnus/gnus-cloud.el
+++ b/lisp/gnus/gnus-cloud.el
@@ -70,27 +70,27 @@
     (dolist (elem elems)
       (cond
        ((eq (plist-get elem :type) :file)
-       (let (length data)
-         (mm-with-unibyte-buffer
-           (insert-file-contents-literally (plist-get elem :file-name))
-           (setq length (buffer-size)
-                 data (buffer-string)))
-         (insert (format "(:type :file :file-name %S :timestamp %S :length 
%d)\n"
-                         (plist-get elem :file-name)
-                         (plist-get elem :timestamp)
-                         length))
-         (insert data)
-         (insert "\n")))
+        (let (length data)
+          (mm-with-unibyte-buffer
+            (insert-file-contents-literally (plist-get elem :file-name))
+            (setq length (buffer-size)
+                  data (buffer-string)))
+          (insert (format "(:type :file :file-name %S :timestamp %S :length 
%d)\n"
+                          (plist-get elem :file-name)
+                          (plist-get elem :timestamp)
+                          length))
+          (insert data)
+          (insert "\n")))
        ((eq (plist-get elem :type) :data)
-       (insert (format "(:type :data :name %S :length %d)\n"
-                       (plist-get elem :name)
-                       (with-current-buffer (plist-get elem :buffer)
-                         (buffer-size))))
-       (insert-buffer-substring (plist-get elem :buffer))
-       (insert "\n"))
+        (insert (format "(:type :data :name %S :length %d)\n"
+                        (plist-get elem :name)
+                        (with-current-buffer (plist-get elem :buffer)
+                          (buffer-size))))
+        (insert-buffer-substring (plist-get elem :buffer))
+        (insert "\n"))
        ((eq (plist-get elem :type) :delete)
-       (insert (format "(:type :delete :file-name %S)\n"
-                       (plist-get elem :file-name))))))
+        (insert (format "(:type :delete :file-name %S)\n"
+                        (plist-get elem :file-name))))))
     (gnus-cloud-encode-data)
     (buffer-string)))
 
@@ -127,35 +127,35 @@
       (error "Not a valid Cloud chunk in the current buffer"))
     (forward-line 1)
     (let ((version (string-to-number (match-string 1)))
-         (data (buffer-substring (point) (point-max))))
+          (data (buffer-substring (point) (point-max))))
       (mm-with-unibyte-buffer
-       (insert data)
-       (cond
-        ((= version 1)
-         (gnus-cloud-decode-data)
-         (goto-char (point-min))
-         (gnus-cloud-parse-version-1))
-        (t
-         (error "Unsupported Cloud chunk version %s" version)))))))
+        (insert data)
+        (cond
+         ((= version 1)
+          (gnus-cloud-decode-data)
+          (goto-char (point-min))
+          (gnus-cloud-parse-version-1))
+         (t
+          (error "Unsupported Cloud chunk version %s" version)))))))
 
 (defun gnus-cloud-parse-version-1 ()
   (let ((elems nil))
     (while (not (eobp))
       (while (and (not (eobp))
-                 (not (looking-at "(:type")))
-       (forward-line 1))
+                  (not (looking-at "(:type")))
+        (forward-line 1))
       (unless (eobp)
-       (let ((spec (ignore-errors (read (current-buffer))))
-             length)
-         (when (and (consp spec)
-                    (memq (plist-get spec :type) '(:file :data :delete)))
-           (setq length (plist-get spec :length))
-           (push (append spec
-                         (list
-                          :contents (buffer-substring (1+ (point))
-                                                      (+ (point) 1 length))))
-                 elems)
-           (goto-char (+ (point) 1 length))))))
+        (let ((spec (ignore-errors (read (current-buffer))))
+              length)
+          (when (and (consp spec)
+                     (memq (plist-get spec :type) '(:file :data :delete)))
+            (setq length (plist-get spec :length))
+            (push (append spec
+                          (list
+                           :contents (buffer-substring (1+ (point))
+                                                       (+ (point) 1 length))))
+                  elems)
+            (goto-char (+ (point) 1 length))))))
     (nreverse elems)))
 
 (defun gnus-cloud-update-data (elems)
@@ -163,11 +163,11 @@
     (let ((type (plist-get elem :type)))
       (cond
        ((eq type :data)
-       (gnus-cloud-update-data elem))
+        (gnus-cloud-update-data elem))
        ((memq type '(:delete :file))
-       (gnus-cloud-update-file elem type))
+        (gnus-cloud-update-file elem type))
        (t
-       (gnus-message 1 "Unknown type %s; ignoring" type))))))
+        (gnus-message 1 "Unknown type %s; ignoring" type))))))
 
 (defun gnus-cloud-update-data (elem)
   (gnus-error 1 "TODO"))
@@ -204,14 +204,14 @@
     (dolist (elem gnus-cloud-synced-files)
       (cond
        ((stringp elem)
-       (when (equal elem file-name)
-         (setq matched t)))
+        (when (equal elem file-name)
+          (setq matched t)))
        ((consp elem)
-       (when (and (equal (directory-file-name (plist-get elem :directory))
-                         (directory-file-name (file-name-directory file-name)))
-                  (string-match (plist-get elem :match)
-                                (file-name-nondirectory file-name)))
-         (setq matched t)))))
+        (when (and (equal (directory-file-name (plist-get elem :directory))
+                          (directory-file-name (file-name-directory 
file-name)))
+                   (string-match (plist-get elem :match)
+                                 (file-name-nondirectory file-name)))
+          (setq matched t)))))
     matched))
 
 (defun gnus-cloud-all-files ()
@@ -219,54 +219,54 @@
     (dolist (elem gnus-cloud-synced-files)
       (cond
        ((stringp elem)
-       (push elem files))
+        (push elem files))
        ((consp elem)
-       (dolist (file (directory-files (plist-get elem :directory)
-                                      nil
-                                      (plist-get elem :match)))
-         (push (format "%s/%s"
-                       (directory-file-name (plist-get elem :directory))
-                       file)
-               files)))))
+        (dolist (file (directory-files (plist-get elem :directory)
+                                       nil
+                                       (plist-get elem :match)))
+          (push (format "%s/%s"
+                        (directory-file-name (plist-get elem :directory))
+                        file)
+                files)))))
     (nreverse files)))
 
 (defvar gnus-cloud-file-timestamps nil)
 
 (defun gnus-cloud-files-to-upload (&optional full)
   (let ((files nil)
-       timestamp)
+        timestamp)
     (dolist (file (gnus-cloud-all-files))
       (if (file-exists-p file)
-         (when (setq timestamp (gnus-cloud-file-new-p file full))
-           (push `(:type :file :file-name ,file :timestamp ,timestamp) files))
-       (when (assoc file gnus-cloud-file-timestamps)
-         (push `(:type :delete :file-name ,file) files))))
+          (when (setq timestamp (gnus-cloud-file-new-p file full))
+            (push `(:type :file :file-name ,file :timestamp ,timestamp) files))
+        (when (assoc file gnus-cloud-file-timestamps)
+          (push `(:type :delete :file-name ,file) files))))
     (nreverse files)))
 
 (defun gnus-cloud-file-new-p (file full)
   (let ((timestamp (format-time-string
-                   "%FT%T%z" (nth 5 (file-attributes file))))
-       (old (cadr (assoc file gnus-cloud-file-timestamps))))
+                    "%FT%T%z" (nth 5 (file-attributes file))))
+        (old (cadr (assoc file gnus-cloud-file-timestamps))))
     (when (or full
-             (null old)
-             (string< old timestamp))
+              (null old)
+              (string< old timestamp))
       timestamp)))
 
 (declare-function gnus-activate-group "gnus-start"
-                 (group &optional scan dont-check method dont-sub-check))
+                  (group &optional scan dont-check method dont-sub-check))
 (declare-function gnus-subscribe-group "gnus-start"
-                 (group &optional previous method))
+                  (group &optional previous method))
 
 (defun gnus-cloud-ensure-cloud-group ()
   (let ((method (if (stringp gnus-cloud-method)
-                   (gnus-server-to-method gnus-cloud-method)
-                 gnus-cloud-method)))
+                    (gnus-server-to-method gnus-cloud-method)
+                  gnus-cloud-method)))
     (unless (or (gnus-active gnus-cloud-group-name)
-               (gnus-activate-group gnus-cloud-group-name nil nil
-                                    gnus-cloud-method))
+                (gnus-activate-group gnus-cloud-group-name nil nil
+                                     gnus-cloud-method))
       (and (gnus-request-create-group gnus-cloud-group-name gnus-cloud-method)
-          (gnus-activate-group gnus-cloud-group-name nil nil gnus-cloud-method)
-          (gnus-subscribe-group gnus-cloud-group-name)))))
+           (gnus-activate-group gnus-cloud-group-name nil nil 
gnus-cloud-method)
+           (gnus-subscribe-group gnus-cloud-group-name)))))
 
 (defun gnus-cloud-upload-data (&optional full)
   (gnus-cloud-ensure-cloud-group)
@@ -274,8 +274,8 @@
     (let ((elems (gnus-cloud-files-to-upload full))
           (group (gnus-group-full-name gnus-cloud-group-name 
gnus-cloud-method)))
       (insert (format "Subject: (sequence: %d type: %s)\n"
-                     gnus-cloud-sequence
-                     (if full :full :partial)))
+                      gnus-cloud-sequence
+                      (if full :full :partial)))
       (insert "From: address@hidden")
       (insert (format "X-Gnus-Cloud-Storage-Method: %s\n"
                       gnus-cloud-storage-method))
@@ -292,28 +292,28 @@
 (defun gnus-cloud-add-timestamps (elems)
   (dolist (elem elems)
     (let* ((file-name (plist-get elem :file-name))
-          (old (assoc file-name gnus-cloud-file-timestamps)))
+           (old (assoc file-name gnus-cloud-file-timestamps)))
       (when old
-       (setq gnus-cloud-file-timestamps
-             (delq old gnus-cloud-file-timestamps)))
+        (setq gnus-cloud-file-timestamps
+              (delq old gnus-cloud-file-timestamps)))
       (push (list file-name (plist-get elem :timestamp))
-           gnus-cloud-file-timestamps))))
+            gnus-cloud-file-timestamps))))
 
 (defun gnus-cloud-available-chunks ()
   (gnus-activate-group gnus-cloud-group-name nil nil gnus-cloud-method)
   (let* ((group (gnus-group-full-name gnus-cloud-group-name gnus-cloud-method))
-        (active (gnus-active group))
-        headers head)
+         (active (gnus-active group))
+         headers head)
     (when (gnus-retrieve-headers (gnus-uncompress-range active) group)
       (with-current-buffer nntp-server-buffer
-       (goto-char (point-min))
-       (while (and (not (eobp))
-                   (setq head (nnheader-parse-head)))
-         (push head headers))))
+        (goto-char (point-min))
+        (while (and (not (eobp))
+                    (setq head (nnheader-parse-head)))
+          (push head headers))))
     (sort (nreverse headers)
-         (lambda (h1 h2)
-           (> (gnus-cloud-chunk-sequence (mail-header-subject h1))
-              (gnus-cloud-chunk-sequence (mail-header-subject h2)))))))
+          (lambda (h1 h2)
+            (> (gnus-cloud-chunk-sequence (mail-header-subject h1))
+               (gnus-cloud-chunk-sequence (mail-header-subject h2)))))))
 
 (defun gnus-cloud-chunk-sequence (string)
   (if (string-match "sequence: \\([0-9]+\\)" string)
@@ -323,9 +323,9 @@
 ;; TODO: use this
 (defun gnus-cloud-prune-old-chunks (headers)
   (let ((headers (reverse headers))
-       (found nil))
+        (found nil))
   (while (and headers
-             (not found))
+              (not found))
     (when (string-match "type: :full" (mail-header-subject (car headers)))
       (setq found t))
     (pop headers))
@@ -334,16 +334,16 @@
   (when headers
     (gnus-request-expire-articles
      (mapcar (lambda (h)
-              (mail-header-number h))
-            (nreverse headers))
+               (mail-header-number h))
+             (nreverse headers))
      (gnus-group-full-name gnus-cloud-group-name gnus-cloud-method)))))
 
 (defun gnus-cloud-download-data ()
   (let ((articles nil)
-       chunks)
+        chunks)
     (dolist (header (gnus-cloud-available-chunks))
       (when (> (gnus-cloud-chunk-sequence (mail-header-subject header))
-              gnus-cloud-sequence)
+               gnus-cloud-sequence)
         (let ((header-storage-method (mail-header 
"X-Gnus-Cloud-Storage-Method" header)))
           (if (equal header-storage-method (format "%s" 
gnus-cloud-storage-method))
             (push (mail-header-number header) articles)
@@ -354,11 +354,11 @@
     (when articles
       (nnimap-request-articles (nreverse articles) gnus-cloud-group-name)
       (with-current-buffer nntp-server-buffer
-       (goto-char (point-min))
-       (while (re-search-forward "^Version " nil t)
-         (beginning-of-line)
-         (push (gnus-cloud-parse-chunk) chunks)
-         (forward-line 1))))))
+        (goto-char (point-min))
+        (while (re-search-forward "^Version " nil t)
+          (beginning-of-line)
+          (push (gnus-cloud-parse-chunk) chunks)
+          (forward-line 1))))))
 
 (defun gnus-cloud-server-p (server)
   (member server gnus-cloud-covered-servers))
@@ -370,9 +370,9 @@
   (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)))
+             (gnus-method-to-server
+              (gnus-find-method-for-group (gnus-info-group info))))
+        (push info infos)))
     ))
 
 (provide 'gnus-cloud)