Cleaning up leading and trailing spaces.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9b3fd23..6d946b9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -64,7 +64,7 @@
        * gnus-start.el (gnus-setup-news): Call
        `gnus-check-bogus-newsgroups' just after the native server is
        opened.
        * gnus-start.el (gnus-setup-news): Call
        `gnus-check-bogus-newsgroups' just after the native server is
        opened.

-       
+

 2001-07-23  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * nnmail.el (nnmail-do-request-post): Util function to be used by
 2001-07-23  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * nnmail.el (nnmail-do-request-post): Util function to be used by


@@ -105,7 +105,7 @@
        mm-read-coding-system.
 
        * gnus-art.el (article-de-quoted-unreadable):
        mm-read-coding-system.
 
        * gnus-art.el (article-de-quoted-unreadable):

-       (article-de-base64-unreadable, article-wash-html): 
+       (article-de-base64-unreadable, article-wash-html):

        (gnus-mime-inline-part, gnus-mime-view-part-as-charset): Ditto.
 
 2001-07-21  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
        (gnus-mime-inline-part, gnus-mime-view-part-as-charset): Ditto.
 
 2001-07-21  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>


@@ -137,7 +137,7 @@
        * gnus-sum.el (gnus-summary-display-arrow): New variable.
        (gnus-summary-set-article-display-arrow): New function.
        (gnus-summary-goto-subject): Use it.
        * gnus-sum.el (gnus-summary-display-arrow): New variable.
        (gnus-summary-set-article-display-arrow): New function.
        (gnus-summary-goto-subject): Use it.

-       
+

 2001-07-18 12:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-sum.el (gnus-summary-import-article): Insert date if
 2001-07-18 12:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-sum.el (gnus-summary-import-article): Insert date if


@@ -160,7 +160,7 @@
 
        * dgnushack.el (dgnushack-make-auto-load): Advise `make-autoload'
        to handle `define-derived-mode'.
 
        * dgnushack.el (dgnushack-make-auto-load): Advise `make-autoload'
        to handle `define-derived-mode'.

-       
+

 2001-07-16 12:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
        From:  Stefan Monnier  <monnier@cs.yale.edu>
 
 2001-07-16 12:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
        From:  Stefan Monnier  <monnier@cs.yale.edu>
 


@@ -194,7 +194,7 @@
        (nnrss-read-server-data): Ditto.
 
 2001-07-13 12:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
        (nnrss-read-server-data): Ditto.
 
 2001-07-13 12:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>

-       
+

        * gnus-setup.el (gnus-use-installed-gnus): Typo.
        * Cleanup files.
        From Pavel@Janik.cz (Pavel Jan\e,Bm\e(Bk).
        * gnus-setup.el (gnus-use-installed-gnus): Typo.
        * Cleanup files.
        From Pavel@Janik.cz (Pavel Jan\e,Bm\e(Bk).


@@ -208,7 +208,7 @@
 
 2001-07-13 07:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
 
 2001-07-13 07:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 

-       * gnus-art.el (gnus-boring-article-headers): Better doc. 
+       * gnus-art.el (gnus-boring-article-headers): Better doc.

        (article-hide-headers): Better regexp.
        Suggested by Matt Swift <swift@alum.mit.edu>.
 
        (article-hide-headers): Better regexp.
        Suggested by Matt Swift <swift@alum.mit.edu>.
 


@@ -243,7 +243,7 @@
 
        * gnus-srvr.el (gnus-browse-make-menu-bar): Changed one of the
        Browse->Next entries to Browse->Prev
 
        * gnus-srvr.el (gnus-browse-make-menu-bar): Changed one of the
        Browse->Next entries to Browse->Prev

-       
+

 2001-07-11 22:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-msg.el (gnus-inews-do-gcc): Don't test gnus-alive-p.
 2001-07-11 22:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-msg.el (gnus-inews-do-gcc): Don't test gnus-alive-p.


@@ -284,20 +284,20 @@
 
        * gnus-kill.el (gnus-execute): Work with the extra headers.
        * gnus-sum.el (gnus-summary-execute-command): Ditto.
 
        * gnus-kill.el (gnus-execute): Work with the extra headers.
        * gnus-sum.el (gnus-summary-execute-command): Ditto.

-       
+

 2001-07-09 17:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * mm-view.el (mm-inline-text): w3-coding-system-for-mime-charset
        may not defined. From: Raja R Harinath <harinath@cs.umn.edu>.
 
        * message.el (message-send-mail-real-function): New variable.
 2001-07-09 17:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * mm-view.el (mm-inline-text): w3-coding-system-for-mime-charset
        may not defined. From: Raja R Harinath <harinath@cs.umn.edu>.
 
        * message.el (message-send-mail-real-function): New variable.

-       (message-send-mail-partially, message-send-mail): 
+       (message-send-mail-partially, message-send-mail):

 
        * nngateway.el (nngateway-request-post): Use it.
 
 
        * nngateway.el (nngateway-request-post): Use it.
 

-       * gnus-agent.el (gnus-agentize): Use it. 
+       * gnus-agent.el (gnus-agentize): Use it.

 
 

-       * nnsoup.el (nnsoup-old-functions, nnsoup-set-variables) 
+       * nnsoup.el (nnsoup-old-functions, nnsoup-set-variables)

        (nnsoup-revert-variables): Use it.
 
 2001-07-09  Colin Walters  <walters@cis.ohio-state.edu>
        (nnsoup-revert-variables): Use it.
 
 2001-07-09  Colin Walters  <walters@cis.ohio-state.edu>


@@ -311,7 +311,7 @@
        (mm-display-part): Call `mm-inlinable-p'.
        (mm-attachment-override-p): Ditto.
        (mm-inlined-p): Doc fix.
        (mm-display-part): Call `mm-inlinable-p'.
        (mm-attachment-override-p): Ditto.
        (mm-inlined-p): Doc fix.

-       
+

        * gnus-art.el (gnus-mime-display-single): Call `mm-inlinable-p' as
        well as `mm-inlined-p'.
 
        * gnus-art.el (gnus-mime-display-single): Call `mm-inlinable-p' as
        well as `mm-inlined-p'.
 


@@ -321,7 +321,7 @@
        (nntp-send-command-and-decode): Use gnus-point-at-bol.
 
 2001-07-09 13:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
        (nntp-send-command-and-decode): Use gnus-point-at-bol.
 
 2001-07-09 13:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>

-       From  Paul Jarc <prj@po.cwru.edu> 
+       From  Paul Jarc <prj@po.cwru.edu>

 
        * message.el (message-use-mail-followup-to): New variable.
        (message-get-reply-headers): Use it.
 
        * message.el (message-use-mail-followup-to): New variable.
        (message-get-reply-headers): Use it.


@@ -330,7 +330,7 @@
 
        * nnheader.el (nnheader-init-server-buffer): Make sure the
        *nntpd* buffer is made multibyte instead of a random buffer.
 
        * nnheader.el (nnheader-init-server-buffer): Make sure the
        *nntpd* buffer is made multibyte instead of a random buffer.

-       
+

 2001-07-09 12:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-sum.el (gnus-get-newsgroup-headers-xover): Get headers only
 2001-07-09 12:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-sum.el (gnus-get-newsgroup-headers-xover): Get headers only


@@ -1139,7 +1139,7 @@
 
 2001-03-10  Matthias Wiehl <mwiehl@gmx.de>
 
 
 2001-03-10  Matthias Wiehl <mwiehl@gmx.de>
 

-        * gnus.el (gnus-summary-line-format): Typo.
+       * gnus.el (gnus-summary-line-format): Typo.

 
 2001-03-11  Simon Josefsson  <simon@josefsson.org>
 
 
 2001-03-11  Simon Josefsson  <simon@josefsson.org>
 


@@ -1423,7 +1423,7 @@
        (nnml-request-regenerate): Use it. Change to deffoo.
 
 2001-02-14  Katsumi Yamaoka <yamaoka@jpl.org>
        (nnml-request-regenerate): Use it. Change to deffoo.
 
 2001-02-14  Katsumi Yamaoka <yamaoka@jpl.org>

-        Committed by ShengHuo ZHU  <zsh@cs.rochester.edu>
+       Committed by ShengHuo ZHU  <zsh@cs.rochester.edu>

 
        * gnus.el (gnus-define-group-parameter): Fix.
 
 
        * gnus.el (gnus-define-group-parameter): Fix.
 


@@ -1824,7 +1824,7 @@
 
 2001-01-19  Simon Josefsson  <sj@extundo.com>
 
 
 2001-01-19  Simon Josefsson  <sj@extundo.com>
 

-        * gnus-art.el (gnus-button-alist): Add `?=' to mailto URL regexp.
+       * gnus-art.el (gnus-button-alist): Add `?=' to mailto URL regexp.

 
 2001-01-19 13:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
 
 2001-01-19 13:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index 9f4eca2..0b9e28a 100644 (file)
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -294,7 +294,7 @@ Modify to suit your needs."))
   (let ((generated-autoload-file dgnushack-gnus-load-file)
        (make-backup-files nil)
        (autoload-package-name "gnus"))
   (let ((generated-autoload-file dgnushack-gnus-load-file)
        (make-backup-files nil)
        (autoload-package-name "gnus"))

-    (if (featurep 'xemacs) 
+    (if (featurep 'xemacs)

        (if (file-exists-p generated-autoload-file)
            (delete-file generated-autoload-file))
       (with-temp-file generated-autoload-file
        (if (file-exists-p generated-autoload-file)
            (delete-file generated-autoload-file))
       (with-temp-file generated-autoload-file

diff --git a/lisp/dig.el b/lisp/dig.el
index 18019e9..de6a769 100644 (file)
--- a/lisp/dig.el
+++ b/lisp/dig.el
@@ -58,9 +58,9 @@ If nil, use system defaults."
   "Default expressions to highlight in dig mode."
   :type 'sexp
   :group 'dig)
   "Default expressions to highlight in dig mode."
   :type 'sexp
   :group 'dig)

- 
+

 (defun dig-invoke (domain &optional
 (defun dig-invoke (domain &optional

-                         query-type query-class query-option 
+                         query-type query-class query-option

                          dig-option server)
   "Call dig with given arguments and return buffer containing output.
 DOMAIN is a string with a DNS domain. QUERY-TYPE is an optional string
                          dig-option server)
   "Call dig with given arguments and return buffer containing output.
 DOMAIN is a string with a DNS domain. QUERY-TYPE is an optional string


@@ -89,7 +89,7 @@ Buffer should contain output generated by `dig-invoke'."
   (save-excursion
     (goto-char (point-min))
     (if (re-search-forward
   (save-excursion
     (goto-char (point-min))
     (if (re-search-forward

-        (concat domain "\\.?[\t ]+[0-9wWdDhHmMsS]+[\t ]+" 
+        (concat domain "\\.?[\t ]+[0-9wWdDhHmMsS]+[\t ]+"

                 (upcase (or class "IN")) "[\t ]+" (upcase (or type "A")))
         nil t)
        (let (b e)
                 (upcase (or class "IN")) "[\t ]+" (upcase (or type "A")))
         nil t)
        (let (b e)


@@ -144,7 +144,7 @@ Buffer should contain output generated by `dig-invoke'."
         '(dig-font-lock-keywords t)))
   (when (featurep 'font-lock)
     (font-lock-set-defaults)))
         '(dig-font-lock-keywords t)))
   (when (featurep 'font-lock)
     (font-lock-set-defaults)))

-  
+

 (defun dig-exit ()
   "Quit dig output buffer."
   (interactive)
 (defun dig-exit ()
   "Quit dig output buffer."
   (interactive)


@@ -155,7 +155,7 @@ Buffer should contain output generated by `dig-invoke'."
   "Query addresses of a DOMAIN using dig, by calling `dig-invoke'.
 Optional arguments are passed to `dig-invoke'."
   (interactive "sHost: ")
   "Query addresses of a DOMAIN using dig, by calling `dig-invoke'.
 Optional arguments are passed to `dig-invoke'."
   (interactive "sHost: ")

-  (switch-to-buffer 
+  (switch-to-buffer

    (dig-invoke domain query-type query-class query-option dig-option server))
   (goto-char (point-min))
   (and (search-forward ";; ANSWER SECTION:" nil t)
    (dig-invoke domain query-type query-class query-option dig-option server))
   (goto-char (point-min))
   (and (search-forward ";; ANSWER SECTION:" nil t)

diff --git a/lisp/earcon.el b/lisp/earcon.el
index 7c42e8b..19d3fa5 100644 (file)
--- a/lisp/earcon.el
+++ b/lisp/earcon.el
@@ -83,7 +83,7 @@ call it with the value of the `earcon-data' text property."
   (interactive "e")
   (set-buffer (window-buffer (posn-window (event-start event))))
   (let* ((pos (posn-point (event-start event)))
   (interactive "e")
   (set-buffer (window-buffer (posn-window (event-start event))))
   (let* ((pos (posn-point (event-start event)))

-         (data (get-text-property pos 'earcon-data))
+        (data (get-text-property pos 'earcon-data))

         (fun (get-text-property pos 'earcon-callback)))
     (if fun (funcall fun data))))
 
         (fun (get-text-property pos 'earcon-callback)))
     (if fun (funcall fun data))))
 

diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el
index f2ed2bb..3fb889e 100644 (file)
--- a/lisp/gnus-agent.el
+++ b/lisp/gnus-agent.el
@@ -360,9 +360,9 @@ minor mode in all Gnus buffers."
   (gnus-open-agent)
   (add-hook 'gnus-setup-news-hook 'gnus-agent-queue-setup)
   (unless gnus-agent-send-mail-function
   (gnus-open-agent)
   (add-hook 'gnus-setup-news-hook 'gnus-agent-queue-setup)
   (unless gnus-agent-send-mail-function

-    (setq gnus-agent-send-mail-function (or 
-                                         message-send-mail-real-function
-                                         message-send-mail-function)
+    (setq gnus-agent-send-mail-function (or
+                                        message-send-mail-real-function
+                                        message-send-mail-function)

          message-send-mail-real-function 'gnus-agent-send-mail))
   (unless gnus-agent-covered-methods
     (setq gnus-agent-covered-methods (list gnus-select-method))))
          message-send-mail-real-function 'gnus-agent-send-mail))
   (unless gnus-agent-covered-methods
     (setq gnus-agent-covered-methods (list gnus-select-method))))


@@ -1051,7 +1051,7 @@ the actual number of articles toggled is returned."
 (defun gnus-agent-save-alist (group &optional articles state dir)
   "Save the article-state alist for GROUP."
   (let ((file-name-coding-system nnmail-pathname-coding-system)
 (defun gnus-agent-save-alist (group &optional articles state dir)
   "Save the article-state alist for GROUP."
   (let ((file-name-coding-system nnmail-pathname-coding-system)

-        print-level print-length)
+       print-level print-length)

       (with-temp-file (if dir
                          (expand-file-name ".agentview" dir)
                        (gnus-agent-article-name ".agentview" group))
       (with-temp-file (if dir
                          (expand-file-name ".agentview" dir)
                        (gnus-agent-article-name ".agentview" group))

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index f28236c..47ab0ba 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -1963,11 +1963,11 @@ always hide."
             (start (point))
             (end (point-max))
             (orig (buffer-substring start end))
             (start (point))
             (end (point-max))
             (orig (buffer-substring start end))

-             (trans (babel-as-string orig)))
+            (trans (babel-as-string orig)))

        (save-restriction
          (narrow-to-region start end)
          (delete-region start end)
        (save-restriction
          (narrow-to-region start end)
          (delete-region start end)

-          (insert trans))))))
+         (insert trans))))))

 
 (defun article-hide-signature (&optional arg)
   "Hide the signature in the current article.
 
 (defun article-hide-signature (&optional arg)
   "Hide the signature in the current article.


@@ -2194,7 +2194,7 @@ should replace the \"Date:\" one, or should be added below it."
                     (message-fetch-field "date")
                     ""))
         (tdate-regexp "^Date:[ \t]\\|^X-Sent:[ \t]")
                     (message-fetch-field "date")
                     ""))
         (tdate-regexp "^Date:[ \t]\\|^X-Sent:[ \t]")

-        (date-regexp
+        (date-regexp

          (cond
           ((not gnus-article-date-lapsed-new-header)
            tdate-regexp)
          (cond
           ((not gnus-article-date-lapsed-new-header)
            tdate-regexp)


@@ -2220,8 +2220,8 @@ should replace the \"Date:\" one, or should be added below it."
        (when (and date (not (string= date "")))
          (goto-char (point-min))
          (let ((buffer-read-only nil))
        (when (and date (not (string= date "")))
          (goto-char (point-min))
          (let ((buffer-read-only nil))

-           ;; Delete any old Date headers.
-           (while (re-search-forward date-regexp nil t)
+           ;; Delete any old Date headers.
+           (while (re-search-forward date-regexp nil t)

              (if pos
                  (delete-region (progn (beginning-of-line) (point))
                                 (progn (forward-line 1) (point)))
              (if pos
                  (delete-region (progn (beginning-of-line) (point))
                                 (progn (forward-line 1) (point)))


@@ -2252,7 +2252,7 @@ should replace the \"Date:\" one, or should be added below it."
   (condition-case ()
       (let ((time (date-to-time date)))
        (cond
   (condition-case ()
       (let ((time (date-to-time date)))
        (cond

-        ;; Convert to the local timezone.  
+        ;; Convert to the local timezone.

         ((eq type 'local)
          (let ((tz (car (current-time-zone time))))
            (format "Date: %s %s%02d%02d" (current-time-string time)
         ((eq type 'local)
          (let ((tz (car (current-time-zone time))))
            (format "Date: %s %s%02d%02d" (current-time-string time)


@@ -2465,15 +2465,15 @@ This format is defined by the `gnus-article-time-format' variable."
                visible (nth 2 elem)
                face (nth 3 elem))
          (while (re-search-forward regexp nil t)
                visible (nth 2 elem)
                face (nth 3 elem))
          (while (re-search-forward regexp nil t)

-           (when (and (match-beginning visible) (match-beginning invisible))
+           (when (and (match-beginning visible) (match-beginning invisible))

              (push 'emphasis gnus-article-wash-types)
              (push 'emphasis gnus-article-wash-types)

-             (gnus-article-hide-text
-              (match-beginning invisible) (match-end invisible) props)
-             (gnus-article-unhide-text-type
-              (match-beginning visible) (match-end visible) 'emphasis)
-             (gnus-put-text-property-excluding-newlines
-              (match-beginning visible) (match-end visible) 'face face)
-             (goto-char (match-end invisible)))))))))
+             (gnus-article-hide-text
+              (match-beginning invisible) (match-end invisible) props)
+             (gnus-article-unhide-text-type
+              (match-beginning visible) (match-end visible) 'emphasis)
+             (gnus-put-text-property-excluding-newlines
+              (match-beginning visible) (match-end visible) 'face face)
+             (goto-char (match-end invisible)))))))))

 
 (defun gnus-article-setup-highlight-words (&optional highlight-words)
   "Setup newsgroup emphasis alist."
 
 (defun gnus-article-setup-highlight-words (&optional highlight-words)
   "Setup newsgroup emphasis alist."


@@ -2992,7 +2992,7 @@ If variable `gnus-use-long-file-name' is non-nil, it is
     ;; Note "Commands" menu is defined in gnus-sum.el for consistency
 
     ;; Note "Post" menu is defined in gnus-sum.el for consistency
     ;; Note "Commands" menu is defined in gnus-sum.el for consistency
 
     ;; Note "Post" menu is defined in gnus-sum.el for consistency

-    
+

     (gnus-run-hooks 'gnus-article-menu-hook)))
 
 ;; Fixme: do something for the Emacs tool bar in Article mode a la
     (gnus-run-hooks 'gnus-article-menu-hook)))
 
 ;; Fixme: do something for the Emacs tool bar in Article mode a la


@@ -3354,8 +3354,8 @@ If ALL-HEADERS is non-nil, no headers are hidden."
             (let ((mbl1 mml-buffer-list))
               (setq mml-buffer-list mbl)
               (set (make-local-variable 'mml-buffer-list) mbl1))
             (let ((mbl1 mml-buffer-list))
               (setq mml-buffer-list mbl)
               (set (make-local-variable 'mml-buffer-list) mbl1))

-             ;; LOCAL argument of add-hook differs between GNU Emacs
-             ;; and XEmacs. make-local-hook makes sure they are local.
+            ;; LOCAL argument of add-hook differs between GNU Emacs
+            ;; and XEmacs. make-local-hook makes sure they are local.

             (make-local-hook 'kill-buffer-hook)
             (add-hook 'kill-buffer-hook 'mml-destroy-buffers t t)))
        `(lambda (no-highlight)
             (make-local-hook 'kill-buffer-hook)
             (add-hook 'kill-buffer-hook 'mml-destroy-buffers t t)))
        `(lambda (no-highlight)


@@ -3676,8 +3676,8 @@ If no internal viewer is available, use an external viewer."
                       nil id
                       (gnus-article-mime-total-parts)
                       (mm-handle-media-type handle)))))
                       nil id
                       (gnus-article-mime-total-parts)
                       (mm-handle-media-type handle)))))

-              (if (window-live-p window)
-                  (select-window window)))))
+             (if (window-live-p window)
+                 (select-window window)))))

       (goto-char point)
       (delete-region (gnus-point-at-bol) (progn (forward-line 1) (point)))
       (gnus-insert-mime-button
       (goto-char point)
       (delete-region (gnus-point-at-bol) (progn (forward-line 1) (point)))
       (gnus-insert-mime-button


@@ -4245,61 +4245,61 @@ Argument LINES specifies lines to be scrolled down."
   (interactive "P")
   (gnus-article-check-buffer)
   (let ((nosaves
   (interactive "P")
   (gnus-article-check-buffer)
   (let ((nosaves

-         '("q" "Q"  "c" "r" "R" "\C-c\C-f" "m"  "a" "f" "F"
-           "Zc" "ZC" "ZE" "ZQ" "ZZ" "Zn" "ZR" "ZG" "ZN" "ZP"
-           "=" "^" "\M-^" "|"))
-        (nosave-but-article
-         '("A\r"))
-        (nosave-in-article
-         '("\C-d"))
-        (up-to-top
-         '("n" "Gn" "p" "Gp"))
-        keys new-sum-point)
+        '("q" "Q"  "c" "r" "R" "\C-c\C-f" "m"  "a" "f" "F"
+          "Zc" "ZC" "ZE" "ZQ" "ZZ" "Zn" "ZR" "ZG" "ZN" "ZP"
+          "=" "^" "\M-^" "|"))
+       (nosave-but-article
+        '("A\r"))
+       (nosave-in-article
+        '("\C-d"))
+       (up-to-top
+        '("n" "Gn" "p" "Gp"))
+       keys new-sum-point)

     (save-excursion
       (set-buffer gnus-article-current-summary)
       (let (gnus-pick-mode)
     (save-excursion
       (set-buffer gnus-article-current-summary)
       (let (gnus-pick-mode)

-        (push (or key last-command-event) unread-command-events)
-        (setq keys (if (featurep 'xemacs)
+       (push (or key last-command-event) unread-command-events)
+       (setq keys (if (featurep 'xemacs)

                       (events-to-keys (read-key-sequence nil))
                     (read-key-sequence nil)))))
 
     (message "")
 
     (if (or (member keys nosaves)
                       (events-to-keys (read-key-sequence nil))
                     (read-key-sequence nil)))))
 
     (message "")
 
     (if (or (member keys nosaves)

-            (member keys nosave-but-article)
-            (member keys nosave-in-article))
-        (let (func)
-          (save-window-excursion
-            (pop-to-buffer gnus-article-current-summary 'norecord)
-            ;; We disable the pick minor mode commands.
-            (let (gnus-pick-mode)
-              (setq func (lookup-key (current-local-map) keys))))
-          (if (or (not func)
+           (member keys nosave-but-article)
+           (member keys nosave-in-article))
+       (let (func)
+         (save-window-excursion
+           (pop-to-buffer gnus-article-current-summary 'norecord)
+           ;; We disable the pick minor mode commands.
+           (let (gnus-pick-mode)
+             (setq func (lookup-key (current-local-map) keys))))
+         (if (or (not func)

                  (numberp func))
                  (numberp func))

-              (ding)
-            (unless (member keys nosave-in-article)
-              (set-buffer gnus-article-current-summary))
-            (call-interactively func)
-            (setq new-sum-point (point)))
-          (when (member keys nosave-but-article)
-            (pop-to-buffer gnus-article-buffer 'norecord)))
+             (ding)
+           (unless (member keys nosave-in-article)
+             (set-buffer gnus-article-current-summary))
+           (call-interactively func)
+           (setq new-sum-point (point)))
+         (when (member keys nosave-but-article)
+           (pop-to-buffer gnus-article-buffer 'norecord)))

       ;; These commands should restore window configuration.
       (let ((obuf (current-buffer))
       ;; These commands should restore window configuration.
       (let ((obuf (current-buffer))

-            (owin (current-window-configuration))
-            (opoint (point))
-            (summary gnus-article-current-summary)
-            func in-buffer selected)
-        (if not-restore-window
-            (pop-to-buffer summary 'norecord)
-          (switch-to-buffer summary 'norecord))
-        (setq in-buffer (current-buffer))
-        ;; We disable the pick minor mode commands.
-        (if (and (setq func (let (gnus-pick-mode)
+           (owin (current-window-configuration))
+           (opoint (point))
+           (summary gnus-article-current-summary)
+           func in-buffer selected)
+       (if not-restore-window
+           (pop-to-buffer summary 'norecord)
+         (switch-to-buffer summary 'norecord))
+       (setq in-buffer (current-buffer))
+       ;; We disable the pick minor mode commands.
+       (if (and (setq func (let (gnus-pick-mode)

                              (lookup-key (current-local-map) keys)))
                 (functionp func))
                              (lookup-key (current-local-map) keys)))
                 (functionp func))

-            (progn
-              (call-interactively func)
-              (setq new-sum-point (point))
+           (progn
+             (call-interactively func)
+             (setq new-sum-point (point))

              (when (eq in-buffer (current-buffer))
                (setq selected (gnus-summary-select-article))
                (set-buffer obuf)
              (when (eq in-buffer (current-buffer))
                (setq selected (gnus-summary-select-article))
                (set-buffer obuf)


@@ -4315,7 +4315,7 @@ Argument LINES specifies lines to be scrolled down."
                  (when win
                    (set-window-point win new-sum-point))))    )
          (switch-to-buffer gnus-article-buffer)
                  (when win
                    (set-window-point win new-sum-point))))    )
          (switch-to-buffer gnus-article-buffer)

-          (ding))))))
+         (ding))))))

 
 (defun gnus-article-describe-key (key)
   "Display documentation of the function invoked by KEY.  KEY is a string."
 
 (defun gnus-article-describe-key (key)
   "Display documentation of the function invoked by KEY.  KEY is a string."


@@ -4328,10 +4328,10 @@ Argument LINES specifies lines to be scrolled down."
          (if (featurep 'xemacs)
              (progn
                (push (elt key 0) unread-command-events)
          (if (featurep 'xemacs)
              (progn
                (push (elt key 0) unread-command-events)

-               (setq key (events-to-keys 
+               (setq key (events-to-keys

                           (read-key-sequence "Describe key: "))))
                           (read-key-sequence "Describe key: "))))

-           (setq unread-command-events 
-                 (mapcar 
+           (setq unread-command-events
+                 (mapcar

                   (lambda (x) (if (>= x 128) (list 'meta (- x 128)) x))
                   (string-to-list key)))
            (setq key (read-key-sequence "Describe key: "))))
                   (lambda (x) (if (>= x 128) (list 'meta (- x 128)) x))
                   (string-to-list key)))
            (setq key (read-key-sequence "Describe key: "))))


@@ -4349,10 +4349,10 @@ Argument LINES specifies lines to be scrolled down."
          (if (featurep 'xemacs)
              (progn
                (push (elt key 0) unread-command-events)
          (if (featurep 'xemacs)
              (progn
                (push (elt key 0) unread-command-events)

-               (setq key (events-to-keys 
+               (setq key (events-to-keys

                           (read-key-sequence "Describe key: "))))
                           (read-key-sequence "Describe key: "))))

-           (setq unread-command-events 
-                 (mapcar 
+           (setq unread-command-events
+                 (mapcar

                   (lambda (x) (if (>= x 128) (list 'meta (- x 128)) x))
                   (string-to-list key)))
            (setq key (read-key-sequence "Describe key: "))))
                   (lambda (x) (if (>= x 128) (list 'meta (- x 128)) x))
                   (string-to-list key)))
            (setq key (read-key-sequence "Describe key: "))))


@@ -4788,7 +4788,7 @@ call it with the value of the `gnus-data' text property."
   (interactive "e")
   (set-buffer (window-buffer (posn-window (event-start event))))
   (let* ((pos (posn-point (event-start event)))
   (interactive "e")
   (set-buffer (window-buffer (posn-window (event-start event))))
   (let* ((pos (posn-point (event-start event)))

-         (data (get-text-property pos 'gnus-data))
+        (data (get-text-property pos 'gnus-data))

         (fun (get-text-property pos 'gnus-callback)))
     (goto-char pos)
     (when fun
         (fun (get-text-property pos 'gnus-callback)))
     (goto-char pos)
     (when fun


@@ -5058,7 +5058,7 @@ specified by `gnus-button-alist'."
       (when (looking-at "//\\([^/]+\\)/")
        (setq server (match-string 1))
        (goto-char (match-end 0)))
       (when (looking-at "//\\([^/]+\\)/")
        (setq server (match-string 1))
        (goto-char (match-end 0)))

-       
+

       (cond
        ((looking-at "\\(.*@.*\\)")
        (setq message-id (match-string 1)))
       (cond
        ((looking-at "\\(.*@.*\\)")
        (setq message-id (match-string 1)))


@@ -5113,24 +5113,24 @@ specified by `gnus-button-alist'."
     (setq pairs (split-string query "&"))
     (while pairs
       (setq cur (car pairs)
     (setq pairs (split-string query "&"))
     (while pairs
       (setq cur (car pairs)

-            pairs (cdr pairs))
+           pairs (cdr pairs))

       (if (not (string-match "=" cur))
       (if (not (string-match "=" cur))

-          nil                           ; Grace
-        (setq key (gnus-url-unhex-string (substring cur 0 (match-beginning 0)))
-              val (gnus-url-unhex-string (substring cur (match-end 0) nil)))
-        (if downcase
-            (setq key (downcase key)))
-        (setq cur (assoc key retval))
-        (if cur
-            (setcdr cur (cons val (cdr cur)))
-          (setq retval (cons (list key val) retval)))))
+         nil                           ; Grace
+       (setq key (gnus-url-unhex-string (substring cur 0 (match-beginning 0)))
+             val (gnus-url-unhex-string (substring cur (match-end 0) nil)))
+       (if downcase
+           (setq key (downcase key)))
+       (setq cur (assoc key retval))
+       (if cur
+           (setcdr cur (cons val (cdr cur)))
+         (setq retval (cons (list key val) retval)))))

     retval))
 
 (defun gnus-url-unhex (x)
   (if (> x ?9)
       (if (>= x ?a)
     retval))
 
 (defun gnus-url-unhex (x)
   (if (> x ?9)
       (if (>= x ?a)

-          (+ 10 (- x ?a))
-        (+ 10 (- x ?A)))
+         (+ 10 (- x ?a))
+       (+ 10 (- x ?A)))

     (- x ?0)))
 
 (defun gnus-url-unhex-string (str &optional allow-newlines)
     (- x ?0)))
 
 (defun gnus-url-unhex-string (str &optional allow-newlines)


@@ -5140,21 +5140,21 @@ decoding of carriage returns and line feeds in the string, which is normally
 forbidden in URL encoding."
   (setq str (or str ""))
   (let ((tmp "")
 forbidden in URL encoding."
   (setq str (or str ""))
   (let ((tmp "")

-        (case-fold-search t))
+       (case-fold-search t))

     (while (string-match "%[0-9a-f][0-9a-f]" str)
       (let* ((start (match-beginning 0))
     (while (string-match "%[0-9a-f][0-9a-f]" str)
       (let* ((start (match-beginning 0))

-             (ch1 (gnus-url-unhex (elt str (+ start 1))))
-             (code (+ (* 16 ch1)
-                      (gnus-url-unhex (elt str (+ start 2))))))
-        (setq tmp (concat
-                   tmp (substring str 0 start)
-                   (cond
-                    (allow-newlines
-                     (char-to-string code))
-                    ((or (= code ?\n) (= code ?\r))
-                     " ")
-                    (t (char-to-string code))))
-              str (substring str (match-end 0)))))
+            (ch1 (gnus-url-unhex (elt str (+ start 1))))
+            (code (+ (* 16 ch1)
+                     (gnus-url-unhex (elt str (+ start 2))))))
+       (setq tmp (concat
+                  tmp (substring str 0 start)
+                  (cond
+                   (allow-newlines
+                    (char-to-string code))
+                   ((or (= code ?\n) (= code ?\r))
+                    " ")
+                   (t (char-to-string code))))
+             str (substring str (match-end 0)))))

     (setq tmp (concat tmp str))
     tmp))
 
     (setq tmp (concat tmp str))
     tmp))
 


@@ -5164,22 +5164,22 @@ forbidden in URL encoding."
     (setq url (substring url (match-beginning 1) nil)))
   (let (to args subject func)
     (if (string-match (regexp-quote "?") url)
     (setq url (substring url (match-beginning 1) nil)))
   (let (to args subject func)
     (if (string-match (regexp-quote "?") url)

-        (setq to (gnus-url-unhex-string (substring url 0 (match-beginning 0)))
-              args (gnus-url-parse-query-string
-                    (substring url (match-end 0) nil) t))
+       (setq to (gnus-url-unhex-string (substring url 0 (match-beginning 0)))
+             args (gnus-url-parse-query-string
+                   (substring url (match-end 0) nil) t))

       (setq to (gnus-url-unhex-string url)))
     (setq args (cons (list "to" to) args)
       (setq to (gnus-url-unhex-string url)))
     (setq args (cons (list "to" to) args)

-          subject (cdr-safe (assoc "subject" args)))
+         subject (cdr-safe (assoc "subject" args)))

     (gnus-msg-mail)
     (while args
       (setq func (intern-soft (concat "message-goto-" (downcase (caar args)))))
       (if (fboundp func)
     (gnus-msg-mail)
     (while args
       (setq func (intern-soft (concat "message-goto-" (downcase (caar args)))))
       (if (fboundp func)

-          (funcall func)
-        (message-position-on-field (caar args)))
+         (funcall func)
+       (message-position-on-field (caar args)))

       (insert (mapconcat 'identity (cdar args) ", "))
       (setq args (cdr args)))
     (if subject
       (insert (mapconcat 'identity (cdar args) ", "))
       (setq args (cdr args)))
     (if subject

-        (message-goto-body)
+       (message-goto-body)

       (message-goto-subject))))
 
 (defun gnus-button-embedded-url (address)
       (message-goto-subject))))
 
 (defun gnus-button-embedded-url (address)

diff --git a/lisp/gnus-cache.el b/lisp/gnus-cache.el
index 4916331..60964fd 100644 (file)
--- a/lisp/gnus-cache.el
+++ b/lisp/gnus-cache.el
@@ -160,9 +160,9 @@ it's not cached."
       (when (and number
                 (> number 0)           ; Reffed article.
                 (or force
       (when (and number
                 (> number 0)           ; Reffed article.
                 (or force

-                     (and (or (not gnus-cacheable-groups)
-                              (string-match gnus-cacheable-groups group))
-                          (or (not gnus-uncacheable-groups)
+                    (and (or (not gnus-cacheable-groups)
+                             (string-match gnus-cacheable-groups group))
+                         (or (not gnus-uncacheable-groups)

                              (not (string-match
                                    gnus-uncacheable-groups group)))
                          (gnus-cache-member-of-class
                              (not (string-match
                                    gnus-uncacheable-groups group)))
                          (gnus-cache-member-of-class


@@ -307,7 +307,7 @@ it's not cached."
            ;; unsuccessful), so we use the cached headers exclusively.
            (set-buffer nntp-server-buffer)
            (erase-buffer)
            ;; unsuccessful), so we use the cached headers exclusively.
            (set-buffer nntp-server-buffer)
            (erase-buffer)

-           (let ((coding-system-for-read 
+           (let ((coding-system-for-read

                   gnus-cache-overview-coding-system))
              (insert-file-contents cache-file))
            'nov)
                   gnus-cache-overview-coding-system))
              (insert-file-contents cache-file))
            'nov)


@@ -490,9 +490,9 @@ Returns the list of articles removed."
     (save-excursion
       (set-buffer cache-buf)
       (erase-buffer)
     (save-excursion
       (set-buffer cache-buf)
       (erase-buffer)

-      (let ((coding-system-for-read 
+      (let ((coding-system-for-read

             gnus-cache-overview-coding-system))
             gnus-cache-overview-coding-system))

-       (insert-file-contents 
+       (insert-file-contents

         (or file (gnus-cache-file-name group ".overview"))))
       (goto-char (point-min))
       (insert "\n")
         (or file (gnus-cache-file-name group ".overview"))))
       (goto-char (point-min))
       (insert "\n")


@@ -535,7 +535,7 @@ Returns the list of articles removed."
       (save-excursion
        (set-buffer cache-buf)
        (erase-buffer)
       (save-excursion
        (set-buffer cache-buf)
        (erase-buffer)

-       (let ((coding-system-for-read 
+       (let ((coding-system-for-read

               gnus-cache-coding-system))
          (insert-file-contents (gnus-cache-file-name group (car cached))))
        (goto-char (point-min))
               gnus-cache-coding-system))
          (insert-file-contents (gnus-cache-file-name group (car cached))))
        (goto-char (point-min))

diff --git a/lisp/gnus-cite.el b/lisp/gnus-cite.el
index 73c4bef..f752099 100644 (file)
--- a/lisp/gnus-cite.el
+++ b/lisp/gnus-cite.el
@@ -471,8 +471,8 @@ always hide."
                          gnus-hidden-properties))
            (point (point-min))
            found beg end start)
                          gnus-hidden-properties))
            (point (point-min))
            found beg end start)

-       (while (setq point 
-                    (text-property-any point (point-max) 
+       (while (setq point
+                    (text-property-any point (point-max)

                                        'gnus-callback
                                        'gnus-article-toggle-cited-text))
          (setq found t)
                                        'gnus-callback
                                        'gnus-article-toggle-cited-text))
          (setq found t)


@@ -549,11 +549,11 @@ means show, nil means toggle."
              (and (< arg 0) hidden))
       (if hidden
          (gnus-remove-text-properties-when
              (and (< arg 0) hidden))
       (if hidden
          (gnus-remove-text-properties-when

-          'article-type 'cite beg end 
+          'article-type 'cite beg end

           (cons 'article-type (cons 'cite
                                     gnus-hidden-properties)))
        (gnus-add-text-properties-when
           (cons 'article-type (cons 'cite
                                     gnus-hidden-properties)))
        (gnus-add-text-properties-when

-        'article-type nil beg end 
+        'article-type nil beg end

         (cons 'article-type (cons 'cite
                                   gnus-hidden-properties))))
       (save-excursion
         (cons 'article-type (cons 'cite
                                   gnus-hidden-properties))))
       (save-excursion

diff --git a/lisp/gnus-cus.el b/lisp/gnus-cus.el
index b3b4246..d32f65f 100644 (file)
--- a/lisp/gnus-cus.el
+++ b/lisp/gnus-cus.el
@@ -151,10 +151,10 @@ days (not necessarily an integer) or the symbols `never' or
 `immediate'.")
 
     (expiry-target (choice :tag "Expiry Target"
 `immediate'.")
 
     (expiry-target (choice :tag "Expiry Target"

-                           :value delete
-                           (const delete)
-                           (function :format "%v" nnmail-)
-                           string) "\
+                          :value delete
+                          (const delete)
+                          (function :format "%v" nnmail-)
+                          string) "\

 Where expired messages end up.
 
 Overrides `nnmail-expiry-target', which see.")
 Where expired messages end up.
 
 Overrides `nnmail-expiry-target', which see.")


@@ -195,13 +195,13 @@ An arbitrary comment on the group.")
 Always display this group, even when there are no unread articles
 in it..")
 
 Always display this group, even when there are no unread articles
 in it..")
 

-    (highlight-words 
+    (highlight-words

      (choice :tag "Highlight words"
             :value nil
             (repeat (list (regexp :tag "Highlight regexp")
                           (number :tag "Group for entire word" 0)
                           (number :tag "Group for displayed part" 0)
      (choice :tag "Highlight words"
             :value nil
             (repeat (list (regexp :tag "Highlight regexp")
                           (number :tag "Group for entire word" 0)
                           (number :tag "Group for displayed part" 0)

-                          (symbol :tag "Face" 
+                          (symbol :tag "Face"

                                   gnus-emphasis-highlight-words))))
      "highlight regexps.
 See gnus-emphasis-alist.")
                                   gnus-emphasis-highlight-words))))
      "highlight regexps.
 See gnus-emphasis-alist.")


@@ -210,14 +210,14 @@ See gnus-emphasis-alist.")
      (choice :tag "Posting style"
             :value nil
             (repeat (list
      (choice :tag "Posting style"
             :value nil
             (repeat (list

-                     (choice :tag "Type"
+                     (choice :tag "Type"

                              :value nil
                              (const signature)
                              :value nil
                              (const signature)

-                             (const signature-file) 
-                             (const organization) 
-                             (const address)
-                             (const name)
-                             (const body))
+                             (const signature-file)
+                             (const organization)
+                             (const address)
+                             (const name)
+                             (const body))

                      (string :format "%v"))))
      "post style.
 See gnus-posting-styles."))
                      (string :format "%v"))))
      "post style.
 See gnus-posting-styles."))


@@ -229,10 +229,10 @@ DOC is a documentation string for the parameter.")
 
 (defconst gnus-extra-topic-parameters
   '((subscribe (regexp :tag "Subscribe") "\
 
 (defconst gnus-extra-topic-parameters
   '((subscribe (regexp :tag "Subscribe") "\

-If `gnus-subscribe-newsgroup-method' or 
+If `gnus-subscribe-newsgroup-method' or

 `gnus-subscribe-options-newsgroup-method' is set to
 `gnus-subscribe-topics', new groups that matches this regexp will
 `gnus-subscribe-options-newsgroup-method' is set to
 `gnus-subscribe-topics', new groups that matches this regexp will

-automatically be subscribed to this topic")) 
+automatically be subscribed to this topic"))

   "Alist of topic parameters that are not also group parameters.
 
 Each entry has the form (NAME TYPE DOC), where NAME is the parameter
   "Alist of topic parameters that are not also group parameters.
 
 Each entry has the form (NAME TYPE DOC), where NAME is the parameter


@@ -262,7 +262,7 @@ DOC is a documentation string for the parameter.")
                                (const :format "" ,(nth 0 entry))
                                ,(nth 1 entry)))
                       (append (reverse gnus-group-parameters-more)
                                (const :format "" ,(nth 0 entry))
                                ,(nth 1 entry)))
                       (append (reverse gnus-group-parameters-more)

-                              gnus-group-parameters 
+                              gnus-group-parameters

                               (if group
                                   gnus-extra-group-parameters
                                 gnus-extra-topic-parameters)))))
                               (if group
                                   gnus-extra-group-parameters
                                 gnus-extra-topic-parameters)))))


@@ -642,7 +642,7 @@ When called interactively, FILE defaults to the current score file.
 This can be changed using the `\\[gnus-score-change-score-file]' command."
   (interactive (list gnus-current-score-file))
   (unless file
 This can be changed using the `\\[gnus-score-change-score-file]' command."
   (interactive (list gnus-current-score-file))
   (unless file

-    (error (format "No score file for %s" 
+    (error (format "No score file for %s"

                   (gnus-group-decoded-name gnus-newsgroup-name))))
   (let ((scores (gnus-score-load file))
        (types (mapcar (lambda (entry)
                   (gnus-group-decoded-name gnus-newsgroup-name))))
   (let ((scores (gnus-score-load file))
        (types (mapcar (lambda (entry)

diff --git a/lisp/gnus-delay.el b/lisp/gnus-delay.el
index ac37224..775bdfc 100644 (file)
--- a/lisp/gnus-delay.el
+++ b/lisp/gnus-delay.el
@@ -52,41 +52,41 @@ DELAY is a string, giving the length of the time.  Possible values are:
   variable `gnus-delay-default-hour', minute and second are zero."
   (interactive
    (list (read-string
   variable `gnus-delay-default-hour', minute and second are zero."
   (interactive
    (list (read-string

-          "Target date (YYYY-MM-DD) or length of delay (units in [mhdwMY]): "
-          gnus-delay-default-delay)))
+         "Target date (YYYY-MM-DD) or length of delay (units in [mhdwMY]): "
+         gnus-delay-default-delay)))

   (let (num unit days year month day deadline)
     (cond ((string-match
   (let (num unit days year month day deadline)
     (cond ((string-match

-            "\\([0-9][0-9][0-9]?[0-9]?\\)-\\([0-9]+\\)-\\([0-9]+\\)"
-            delay)
-           (setq year  (string-to-number (match-string 1 delay))
-                 month (string-to-number (match-string 2 delay))
-                 day   (string-to-number (match-string 3 delay)))
-           (setq deadline
-                 (message-make-date
-                  (encode-time 0 0      ; second and minute
-                               gnus-delay-default-hour
-                               day month year))))
-          ((string-match "\\([0-9]+\\)\\s-*\\([mhdwMY]\\)" delay)
-           (setq num (match-string 1 delay))
-           (setq unit (match-string 2 delay))
-           ;; Start from seconds, then multiply into needed units.
-           (setq num (string-to-number num))
-           (cond ((string= unit "Y")
-                  (setq delay (* num 60 60 24 365)))
-                 ((string= unit "M")
-                  (setq delay (* num 60 60 24 30)))
-                 ((string= unit "w")
-                  (setq delay (* num 60 60 24 7)))
-                 ((string= unit "d")
-                  (setq delay (* num 60 60 24)))
-                 ((string= unit "h")
-                  (setq delay (* num 60 60)))
-                 (t
-                  (setq delay (* num 60))))
-           (setq deadline (message-make-date
-                           (seconds-to-time (+ (time-to-seconds (current-time))
-                                               delay)))))
-          (t (error "Malformed delay `%s'" delay)))
+           "\\([0-9][0-9][0-9]?[0-9]?\\)-\\([0-9]+\\)-\\([0-9]+\\)"
+           delay)
+          (setq year  (string-to-number (match-string 1 delay))
+                month (string-to-number (match-string 2 delay))
+                day   (string-to-number (match-string 3 delay)))
+          (setq deadline
+                (message-make-date
+                 (encode-time 0 0      ; second and minute
+                              gnus-delay-default-hour
+                              day month year))))
+         ((string-match "\\([0-9]+\\)\\s-*\\([mhdwMY]\\)" delay)
+          (setq num (match-string 1 delay))
+          (setq unit (match-string 2 delay))
+          ;; Start from seconds, then multiply into needed units.
+          (setq num (string-to-number num))
+          (cond ((string= unit "Y")
+                 (setq delay (* num 60 60 24 365)))
+                ((string= unit "M")
+                 (setq delay (* num 60 60 24 30)))
+                ((string= unit "w")
+                 (setq delay (* num 60 60 24 7)))
+                ((string= unit "d")
+                 (setq delay (* num 60 60 24)))
+                ((string= unit "h")
+                 (setq delay (* num 60 60)))
+                (t
+                 (setq delay (* num 60))))
+          (setq deadline (message-make-date
+                          (seconds-to-time (+ (time-to-seconds (current-time))
+                                              delay)))))
+         (t (error "Malformed delay `%s'" delay)))

     (message-add-header (format "%s: %s" gnus-delay-header deadline)))
   (set-buffer-modified-p t)
   (nndraft-request-create-group gnus-delay-group)
     (message-add-header (format "%s: %s" gnus-delay-header deadline)))
   (set-buffer-modified-p t)
   (nndraft-request-create-group gnus-delay-group)


@@ -101,23 +101,23 @@ DELAY is a string, giving the length of the time.  Possible values are:
   (interactive)
   (save-excursion
     (let* ((group (format "nndraft:%s" gnus-delay-group))
   (interactive)
   (save-excursion
     (let* ((group (format "nndraft:%s" gnus-delay-group))

-           (articles (nndraft-articles))
-           article deadline)
+          (articles (nndraft-articles))
+          article deadline)

       (gnus-activate-group group)
       (while (setq article (pop articles))
       (gnus-activate-group group)
       (while (setq article (pop articles))

-        (gnus-request-head article group)
-        (set-buffer nntp-server-buffer)
-        (unless (re-search-forward
-                 (concat "^" (regexp-quote gnus-delay-header) ":\\s-+"))
-          (error "Couldn't find delay for article %d" article))
-        (setq deadline (nnheader-header-value))
-        (setq deadline (apply 'encode-time (parse-time-string deadline)))
-        (setq deadline (time-since deadline))
-        (when (and (>= (nth 0 deadline) 0)
-                   (>= (nth 1 deadline) 0))
-          (message "Sending article %d" article)
-          (gnus-draft-send article group)
-          (message "Sending article %d...done" article))))))
+       (gnus-request-head article group)
+       (set-buffer nntp-server-buffer)
+       (unless (re-search-forward
+                (concat "^" (regexp-quote gnus-delay-header) ":\\s-+"))
+         (error "Couldn't find delay for article %d" article))
+       (setq deadline (nnheader-header-value))
+       (setq deadline (apply 'encode-time (parse-time-string deadline)))
+       (setq deadline (time-since deadline))
+       (when (and (>= (nth 0 deadline) 0)
+                  (>= (nth 1 deadline) 0))
+         (message "Sending article %d" article)
+         (gnus-draft-send article group)
+         (message "Sending article %d...done" article))))))

 
 ;;;###autoload
 (defun gnus-delay-initialize (&optional no-keymap no-check)
 
 ;;;###autoload
 (defun gnus-delay-initialize (&optional no-keymap no-check)

diff --git a/lisp/gnus-demon.el b/lisp/gnus-demon.el
index d647928..2c73b37 100644 (file)
--- a/lisp/gnus-demon.el
+++ b/lisp/gnus-demon.el
@@ -150,32 +150,32 @@ time Emacs has been idle for IDLE `gnus-demon-timestep's."
   (if (not (stringp time))
       time
     (let* ((now (current-time))
   (if (not (stringp time))
       time
     (let* ((now (current-time))

-           ;; obtain NOW as discrete components -- make a vector for speed
-           (nowParts (decode-time now))
-           ;; obtain THEN as discrete components
-           (thenParts (parse-time-string time))
-           (thenHour (elt thenParts 2))
-           (thenMin (elt thenParts 1))
-           ;; convert time as elements into number of seconds since EPOCH.
-           (then (encode-time 0
-                              thenMin
-                              thenHour
-                              ;; If THEN is earlier than NOW, make it
-                              ;; same time tomorrow.  Doc for encode-time
-                              ;; says that this is OK.
-                              (+ (elt nowParts 3)
-                                 (if (or (< thenHour (elt nowParts 2))
-                                         (and (= thenHour (elt nowParts 2))
-                                              (<= thenMin (elt nowParts 1))))
-                                     1 0))
-                              (elt nowParts 4)
-                              (elt nowParts 5)
-                              (elt nowParts 6)
-                              (elt nowParts 7)
-                              (elt nowParts 8)))
-           ;; calculate number of seconds between NOW and THEN
-           (diff (+ (* 65536 (- (car then) (car now)))
-                    (- (cadr then) (cadr now)))))
+          ;; obtain NOW as discrete components -- make a vector for speed
+          (nowParts (decode-time now))
+          ;; obtain THEN as discrete components
+          (thenParts (parse-time-string time))
+          (thenHour (elt thenParts 2))
+          (thenMin (elt thenParts 1))
+          ;; convert time as elements into number of seconds since EPOCH.
+          (then (encode-time 0
+                             thenMin
+                             thenHour
+                             ;; If THEN is earlier than NOW, make it
+                             ;; same time tomorrow.  Doc for encode-time
+                             ;; says that this is OK.
+                             (+ (elt nowParts 3)
+                                (if (or (< thenHour (elt nowParts 2))
+                                        (and (= thenHour (elt nowParts 2))
+                                             (<= thenMin (elt nowParts 1))))
+                                    1 0))
+                             (elt nowParts 4)
+                             (elt nowParts 5)
+                             (elt nowParts 6)
+                             (elt nowParts 7)
+                             (elt nowParts 8)))
+          ;; calculate number of seconds between NOW and THEN
+          (diff (+ (* 65536 (- (car then) (car now)))
+                   (- (cadr then) (cadr now)))))

       ;; return number of timesteps in the number of seconds
       (round (/ diff gnus-demon-timestep)))))
 
       ;; return number of timesteps in the number of seconds
       (round (/ diff gnus-demon-timestep)))))
 

diff --git a/lisp/gnus-draft.el b/lisp/gnus-draft.el
index 654c9a1..2627c50 100644 (file)
--- a/lisp/gnus-draft.el
+++ b/lisp/gnus-draft.el
@@ -95,14 +95,14 @@
   "Enter a mail/post buffer to edit and send the draft."
   (interactive)
   (let ((article (gnus-summary-article-number))
   "Enter a mail/post buffer to edit and send the draft."
   (interactive)
   (let ((article (gnus-summary-article-number))

-        (group gnus-newsgroup-name))
+       (group gnus-newsgroup-name))

     (gnus-summary-mark-as-read article gnus-canceled-mark)
     (gnus-draft-setup article group t)
     (set-buffer-modified-p t)
     (save-excursion
       (save-restriction
     (gnus-summary-mark-as-read article gnus-canceled-mark)
     (gnus-draft-setup article group t)
     (set-buffer-modified-p t)
     (save-excursion
       (save-restriction

-        (message-narrow-to-headers)
-        (message-remove-header "date")))
+       (message-narrow-to-headers)
+       (message-remove-header "date")))

     (save-buffer)
     (let ((gnus-verbose-backends nil))
       (gnus-request-expire-articles (list article) group t))
     (save-buffer)
     (let ((gnus-verbose-backends nil))
       (gnus-request-expire-articles (list article) group t))


@@ -123,8 +123,8 @@
     (while (setq article (pop articles))
       (gnus-summary-remove-process-mark article)
       (unless (memq article gnus-newsgroup-unsendable)
     (while (setq article (pop articles))
       (gnus-summary-remove-process-mark article)
       (unless (memq article gnus-newsgroup-unsendable)

-       (let ((message-sending-message 
-              (format "Sending message %d of %d..." 
+       (let ((message-sending-message
+              (format "Sending message %d of %d..."

                       (- total (length articles)) total)))
          (gnus-draft-send article gnus-newsgroup-name t))
        (gnus-summary-mark-article article gnus-canceled-mark)))))
                       (- total (length articles)) total)))
          (gnus-draft-send article gnus-newsgroup-name t))
        (gnus-summary-mark-article article gnus-canceled-mark)))))


@@ -133,7 +133,7 @@
   "Send message ARTICLE."
   (let ((message-syntax-checks (if interactive nil
                                 'dont-check-for-anything-just-trust-me))
   "Send message ARTICLE."
   (let ((message-syntax-checks (if interactive nil
                                 'dont-check-for-anything-just-trust-me))

-       (message-inhibit-body-encoding (or (not group) 
+       (message-inhibit-body-encoding (or (not group)

                                           (equal group "nndraft:queue")
                                           message-inhibit-body-encoding))
        (message-send-hook (and group (not (equal group "nndraft:queue"))
                                           (equal group "nndraft:queue")
                                           message-inhibit-body-encoding))
        (message-send-hook (and group (not (equal group "nndraft:queue"))


@@ -190,8 +190,8 @@
           article)
       (while (setq article (pop articles))
        (unless (memq article unsendable)
           article)
       (while (setq article (pop articles))
        (unless (memq article unsendable)

-         (let ((message-sending-message 
-                (format "Sending message %d of %d..." 
+         (let ((message-sending-message
+                (format "Sending message %d of %d..."

                         (- total (length articles)) total)))
            (gnus-draft-send article)))))))
 
                         (- total (length articles)) total)))
            (gnus-draft-send article)))))))
 


@@ -239,8 +239,8 @@
       (gnus-backlog-remove-article group narticle)
       (when (and ga
                 (ignore-errors (setq ga (car (read-from-string ga)))))
       (gnus-backlog-remove-article group narticle)
       (when (and ga
                 (ignore-errors (setq ga (car (read-from-string ga)))))

-        (setq gnus-newsgroup-name 
-              (if (equal (car ga) "") nil (car ga)))
+       (setq gnus-newsgroup-name
+             (if (equal (car ga) "") nil (car ga)))

        (setq message-post-method
              `(lambda (arg)
                 (gnus-post-method arg ,(car ga))))
        (setq message-post-method
              `(lambda (arg)
                 (gnus-post-method arg ,(car ga))))

diff --git a/lisp/gnus-eform.el b/lisp/gnus-eform.el
index 3c1ecc1..d55a6b5 100644 (file)
--- a/lisp/gnus-eform.el
+++ b/lisp/gnus-eform.el
@@ -115,8 +115,8 @@ of the buffer."
   (interactive)
   (goto-char (point-min))
   (let ((form (condition-case nil
   (interactive)
   (goto-char (point-min))
   (let ((form (condition-case nil

-                  (read (current-buffer))
-                (end-of-file nil)))
+                 (read (current-buffer))
+               (end-of-file nil)))

        (func gnus-edit-form-done-function))
     (gnus-edit-form-exit)
     (funcall func form)))
        (func gnus-edit-form-done-function))
     (gnus-edit-form-exit)
     (funcall func form)))

diff --git a/lisp/gnus-gl.el b/lisp/gnus-gl.el
index a17e0ce..d010793 100644 (file)
--- a/lisp/gnus-gl.el
+++ b/lisp/gnus-gl.el
@@ -510,11 +510,11 @@ recommend using both scores and grouplens predictions together."
       ;; Return an empty string
       ""
     (let* ((rate-string (make-string 12 ?\ ))
       ;; Return an empty string
       ""
     (let* ((rate-string (make-string 12 ?\ ))

-           (mid (mail-header-id header))
-           (hashent (gnus-gethash mid grouplens-current-hashtable))
-           (pred (or (nth 0 hashent) 0))
-           (low (nth 1 hashent))
-           (high (nth 2 hashent)))
+          (mid (mail-header-id header))
+          (hashent (gnus-gethash mid grouplens-current-hashtable))
+          (pred (or (nth 0 hashent) 0))
+          (low (nth 1 hashent))
+          (high (nth 2 hashent)))

       ;; Init rate-string
       (aset rate-string 0 ?|)
       (aset rate-string 11 ?|)
       ;; Init rate-string
       (aset rate-string 0 ?|)
       (aset rate-string 11 ?|)

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index a2feac9..fd6c8bf 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -427,7 +427,7 @@ in which case `gnus-group-jump-to-group' offers \"Group: nnml:\"
 in the minibuffer prompt."
   :group 'gnus-group-various
   :type '(choice (string :tag "Prompt string")
 in the minibuffer prompt."
   :group 'gnus-group-various
   :type '(choice (string :tag "Prompt string")

-                 (const :tag "Empty" nil)))
+                (const :tag "Empty" nil)))

 
 (defvar gnus-group-listing-limit 1000
   "*A limit of the number of groups when listing.
 
 (defvar gnus-group-listing-limit 1000
   "*A limit of the number of groups when listing.


@@ -1365,17 +1365,17 @@ if it is a string, only list groups matching REGEXP."
         (method (gnus-server-get-method group (gnus-info-method info)))
         (marked (gnus-info-marks info))
         (mailp (apply 'append
         (method (gnus-server-get-method group (gnus-info-method info)))
         (marked (gnus-info-marks info))
         (mailp (apply 'append

-                       (mapcar
-                        (lambda (x)
-                          (memq x (assoc (symbol-name
-                                          (car (or method gnus-select-method)))
-                                         gnus-valid-select-methods)))
-                        '(mail post-mail))))
-         (level (or (gnus-info-level info) gnus-level-killed))
-         (score (or (gnus-info-score info) 0))
-         (ticked (gnus-range-length (cdr (assq 'tick marked))))
-         (group-age (gnus-group-timestamp-delta group))
-         (inhibit-read-only t))
+                      (mapcar
+                       (lambda (x)
+                         (memq x (assoc (symbol-name
+                                         (car (or method gnus-select-method)))
+                                        gnus-valid-select-methods)))
+                       '(mail post-mail))))
+        (level (or (gnus-info-level info) gnus-level-killed))
+        (score (or (gnus-info-score info) 0))
+        (ticked (gnus-range-length (cdr (assq 'tick marked))))
+        (group-age (gnus-group-timestamp-delta group))
+        (inhibit-read-only t))

     ;; Eval the cars of the lists until we find a match.
     (while (and list
                (not (eval (caar list))))
     ;; Eval the cars of the lists until we find a match.
     (while (and list
                (not (eval (caar list))))


@@ -3839,7 +3839,7 @@ or `gnus-group-catchup-group-hook'."
   "Return the offset in seconds from the timestamp for GROUP to the current time, as a floating point number."
   (let* ((time (or (gnus-group-timestamp group)
                   (list 0 0)))
   "Return the offset in seconds from the timestamp for GROUP to the current time, as a floating point number."
   (let* ((time (or (gnus-group-timestamp group)
                   (list 0 0)))

-         (delta (subtract-time (current-time) time)))
+        (delta (subtract-time (current-time) time)))

     (+ (* (nth 0 delta) 65536.0)
        (nth 1 delta))))
 
     (+ (* (nth 0 delta) 65536.0)
        (nth 1 delta))))
 


@@ -3947,7 +3947,7 @@ This command may read the active file."
     (gnus-group-list-plus args)))
 
 (defun gnus-group-mark-article-read (group article)
     (gnus-group-list-plus args)))
 
 (defun gnus-group-mark-article-read (group article)

-  "Mark ARTICLE read." 
+  "Mark ARTICLE read."

   (gnus-activate-group group)
   (let ((buffer (gnus-summary-buffer-name group))
        (mark gnus-read-mark))
   (gnus-activate-group group)
   (let ((buffer (gnus-summary-buffer-name group))
        (mark gnus-read-mark))

diff --git a/lisp/gnus-kill.el b/lisp/gnus-kill.el
index 4372825..1ead0ac 100644 (file)
--- a/lisp/gnus-kill.el
+++ b/lisp/gnus-kill.el
@@ -357,16 +357,16 @@ If NEWSGROUP is nil, return the global kill file instead."
 (defun gnus-apply-kill-file-unless-scored ()
   "Apply .KILL file, unless a .SCORE file for the same newsgroup exists."
   (cond ((file-exists-p (gnus-score-file-name gnus-newsgroup-name))
 (defun gnus-apply-kill-file-unless-scored ()
   "Apply .KILL file, unless a .SCORE file for the same newsgroup exists."
   (cond ((file-exists-p (gnus-score-file-name gnus-newsgroup-name))

-         ;; Ignores global KILL.
-         (when (file-exists-p (gnus-newsgroup-kill-file gnus-newsgroup-name))
+        ;; Ignores global KILL.
+        (when (file-exists-p (gnus-newsgroup-kill-file gnus-newsgroup-name))

           (gnus-message 3 "Note: Ignoring %s.KILL; preferring .SCORE"
                         gnus-newsgroup-name))
           (gnus-message 3 "Note: Ignoring %s.KILL; preferring .SCORE"
                         gnus-newsgroup-name))

-         0)
-        ((or (file-exists-p (gnus-newsgroup-kill-file nil))
-             (file-exists-p (gnus-newsgroup-kill-file gnus-newsgroup-name)))
-         (gnus-apply-kill-file-internal))
-        (t
-         0)))
+        0)
+       ((or (file-exists-p (gnus-newsgroup-kill-file nil))
+            (file-exists-p (gnus-newsgroup-kill-file gnus-newsgroup-name)))
+        (gnus-apply-kill-file-internal))
+       (t
+        0)))

 
 (defun gnus-apply-kill-file-internal ()
   "Apply a kill file to the current newsgroup.
 
 (defun gnus-apply-kill-file-internal ()
   "Apply a kill file to the current newsgroup.


@@ -398,7 +398,7 @@ Returns the number of articles marked as read."
                          gnus-newsgroup-kill-headers))
                  (setq headers (cdr headers))))
              (setq files nil))
                          gnus-newsgroup-kill-headers))
                  (setq headers (cdr headers))))
              (setq files nil))

-         (setq files (cdr files)))))
+         (setq files (cdr files)))))

     (if (not gnus-newsgroup-kill-headers)
        ()
       (save-window-excursion
     (if (not gnus-newsgroup-kill-headers)
        ()
       (save-window-excursion

diff --git a/lisp/gnus-ml.el b/lisp/gnus-ml.el
index b2f57df..de95dbf 100644 (file)
--- a/lisp/gnus-ml.el
+++ b/lisp/gnus-ml.el
@@ -75,7 +75,7 @@
   "Setup group parameters from List-Post header.
 If FORCE is non-nil, replace the old ones."
   (interactive "P")
   "Setup group parameters from List-Post header.
 If FORCE is non-nil, replace the old ones."
   (interactive "P")

-  (let ((list-post 
+  (let ((list-post

         (with-current-buffer gnus-original-article-buffer
           (gnus-fetch-field "list-post"))))
     (if list-post
         (with-current-buffer gnus-original-article-buffer
           (gnus-fetch-field "list-post"))))
     (if list-post


@@ -84,7 +84,7 @@ If FORCE is non-nil, replace the old ones."
            (gnus-message 1 "to-list is non-nil.")
          (if (string-match "<mailto:\\([^>]*\\)>" list-post)
              (setq list-post (match-string 1 list-post)))
            (gnus-message 1 "to-list is non-nil.")
          (if (string-match "<mailto:\\([^>]*\\)>" list-post)
              (setq list-post (match-string 1 list-post)))

-         (gnus-group-add-parameter gnus-newsgroup-name 
+         (gnus-group-add-parameter gnus-newsgroup-name

                                    (cons 'to-list list-post))
          (gnus-mailing-list-mode 1))
       (gnus-message 1 "no list-post in this message."))))
                                    (cons 'to-list list-post))
          (gnus-mailing-list-mode 1))
       (gnus-message 1 "no list-post in this message."))))


@@ -109,8 +109,8 @@ If FORCE is non-nil, replace the old ones."
 
 (defun gnus-mailing-list-help ()
   "Get help from mailing list server."
 
 (defun gnus-mailing-list-help ()
   "Get help from mailing list server."

-  (interactive)  
-  (let ((list-help 
+  (interactive)
+  (let ((list-help

         (with-current-buffer gnus-original-article-buffer
           (gnus-fetch-field "list-help"))))
     (cond (list-help (gnus-mailing-list-message list-help))
         (with-current-buffer gnus-original-article-buffer
           (gnus-fetch-field "list-help"))))
     (cond (list-help (gnus-mailing-list-message list-help))


@@ -119,7 +119,7 @@ If FORCE is non-nil, replace the old ones."
 (defun gnus-mailing-list-subscribe ()
   "Subscribe"
   (interactive)
 (defun gnus-mailing-list-subscribe ()
   "Subscribe"
   (interactive)

-  (let ((list-subscribe 
+  (let ((list-subscribe

         (with-current-buffer gnus-original-article-buffer
           (gnus-fetch-field "list-subscribe"))))
     (cond (list-subscribe (gnus-mailing-list-message list-subscribe))
         (with-current-buffer gnus-original-article-buffer
           (gnus-fetch-field "list-subscribe"))))
     (cond (list-subscribe (gnus-mailing-list-message list-subscribe))


@@ -128,7 +128,7 @@ If FORCE is non-nil, replace the old ones."
 (defun gnus-mailing-list-unsubscribe ()
   "Unsubscribe"
   (interactive)
 (defun gnus-mailing-list-unsubscribe ()
   "Unsubscribe"
   (interactive)

-  (let ((list-unsubscribe 
+  (let ((list-unsubscribe

         (with-current-buffer gnus-original-article-buffer
           (gnus-fetch-field "list-unsubscribe"))))
     (cond (list-unsubscribe (gnus-mailing-list-message list-unsubscribe))
         (with-current-buffer gnus-original-article-buffer
           (gnus-fetch-field "list-unsubscribe"))))
     (cond (list-unsubscribe (gnus-mailing-list-message list-unsubscribe))


@@ -137,7 +137,7 @@ If FORCE is non-nil, replace the old ones."
 (defun gnus-mailing-list-post ()
   "Post message (really useful ?)"
   (interactive)
 (defun gnus-mailing-list-post ()
   "Post message (really useful ?)"
   (interactive)

-  (let ((list-post 
+  (let ((list-post

         (with-current-buffer gnus-original-article-buffer
           (gnus-fetch-field "list-post"))))
     (cond (list-post (gnus-mailing-list-message list-post))
         (with-current-buffer gnus-original-article-buffer
           (gnus-fetch-field "list-post"))))
     (cond (list-post (gnus-mailing-list-message list-post))


@@ -146,7 +146,7 @@ If FORCE is non-nil, replace the old ones."
 (defun gnus-mailing-list-owner ()
   "Mail to the owner"
   (interactive)
 (defun gnus-mailing-list-owner ()
   "Mail to the owner"
   (interactive)

-  (let ((list-owner 
+  (let ((list-owner

         (with-current-buffer gnus-original-article-buffer
           (gnus-fetch-field "list-owner"))))
     (cond (list-owner (gnus-mailing-list-message list-owner))
         (with-current-buffer gnus-original-article-buffer
           (gnus-fetch-field "list-owner"))))
     (cond (list-owner (gnus-mailing-list-message list-owner))


@@ -156,10 +156,10 @@ If FORCE is non-nil, replace the old ones."
   "Browse archive"
   (interactive)
   (require 'browse-url)
   "Browse archive"
   (interactive)
   (require 'browse-url)

-  (let ((list-archive 
+  (let ((list-archive

         (with-current-buffer gnus-original-article-buffer
           (gnus-fetch-field "list-archive"))))
         (with-current-buffer gnus-original-article-buffer
           (gnus-fetch-field "list-archive"))))

-    (cond (list-archive 
+    (cond (list-archive

           (if (string-match "<\\(http:[^>]*\\)>" list-archive)
               (browse-url (match-string 1 list-archive))
             (browse-url list-archive)))
           (if (string-match "<\\(http:[^>]*\\)>" list-archive)
               (browse-url (match-string 1 list-archive))
             (browse-url list-archive)))


@@ -174,7 +174,7 @@ If FORCE is non-nil, replace the old ones."
        (subject "None")
        (body "")
        )
        (subject "None")
        (body "")
        )

-    (cond 
+    (cond

      ((string-match "<mailto:\\([^>]*\\)>" address)
       (let ((args (match-string 1 address)))
        (cond                                   ; with param
      ((string-match "<mailto:\\([^>]*\\)>" address)
       (let ((args (match-string 1 address)))
        (cond                                   ; with param


@@ -187,9 +187,9 @@ If FORCE is non-nil, replace the old ones."
                (setq body (match-string 1 param)))
            (if (string-match "to=\\([^&]*\\)" param)
                (push (match-string 1 param) to))
                (setq body (match-string 1 param)))
            (if (string-match "to=\\([^&]*\\)" param)
                (push (match-string 1 param) to))

-           ))   
+           ))

         (t (setq mailto args)))))                      ; without param
         (t (setq mailto args)))))                      ; without param

-     
+

      ; other case <http://... to be done.
      (t nil))
     (gnus-setup-message 'message (message-mail mailto subject))
      ; other case <http://... to be done.
      (t nil))
     (gnus-setup-message 'message (message-mail mailto subject))

diff --git a/lisp/gnus-mlspl.el b/lisp/gnus-mlspl.el
index 3dbc82d..d4f714b 100644 (file)
--- a/lisp/gnus-mlspl.el
+++ b/lisp/gnus-mlspl.el
@@ -143,7 +143,7 @@ Calling (gnus-group-split-fancy nil nil \"mail.misc\") returns:
 \(| (& (any \"\\\\(bar@femail\\\\.com\\\\|.*@femail\\\\.com\\\\)\"
           \"mail.bar\")
       (any \"\\\\(foo@nowhere\\\\.gov\\\\|foo@localhost\\\\|foo-redist@home\\\\)\"
 \(| (& (any \"\\\\(bar@femail\\\\.com\\\\|.*@femail\\\\.com\\\\)\"
           \"mail.bar\")
       (any \"\\\\(foo@nowhere\\\\.gov\\\\|foo@localhost\\\\|foo-redist@home\\\\)\"

-           - \"bugs-foo\" - \"rambling-foo\" \"mail.foo\"))
+          - \"bugs-foo\" - \"rambling-foo\" \"mail.foo\"))

    \"mail.others\")"
   (let* ((newsrc (cdr gnus-newsrc-alist))
         split)
    \"mail.others\")"
   (let* ((newsrc (cdr gnus-newsrc-alist))
         split)


@@ -200,9 +200,9 @@ Calling (gnus-group-split-fancy nil nil \"mail.misc\") returns:
                         (list 'any split-regexp)
                         ;; Generate RESTRICTs for SPLIT-EXCLUDEs.
                         (if (listp split-exclude)
                         (list 'any split-regexp)
                         ;; Generate RESTRICTs for SPLIT-EXCLUDEs.
                         (if (listp split-exclude)

-                             (apply #'append 
-                                    (mapcar (lambda (arg) (list '- arg))
-                                            split-exclude))
+                            (apply #'append
+                                   (mapcar (lambda (arg) (list '- arg))
+                                           split-exclude))

                           (list '- split-exclude))
                         (list group-clean))
                        split)
                           (list '- split-exclude))
                         (list group-clean))
                        split)

diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index 1356ad0..2b6c6f4 100644 (file)
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -50,7 +50,7 @@ methods.  If that is the case, the user will be queried for what select
 method to use when posting."
   :group 'gnus-group-foreign
   :type `(choice (const nil)
 method to use when posting."
   :group 'gnus-group-foreign
   :type `(choice (const nil)

-                 (const current)
+                (const current)

                 (const native)
                 (sexp :tag "Methods" ,gnus-select-method)))
 
                 (const native)
                 (sexp :tag "Methods" ,gnus-select-method)))
 


@@ -246,10 +246,10 @@ Thank you for your help in stamping out bugs.
             (let ((mbl1 mml-buffer-list))
               (setq mml-buffer-list mbl)  ;; Global value
               (set (make-local-variable 'mml-buffer-list) mbl1);; Local value
             (let ((mbl1 mml-buffer-list))
               (setq mml-buffer-list mbl)  ;; Global value
               (set (make-local-variable 'mml-buffer-list) mbl1);; Local value

-               ;; LOCAL argument of add-hook differs between GNU Emacs
-               ;; and XEmacs. make-local-hook makes sure they are local.
-               (make-local-hook 'kill-buffer-hook)
-               (make-local-hook 'change-major-mode-hook)
+              ;; LOCAL argument of add-hook differs between GNU Emacs
+              ;; and XEmacs. make-local-hook makes sure they are local.
+              (make-local-hook 'kill-buffer-hook)
+              (make-local-hook 'change-major-mode-hook)

               (add-hook 'change-major-mode-hook 'mml-destroy-buffers nil t)
               (add-hook 'kill-buffer-hook 'mml-destroy-buffers t t))
           (mml-destroy-buffers)
               (add-hook 'change-major-mode-hook 'mml-destroy-buffers nil t)
               (add-hook 'kill-buffer-hook 'mml-destroy-buffers t t))
           (mml-destroy-buffers)


@@ -607,9 +607,9 @@ header line with the old Message-ID."
 
 (defun gnus-msg-treat-broken-reply-to (&optional force)
   "Remove the Reply-to header iff broken-reply-to."
 
 (defun gnus-msg-treat-broken-reply-to (&optional force)
   "Remove the Reply-to header iff broken-reply-to."

-  (when (or force 
-            (gnus-group-find-parameter
-             gnus-newsgroup-name 'broken-reply-to))
+  (when (or force
+           (gnus-group-find-parameter
+            gnus-newsgroup-name 'broken-reply-to))

     (save-restriction
       (message-narrow-to-head)
       (message-remove-header "reply-to"))))
     (save-restriction
       (message-narrow-to-head)
       (message-remove-header "reply-to"))))


@@ -1045,7 +1045,7 @@ If YANK is non-nil, include the original article."
     (let (text)
       (save-excursion
        (set-buffer (gnus-get-buffer-create " *gnus environment info*"))
     (let (text)
       (save-excursion
        (set-buffer (gnus-get-buffer-create " *gnus environment info*"))

-        (erase-buffer)
+       (erase-buffer)

        (gnus-debug)
        (setq text (buffer-string)))
       (insert "<#part type=application/x-emacs-lisp disposition=inline description=\"User settings\">\n" text "\n<#/part>"))
        (gnus-debug)
        (setq text (buffer-string)))
       (insert "<#part type=application/x-emacs-lisp disposition=inline description=\"User settings\">\n" text "\n<#/part>"))


@@ -1176,43 +1176,43 @@ this is a reply."
     (save-restriction
       (message-narrow-to-headers)
       (let ((gcc (or gcc (mail-fetch-field "gcc" nil t)))
     (save-restriction
       (message-narrow-to-headers)
       (let ((gcc (or gcc (mail-fetch-field "gcc" nil t)))

-            (cur (current-buffer))
-            groups group method group-art)
-        (when gcc
-          (message-remove-header "gcc")
-          (widen)
-          (setq groups (message-unquote-tokens
-                        (message-tokenize-header gcc " ,")))
-          ;; Copy the article over to some group(s).
-          (while (setq group (pop groups))
-            (gnus-check-server
-             (setq method (gnus-inews-group-method group)))
-            (unless (gnus-request-group group nil method)
-              (gnus-request-create-group group method))
-            (save-excursion
-              (nnheader-set-temp-buffer " *acc*")
-              (insert-buffer-substring cur)
-              (message-encode-message-body)
-              (save-restriction
-                (message-narrow-to-headers)
-                (let ((mail-parse-charset message-default-charset)
-                      (rfc2047-header-encoding-alist
-                       (cons '("Newsgroups" . default)
-                             rfc2047-header-encoding-alist)))
-                  (mail-encode-encoded-word-buffer)))
-              (goto-char (point-min))
-              (when (re-search-forward
-                     (concat "^" (regexp-quote mail-header-separator) "$")
-                     nil t)
-                (replace-match "" t t ))
-              (unless (setq group-art
-                            (gnus-request-accept-article group method t t))
-                (gnus-message 1 "Couldn't store article in group %s: %s"
-                              group (gnus-status-message method))
-                (sit-for 2))
-              (when (and group-art gnus-inews-mark-gcc-as-read)
-                (gnus-group-mark-article-read group (cdr group-art)))
-              (kill-buffer (current-buffer)))))))))
+           (cur (current-buffer))
+           groups group method group-art)
+       (when gcc
+         (message-remove-header "gcc")
+         (widen)
+         (setq groups (message-unquote-tokens
+                       (message-tokenize-header gcc " ,")))
+         ;; Copy the article over to some group(s).
+         (while (setq group (pop groups))
+           (gnus-check-server
+            (setq method (gnus-inews-group-method group)))
+           (unless (gnus-request-group group nil method)
+             (gnus-request-create-group group method))
+           (save-excursion
+             (nnheader-set-temp-buffer " *acc*")
+             (insert-buffer-substring cur)
+             (message-encode-message-body)
+             (save-restriction
+               (message-narrow-to-headers)
+               (let ((mail-parse-charset message-default-charset)
+                     (rfc2047-header-encoding-alist
+                      (cons '("Newsgroups" . default)
+                            rfc2047-header-encoding-alist)))
+                 (mail-encode-encoded-word-buffer)))
+             (goto-char (point-min))
+             (when (re-search-forward
+                    (concat "^" (regexp-quote mail-header-separator) "$")
+                    nil t)
+               (replace-match "" t t ))
+             (unless (setq group-art
+                           (gnus-request-accept-article group method t t))
+               (gnus-message 1 "Couldn't store article in group %s: %s"
+                             group (gnus-status-message method))
+               (sit-for 2))
+             (when (and group-art gnus-inews-mark-gcc-as-read)
+               (gnus-group-mark-article-read group (cdr group-art)))
+             (kill-buffer (current-buffer)))))))))

 
 (defun gnus-inews-insert-gcc ()
   "Insert Gcc headers based on `gnus-outgoing-message-group'."
 
 (defun gnus-inews-insert-gcc ()
   "Insert Gcc headers based on `gnus-outgoing-message-group'."


@@ -1426,8 +1426,8 @@ this is a reply."
       (when (or name address)
        (add-hook 'message-setup-hook
                  `(lambda ()
       (when (or name address)
        (add-hook 'message-setup-hook
                  `(lambda ()

-                    (set (make-local-variable 'user-mail-address)
-                         ,(or (cdr address) user-mail-address))
+                    (set (make-local-variable 'user-mail-address)
+                         ,(or (cdr address) user-mail-address))

                     (let ((user-full-name ,(or (cdr name) (user-full-name)))
                           (user-mail-address
                            ,(or (cdr address) user-mail-address)))
                     (let ((user-full-name ,(or (cdr name) (user-full-name)))
                           (user-mail-address
                            ,(or (cdr address) user-mail-address)))

diff --git a/lisp/gnus-range.el b/lisp/gnus-range.el
index 45855d9..72c1bb1 100644 (file)
--- a/lisp/gnus-range.el
+++ b/lisp/gnus-range.el
@@ -348,7 +348,7 @@ modified."
        range item selector)
     (while (or item1 item2)
       (setq selector
        range item selector)
     (while (or item1 item2)
       (setq selector

-           (cond 
+           (cond

             ((null item1) nil)
             ((null item2) t)
             ((and (numberp item1) (numberp item2)) (< item1 item2))
             ((null item1) nil)
             ((null item2) t)
             ((and (numberp item1) (numberp item2)) (< item1 item2))


@@ -358,30 +358,30 @@ modified."
       (setq item
            (or
             (let ((tmp1 item) (tmp2 (if selector item1 item2)))
       (setq item
            (or
             (let ((tmp1 item) (tmp2 (if selector item1 item2)))

-              (cond 
+              (cond

                ((null tmp1) tmp2)
                ((null tmp2) tmp1)
                ((and (numberp tmp1) (numberp tmp2))
                ((null tmp1) tmp2)
                ((null tmp2) tmp1)
                ((and (numberp tmp1) (numberp tmp2))

-                (cond 
+                (cond

                  ((eq tmp1 tmp2) tmp1)
                  ((eq (1+ tmp1) tmp2) (cons tmp1 tmp2))
                  ((eq (1+ tmp2) tmp1) (cons tmp2 tmp1))
                  (t nil)))
                ((numberp tmp1)
                  ((eq tmp1 tmp2) tmp1)
                  ((eq (1+ tmp1) tmp2) (cons tmp1 tmp2))
                  ((eq (1+ tmp2) tmp1) (cons tmp2 tmp1))
                  (t nil)))
                ((numberp tmp1)

-                (cond 
+                (cond

                  ((and (>= tmp1 (car tmp2)) (<= tmp1 (cdr tmp2))) tmp2)
                  ((eq (1+ tmp1) (car tmp2)) (cons tmp1 (cdr tmp2)))
                  ((eq (1- tmp1) (cdr tmp2)) (cons (car tmp2) tmp1))
                  (t nil)))
                ((numberp tmp2)
                  ((and (>= tmp1 (car tmp2)) (<= tmp1 (cdr tmp2))) tmp2)
                  ((eq (1+ tmp1) (car tmp2)) (cons tmp1 (cdr tmp2)))
                  ((eq (1- tmp1) (cdr tmp2)) (cons (car tmp2) tmp1))
                  (t nil)))
                ((numberp tmp2)

-                (cond 
+                (cond

                  ((and (>= tmp2 (car tmp1)) (<= tmp2 (cdr tmp1))) tmp1)
                  ((eq (1+ tmp2) (car tmp1)) (cons tmp2 (cdr tmp1)))
                  ((eq (1- tmp2) (cdr tmp1)) (cons (car tmp1) tmp2))
                  (t nil)))
                ((< (1+ (cdr tmp1)) (car tmp2)) nil)
                ((< (1+ (cdr tmp2)) (car tmp1)) nil)
                  ((and (>= tmp2 (car tmp1)) (<= tmp2 (cdr tmp1))) tmp1)
                  ((eq (1+ tmp2) (car tmp1)) (cons tmp2 (cdr tmp1)))
                  ((eq (1- tmp2) (cdr tmp1)) (cons (car tmp1) tmp2))
                  (t nil)))
                ((< (1+ (cdr tmp1)) (car tmp2)) nil)
                ((< (1+ (cdr tmp2)) (car tmp1)) nil)

-               (t (cons (min (car tmp1) (car tmp2)) 
+               (t (cons (min (car tmp1) (car tmp2))

                         (max (cdr tmp1) (cdr tmp2))))))
             (progn
               (if item (push item range))
                         (max (cdr tmp1) (cdr tmp2))))))
             (progn
               (if item (push item range))

diff --git a/lisp/gnus-salt.el b/lisp/gnus-salt.el
index c90f848..b67b81d 100644 (file)
--- a/lisp/gnus-salt.el
+++ b/lisp/gnus-salt.el
@@ -87,22 +87,22 @@ It accepts the same format specs that `gnus-summary-line-format' does."
 (defun gnus-pick-make-menu-bar ()
   (unless (boundp 'gnus-pick-menu)
     (easy-menu-define
 (defun gnus-pick-make-menu-bar ()
   (unless (boundp 'gnus-pick-menu)
     (easy-menu-define

-     gnus-pick-menu gnus-pick-mode-map ""
-     '("Pick"
-       ("Pick"
-       ["Article" gnus-summary-mark-as-processable t]
-       ["Thread" gnus-uu-mark-thread t]
-       ["Region" gnus-uu-mark-region t]
-       ["Regexp" gnus-uu-mark-by-regexp t]
-       ["Buffer" gnus-uu-mark-buffer t])
-       ("Unpick"
-       ["Article" gnus-summary-unmark-as-processable t]
-       ["Thread" gnus-uu-unmark-thread t]
-       ["Region" gnus-uu-unmark-region t]
-       ["Regexp" gnus-uu-unmark-by-regexp t]
-       ["Buffer" gnus-summary-unmark-all-processable t])
-       ["Start reading" gnus-pick-start-reading t]
-       ["Switch pick mode off" gnus-pick-mode gnus-pick-mode]))))
+      gnus-pick-menu gnus-pick-mode-map ""
+      '("Pick"
+       ("Pick"
+        ["Article" gnus-summary-mark-as-processable t]
+        ["Thread" gnus-uu-mark-thread t]
+        ["Region" gnus-uu-mark-region t]
+        ["Regexp" gnus-uu-mark-by-regexp t]
+        ["Buffer" gnus-uu-mark-buffer t])
+       ("Unpick"
+        ["Article" gnus-summary-unmark-as-processable t]
+        ["Thread" gnus-uu-unmark-thread t]
+        ["Region" gnus-uu-unmark-region t]
+        ["Regexp" gnus-uu-unmark-by-regexp t]
+        ["Buffer" gnus-summary-unmark-all-processable t])
+       ["Start reading" gnus-pick-start-reading t]
+       ["Switch pick mode off" gnus-pick-mode gnus-pick-mode]))))

 
 (defun gnus-pick-mode (&optional arg)
   "Minor mode for providing a pick-and-read interface in Gnus summary buffers.
 
 (defun gnus-pick-mode (&optional arg)
   "Minor mode for providing a pick-and-read interface in Gnus summary buffers.


@@ -153,11 +153,11 @@ If given a prefix, mark all unpicked articles as read."
   (interactive "P")
   (if gnus-newsgroup-processable
       (progn
   (interactive "P")
   (if gnus-newsgroup-processable
       (progn

-        (gnus-summary-limit-to-articles nil)
-        (when (or catch-up gnus-mark-unpicked-articles-as-read)
+       (gnus-summary-limit-to-articles nil)
+       (when (or catch-up gnus-mark-unpicked-articles-as-read)

          (gnus-summary-limit-mark-excluded-as-read))
          (gnus-summary-limit-mark-excluded-as-read))

-        (gnus-summary-first-article)
-        (gnus-configure-windows
+       (gnus-summary-first-article)
+       (gnus-configure-windows

         (if gnus-pick-display-summary 'article 'pick) t))
     (if gnus-pick-elegant-flow
        (progn
         (if gnus-pick-display-summary 'article 'pick) t))
     (if gnus-pick-elegant-flow
        (progn


@@ -228,7 +228,7 @@ This must be bound to a button-down mouse event."
   (let* ((echo-keystrokes 0)
         (start-posn (event-start start-event))
         (start-point (posn-point start-posn))
   (let* ((echo-keystrokes 0)
         (start-posn (event-start start-event))
         (start-point (posn-point start-posn))

-         (start-line (1+ (count-lines 1 start-point)))
+        (start-line (1+ (count-lines 1 start-point)))

         (start-window (posn-window start-posn))
         (bounds (gnus-window-edges start-window))
         (top (nth 1 bounds))
         (start-window (posn-window start-posn))
         (bounds (gnus-window-edges start-window))
         (top (nth 1 bounds))


@@ -240,7 +240,7 @@ This must be bound to a button-down mouse event."
     (setq mouse-selection-click-count click-count)
     (setq mouse-selection-click-count-buffer (current-buffer))
     (mouse-set-point start-event)
     (setq mouse-selection-click-count click-count)
     (setq mouse-selection-click-count-buffer (current-buffer))
     (mouse-set-point start-event)

-    ;; In case the down click is in the middle of some intangible text,
+   ;; In case the down click is in the middle of some intangible text,

     ;; use the end of that text, and put it in START-POINT.
     (when (< (point) start-point)
       (goto-char start-point))
     ;; use the end of that text, and put it in START-POINT.
     (when (< (point) start-point)
       (goto-char start-point))


@@ -251,61 +251,61 @@ This must be bound to a button-down mouse event."
     ;; (but not outside the window where the drag started).
     (let (event end end-point (end-of-range (point)))
       (track-mouse
     ;; (but not outside the window where the drag started).
     (let (event end end-point (end-of-range (point)))
       (track-mouse

-       (while (progn
-               (setq event (cdr (gnus-read-event-char)))
-               (or (mouse-movement-p event)
-                   (eq (car-safe event) 'switch-frame)))
-        (if (eq (car-safe event) 'switch-frame)
-            nil
-          (setq end (event-end event)
-                end-point (posn-point end))
-
-          (cond
-           ;; Are we moving within the original window?
-           ((and (eq (posn-window end) start-window)
-                 (integer-or-marker-p end-point))
-            ;; Go to START-POINT first, so that when we move to END-POINT,
-            ;; if it's in the middle of intangible text,
-            ;; point jumps in the direction away from START-POINT.
-            (goto-char start-point)
-            (goto-char end-point)
-            (gnus-pick-article)
-            ;; In case the user moved his mouse really fast, pick
-            ;; articles on the line between this one and the last one.
-            (let* ((this-line (1+ (count-lines 1 end-point)))
-                   (min-line (min this-line start-line))
-                   (max-line (max this-line start-line)))
-              (while (< min-line max-line)
-                (goto-line min-line)
-                (gnus-pick-article)
-                (setq min-line (1+ min-line)))
-              (setq start-line this-line))
-            (when (zerop (% click-count 3))
-              (setq end-of-range (point))))
-           (t
-            (let ((mouse-row (cdr (cdr (mouse-position)))))
-              (cond
-               ((null mouse-row))
-               ((< mouse-row top)
-                (mouse-scroll-subr start-window (- mouse-row top)))
-               ((>= mouse-row bottom)
-                (mouse-scroll-subr start-window
-                                   (1+ (- mouse-row bottom)))))))))))
+       (while (progn
+                (setq event (cdr (gnus-read-event-char)))
+                (or (mouse-movement-p event)
+                    (eq (car-safe event) 'switch-frame)))
+         (if (eq (car-safe event) 'switch-frame)
+             nil
+           (setq end (event-end event)
+                 end-point (posn-point end))
+
+           (cond
+            ;; Are we moving within the original window?
+            ((and (eq (posn-window end) start-window)
+                  (integer-or-marker-p end-point))
+       ;; Go to START-POINT first, so that when we move to END-POINT,
+             ;; if it's in the middle of intangible text,
+             ;; point jumps in the direction away from START-POINT.
+             (goto-char start-point)
+             (goto-char end-point)
+             (gnus-pick-article)
+             ;; In case the user moved his mouse really fast, pick
+           ;; articles on the line between this one and the last one.
+             (let* ((this-line (1+ (count-lines 1 end-point)))
+                    (min-line (min this-line start-line))
+                    (max-line (max this-line start-line)))
+               (while (< min-line max-line)
+                 (goto-line min-line)
+                 (gnus-pick-article)
+                 (setq min-line (1+ min-line)))
+               (setq start-line this-line))
+             (when (zerop (% click-count 3))
+               (setq end-of-range (point))))
+            (t
+             (let ((mouse-row (cdr (cdr (mouse-position)))))
+               (cond
+                ((null mouse-row))
+                ((< mouse-row top)
+                 (mouse-scroll-subr start-window (- mouse-row top)))
+                ((>= mouse-row bottom)
+                 (mouse-scroll-subr start-window
+                                    (1+ (- mouse-row bottom)))))))))))

       (when (consp event)
        (let ((fun (key-binding (vector (car event)))))
          ;; Run the binding of the terminating up-event, if possible.
       (when (consp event)
        (let ((fun (key-binding (vector (car event)))))
          ;; Run the binding of the terminating up-event, if possible.

-         ;; In the case of a multiple click, it gives the wrong results,
+       ;; In the case of a multiple click, it gives the wrong results,

          ;; because it would fail to set up a region.
          (when nil
          ;; because it would fail to set up a region.
          (when nil

-           ;; (and (= (mod mouse-selection-click-count 3) 0) (fboundp fun))
-           ;; In this case, we can just let the up-event execute normally.
+      ;; (and (= (mod mouse-selection-click-count 3) 0) (fboundp fun))
+       ;; In this case, we can just let the up-event execute normally.

            (let ((end (event-end event)))
              ;; Set the position in the event before we replay it,
              ;; because otherwise it may have a position in the wrong
              ;; buffer.
              (setcar (cdr end) end-of-range)
              ;; Delete the overlay before calling the function,
            (let ((end (event-end event)))
              ;; Set the position in the event before we replay it,
              ;; because otherwise it may have a position in the wrong
              ;; buffer.
              (setcar (cdr end) end-of-range)
              ;; Delete the overlay before calling the function,

-             ;; because delete-overlay increases buffer-modified-tick.
+            ;; because delete-overlay increases buffer-modified-tick.

              (push event unread-command-events))))))))
 
 (defun gnus-pick-next-page ()
              (push event unread-command-events))))))))
 
 (defun gnus-pick-next-page ()


@@ -338,9 +338,9 @@ This must be bound to a button-down mouse event."
 (defun gnus-binary-make-menu-bar ()
   (unless (boundp 'gnus-binary-menu)
     (easy-menu-define
 (defun gnus-binary-make-menu-bar ()
   (unless (boundp 'gnus-binary-menu)
     (easy-menu-define

-     gnus-binary-menu gnus-binary-mode-map ""
-     '("Pick"
-       ["Switch binary mode off" gnus-binary-mode t]))))
+      gnus-binary-menu gnus-binary-mode-map ""
+      '("Pick"
+       ["Switch binary mode off" gnus-binary-mode t]))))

 
 (defun gnus-binary-mode (&optional arg)
   "Minor mode for providing a binary group interface in Gnus summary buffers."
 
 (defun gnus-binary-mode (&optional arg)
   "Minor mode for providing a binary group interface in Gnus summary buffers."


@@ -470,9 +470,9 @@ Two predefined functions are available:
 (defun gnus-tree-make-menu-bar ()
   (unless (boundp 'gnus-tree-menu)
     (easy-menu-define
 (defun gnus-tree-make-menu-bar ()
   (unless (boundp 'gnus-tree-menu)
     (easy-menu-define

-     gnus-tree-menu gnus-tree-mode-map ""
-     '("Tree"
-       ["Select article" gnus-tree-select-article t]))))
+      gnus-tree-menu gnus-tree-mode-map ""
+      '("Tree"
+       ["Select article" gnus-tree-select-article t]))))

 
 (defun gnus-tree-mode ()
   "Major mode for displaying thread trees."
 
 (defun gnus-tree-mode ()
   "Major mode for displaying thread trees."


@@ -565,7 +565,7 @@ Two predefined functions are available:
             (bottom (save-excursion (goto-char (point-max))
                                     (forward-line (- height))
                                     (point))))
             (bottom (save-excursion (goto-char (point-max))
                                     (forward-line (- height))
                                     (point))))

-       ;; Set the window start to either `bottom', which is the biggest
+      ;; Set the window start to either `bottom', which is the biggest

        ;; possible valid number, or the second line from the top,
        ;; whichever is the least.
        (set-window-start
        ;; possible valid number, or the second line from the top,
        ;; whichever is the least.
        (set-window-start


@@ -859,7 +859,7 @@ Two predefined functions are available:
          (select-window (get-buffer-window (set-buffer gnus-tree-buffer) t))
          (gnus-horizontal-recenter)
          (select-window selected))))
          (select-window (get-buffer-window (set-buffer gnus-tree-buffer) t))
          (gnus-horizontal-recenter)
          (select-window selected))))

-    ;; If we remove this save-excursion, it updates the wrong mode lines?!?
+;; If we remove this save-excursion, it updates the wrong mode lines?!?

     (save-excursion
       (set-buffer gnus-tree-buffer)
       (gnus-set-mode-line 'tree))
     (save-excursion
       (set-buffer gnus-tree-buffer)
       (gnus-set-mode-line 'tree))

diff --git a/lisp/gnus-score.el b/lisp/gnus-score.el
index 81cfecd..160b513 100644 (file)
--- a/lisp/gnus-score.el
+++ b/lisp/gnus-score.el
@@ -47,7 +47,7 @@ score files in the \"/ftp.some-where:/pub/score\" directory.
 
  (setq gnus-global-score-files
        '(\"/ftp.gnus.org:/pub/larsi/ding/score/soc.motss.SCORE\"
 
  (setq gnus-global-score-files
        '(\"/ftp.gnus.org:/pub/larsi/ding/score/soc.motss.SCORE\"

-         \"/ftp.some-where:/pub/score\"))"
+        \"/ftp.some-where:/pub/score\"))"

   :group 'gnus-score-files
   :type '(repeat file))
 
   :group 'gnus-score-files
   :type '(repeat file))
 


@@ -1148,7 +1148,7 @@ EXTRA is the possible non-standard header."
          (mark-and-expunge (car (gnus-score-get 'mark-and-expunge alist)))
          (files (gnus-score-get 'files alist))
          (exclude-files (gnus-score-get 'exclude-files alist))
          (mark-and-expunge (car (gnus-score-get 'mark-and-expunge alist)))
          (files (gnus-score-get 'files alist))
          (exclude-files (gnus-score-get 'exclude-files alist))

-          (orphan (car (gnus-score-get 'orphan alist)))
+         (orphan (car (gnus-score-get 'orphan alist)))

          (adapt (gnus-score-get 'adapt alist))
          (thread-mark-and-expunge
           (car (gnus-score-get 'thread-mark-and-expunge alist)))
          (adapt (gnus-score-get 'adapt alist))
          (thread-mark-and-expunge
           (car (gnus-score-get 'thread-mark-and-expunge alist)))


@@ -1874,8 +1874,8 @@ score in GNUS-NEWSGROUP-SCORED by SCORE."
   ;; Insert the unique article headers in the buffer.
   (let ((gnus-score-index (nth 1 (assoc header gnus-header-index)))
        ;; gnus-score-index is used as a free variable.
   ;; Insert the unique article headers in the buffer.
   (let ((gnus-score-index (nth 1 (assoc header gnus-header-index)))
        ;; gnus-score-index is used as a free variable.

-        (simplify (and gnus-score-thread-simplify
-                       (string= "subject" header)))
+       (simplify (and gnus-score-thread-simplify
+                      (string= "subject" header)))

        alike last this art entries alist articles
        fuzzies arts words kill)
 
        alike last this art entries alist articles
        fuzzies arts words kill)
 


@@ -1939,10 +1939,10 @@ score in GNUS-NEWSGROUP-SCORED by SCORE."
               (dmt (downcase mt))
               ;; Assume user already simplified regexp and fuzzies
               (match (if (and simplify (not (memq dmt '(?f ?r))))
               (dmt (downcase mt))
               ;; Assume user already simplified regexp and fuzzies
               (match (if (and simplify (not (memq dmt '(?f ?r))))

-                          (gnus-map-function
-                           gnus-simplify-subject-functions
-                           (nth 0 kill))
-                        (nth 0 kill)))
+                         (gnus-map-function
+                          gnus-simplify-subject-functions
+                          (nth 0 kill))
+                       (nth 0 kill)))

               (search-func
                (cond ((= dmt ?r) 're-search-forward)
                      ((or (= dmt ?e) (= dmt ?s) (= dmt ?f)) 'search-forward)
               (search-func
                (cond ((= dmt ?r) 're-search-forward)
                      ((or (= dmt ?e) (= dmt ?s) (= dmt ?f)) 'search-forward)


@@ -2604,10 +2604,10 @@ GROUP using BNews sys file syntax."
          ;; we add this score file to the list of score files
          ;; applicable to this group.
          (when (or (and not-match
          ;; we add this score file to the list of score files
          ;; applicable to this group.
          (when (or (and not-match

-                        (ignore-errors
+                        (ignore-errors

                           (not (string-match regexp group-trans))))
                           (not (string-match regexp group-trans))))

-                   (and (not not-match)
-                        (ignore-errors (string-match regexp group-trans))))
+                   (and (not not-match)
+                        (ignore-errors (string-match regexp group-trans))))

            (push (car sfiles) ofiles)))
        (setq sfiles (cdr sfiles)))
       (kill-buffer (current-buffer))
            (push (car sfiles) ofiles)))
        (setq sfiles (cdr sfiles)))
       (kill-buffer (current-buffer))


@@ -2744,8 +2744,8 @@ The list is determined from the variable gnus-score-file-alist."
       (while funcs
        (when (gnus-functionp (car funcs))
          (setq score-files
       (while funcs
        (when (gnus-functionp (car funcs))
          (setq score-files

-               (nconc score-files 
-                       (nreverse (funcall (car funcs) group)))))
+               (nconc score-files
+                      (nreverse (funcall (car funcs) group)))))

        (setq funcs (cdr funcs)))
       (when gnus-score-use-all-scores
        ;; Add any home score files.
        (setq funcs (cdr funcs)))
       (when gnus-score-use-all-scores
        ;; Add any home score files.


@@ -2840,22 +2840,22 @@ If ADAPT, return the home adaptive file instead."
     (while (and (not found)
                (setq elem (pop list)))
       (setq found
     (while (and (not found)
                (setq elem (pop list)))
       (setq found

-            (cond
-             ;; Simple string.
-             ((stringp elem)
-              elem)
-             ;; Function.
-             ((gnus-functionp elem)
-              (funcall elem group))
-             ;; Regexp-file cons.
-             ((consp elem)
-              (when (string-match (gnus-globalify-regexp (car elem)) group)
-                (replace-match (cadr elem) t nil group))))))
+           (cond
+            ;; Simple string.
+            ((stringp elem)
+             elem)
+            ;; Function.
+            ((gnus-functionp elem)
+             (funcall elem group))
+            ;; Regexp-file cons.
+            ((consp elem)
+             (when (string-match (gnus-globalify-regexp (car elem)) group)
+               (replace-match (cadr elem) t nil group))))))

     (when found
       (setq found (nnheader-translate-file-chars found))
       (if (file-name-absolute-p found)
     (when found
       (setq found (nnheader-translate-file-chars found))
       (if (file-name-absolute-p found)

-          found
-        (nnheader-concat gnus-kill-files-directory found)))))
+         found
+       (nnheader-concat gnus-kill-files-directory found)))))

 
 (defun gnus-hierarchial-home-score-file (group)
   "Return the score file of the top-level hierarchy of GROUP."
 
 (defun gnus-hierarchial-home-score-file (group)
   "Return the score file of the top-level hierarchy of GROUP."

diff --git a/lisp/gnus-srvr.el b/lisp/gnus-srvr.el
index 8137349..19dc60c 100644 (file)
--- a/lisp/gnus-srvr.el
+++ b/lisp/gnus-srvr.el
@@ -836,7 +836,7 @@ buffer.
     (unless server
       (error "No server on the current line"))
     (condition-case ()
     (unless server
       (error "No server on the current line"))
     (condition-case ()

-       (gnus-get-function (gnus-server-to-method server) 
+       (gnus-get-function (gnus-server-to-method server)

                           'request-regenerate)
       (error
        (error "This backend doesn't support regeneration")))
                           'request-regenerate)
       (error
        (error "This backend doesn't support regeneration")))

diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el
index bb550c9..2f9257a 100644 (file)
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -1361,7 +1361,7 @@ newsgroup."
              group (gnus-info-group info))
        (unless (or (gnus-active group) ; Active
                    (and (gnus-info-method info)
              group (gnus-info-group info))
        (unless (or (gnus-active group) ; Active
                    (and (gnus-info-method info)

-                        (not (gnus-secondary-method-p 
+                        (not (gnus-secondary-method-p

                               (gnus-info-method info))))) ; Foreign
          ;; Found a bogus newsgroup.
          (push group bogus)))
                               (gnus-info-method info))))) ; Foreign
          ;; Found a bogus newsgroup.
          (push group bogus)))


@@ -1578,7 +1578,7 @@ newsgroup."
               (not (gnus-secondary-method-p method)))
          ;; These groups are foreign.  Check the level.
          (when (and (<= (gnus-info-level info) foreign-level)
               (not (gnus-secondary-method-p method)))
          ;; These groups are foreign.  Check the level.
          (when (and (<= (gnus-info-level info) foreign-level)

-                     (setq active (gnus-activate-group group 'scan)))
+                    (setq active (gnus-activate-group group 'scan)))

            ;; Let the Gnus agent save the active file.
            (when (and gnus-agent gnus-plugged active)
              (gnus-agent-save-group-info
            ;; Let the Gnus agent save the active file.
            (when (and gnus-agent gnus-plugged active)
              (gnus-agent-save-group-info


@@ -1619,8 +1619,8 @@ newsgroup."
                (setq active (gnus-activate-group group))
              (setq active (gnus-activate-group group 'scan))
              (push method scanned-methods))
                (setq active (gnus-activate-group group))
              (setq active (gnus-activate-group group 'scan))
              (push method scanned-methods))

-            (when active
-              (gnus-close-group group))))))
+           (when active
+             (gnus-close-group group))))))

 
       ;; Get the number of unread articles in the group.
       (cond
 
       ;; Get the number of unread articles in the group.
       (cond


@@ -1643,22 +1643,22 @@ newsgroup."
       (let ((method (or (car rg) gnus-select-method))
            (groups (cdr rg)))
        (when (gnus-check-server method)
       (let ((method (or (car rg) gnus-select-method))
            (groups (cdr rg)))
        (when (gnus-check-server method)

-          ;; Request that the backend scan its incoming messages.
-          (when (gnus-check-backend-function 'request-scan (car method))
-            (gnus-request-scan nil method))
-          (gnus-read-active-file-2
+         ;; Request that the backend scan its incoming messages.
+         (when (gnus-check-backend-function 'request-scan (car method))
+           (gnus-request-scan nil method))
+         (gnus-read-active-file-2

           (mapcar (lambda (group) (gnus-group-real-name group)) groups)
           method)
           (mapcar (lambda (group) (gnus-group-real-name group)) groups)
           method)

-          (dolist (group groups)
-            (cond
-             ((setq active (gnus-active (gnus-info-group
-                                         (setq info (gnus-get-info group)))))
-              (inline (gnus-get-unread-articles-in-group info active t)))
-             (t
-              ;; The group couldn't be reached, so we nix out the number of
-              ;; unread articles and stuff.
-              (gnus-set-active group nil)
-              (setcar (gnus-gethash group gnus-newsrc-hashtb) t)))))))
+         (dolist (group groups)
+           (cond
+            ((setq active (gnus-active (gnus-info-group
+                                        (setq info (gnus-get-info group)))))
+             (inline (gnus-get-unread-articles-in-group info active t)))
+            (t
+             ;; The group couldn't be reached, so we nix out the number of
+             ;; unread articles and stuff.
+             (gnus-set-active group nil)
+             (setcar (gnus-gethash group gnus-newsrc-hashtb) t)))))))

 
     (gnus-message 5 "Checking new news...done")))
 
 
     (gnus-message 5 "Checking new news...done")))
 


@@ -2080,7 +2080,7 @@ If FORCE is non-nil, the .newsrc file is read."
           (error "Error in %s" ding-file))))
       ;; Older versions of `gnus-format-specs' are no longer valid
       ;; in Oort Gnus 0.01.
           (error "Error in %s" ding-file))))
       ;; Older versions of `gnus-format-specs' are no longer valid
       ;; in Oort Gnus 0.01.

-      (let ((version 
+      (let ((version

             (and gnus-newsrc-file-version
                  (gnus-continuum-version gnus-newsrc-file-version))))
        (when (or (not version)
             (and gnus-newsrc-file-version
                  (gnus-continuum-version gnus-newsrc-file-version))))
        (when (or (not version)

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 4c3b4ba..b067e79 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -374,7 +374,7 @@ this variable specifies group names."
                         (cons :value ("" "") regexp (repeat string))
                         (sexp :value nil))))
 
                         (cons :value ("" "") regexp (repeat string))
                         (sexp :value nil))))
 

-(defcustom gnus-unread-mark ?  ;Whitespace
+(defcustom gnus-unread-mark ?           ;Whitespace

   "*Mark used for unread articles."
   :group 'gnus-summary-marks
   :type 'character)
   "*Mark used for unread articles."
   :group 'gnus-summary-marks
   :type 'character)


@@ -449,7 +449,7 @@ this variable specifies group names."
   :group 'gnus-summary-marks
   :type 'character)
 
   :group 'gnus-summary-marks
   :type 'character)
 

-(defcustom gnus-no-mark ?  ;Whitespace
+(defcustom gnus-no-mark ?               ;Whitespace

   "*Mark used for articles that have no other secondary mark."
   :group 'gnus-summary-marks
   :type 'character)
   "*Mark used for articles that have no other secondary mark."
   :group 'gnus-summary-marks
   :type 'character)


@@ -499,7 +499,7 @@ this variable specifies group names."
   :group 'gnus-summary-marks
   :type 'character)
 
   :group 'gnus-summary-marks
   :type 'character)
 

-(defcustom gnus-empty-thread-mark ?  ;Whitespace
+(defcustom gnus-empty-thread-mark ?     ;Whitespace

   "*There is no thread under the article."
   :group 'gnus-summary-marks
   :type 'character)
   "*There is no thread under the article."
   :group 'gnus-summary-marks
   :type 'character)


@@ -837,10 +837,10 @@ automatically when it is selected."
     ((= mark gnus-unread-mark)
      . gnus-summary-normal-unread-face)
     ((and (> score default-high) (memq mark (list gnus-downloadable-mark
     ((= mark gnus-unread-mark)
      . gnus-summary-normal-unread-face)
     ((and (> score default-high) (memq mark (list gnus-downloadable-mark

-                                            gnus-undownloaded-mark)))
+                                                 gnus-undownloaded-mark)))

      . gnus-summary-high-unread-face)
     ((and (< score default-low) (memq mark (list gnus-downloadable-mark
      . gnus-summary-high-unread-face)
     ((and (< score default-low) (memq mark (list gnus-downloadable-mark

-                                            gnus-undownloaded-mark)))
+                                                gnus-undownloaded-mark)))

      . gnus-summary-low-unread-face)
     ((and (memq mark (list gnus-downloadable-mark gnus-undownloaded-mark))
          (memq article gnus-newsgroup-unreads))
      . gnus-summary-low-unread-face)
     ((and (memq mark (list gnus-downloadable-mark gnus-undownloaded-mark))
          (memq article gnus-newsgroup-unreads))


@@ -907,7 +907,7 @@ default charset will be used instead."
  :function-document
  "Return the ignored charsets of GROUP."
  :variable gnus-group-ignored-charsets-alist
  :function-document
  "Return the ignored charsets of GROUP."
  :variable gnus-group-ignored-charsets-alist

- :variable-default 
+ :variable-default

  '(("alt\\.chinese\\.text" iso-8859-1))
  :variable-document
  "Alist of regexps (to match group names) and charsets that should be ignored.
  '(("alt\\.chinese\\.text" iso-8859-1))
  :variable-document
  "Alist of regexps (to match group names) and charsets that should be ignored.


@@ -916,7 +916,7 @@ default charset will be used instead."
  :variable-group gnus-charset
  :variable-type '(repeat (cons (regexp :tag "Group")
                               (repeat symbol)))
  :variable-group gnus-charset
  :variable-type '(repeat (cons (regexp :tag "Group")
                               (repeat symbol)))

- :parameter-type '(choice :tag "Ignored charsets" 
+ :parameter-type '(choice :tag "Ignored charsets"

                          :value nil
                          (repeat (symbol)))
  :parameter-document       "\
                          :value nil
                          (repeat (symbol)))
  :parameter-document       "\


@@ -1270,7 +1270,7 @@ For example:
                         (string-match (car x) gnus-newsgroup-name))
                    (nconc gnus-decode-encoded-word-methods-cache
                           (list (cdr x))))))
                         (string-match (car x) gnus-newsgroup-name))
                    (nconc gnus-decode-encoded-word-methods-cache
                           (list (cdr x))))))

-         gnus-decode-encoded-word-methods))
+           gnus-decode-encoded-word-methods))

   (let ((xlist gnus-decode-encoded-word-methods-cache))
     (pop xlist)
     (while xlist
   (let ((xlist gnus-decode-encoded-word-methods-cache))
     (pop xlist)
     (while xlist


@@ -1285,8 +1285,8 @@ For example:
     ;; Multiple spaces.
     (while (string-match "[ \t][ \t]+" mystr)
       (setq mystr (concat (substring mystr 0 (match-beginning 0))
     ;; Multiple spaces.
     (while (string-match "[ \t][ \t]+" mystr)
       (setq mystr (concat (substring mystr 0 (match-beginning 0))

-                          " "
-                          (substring mystr (match-end 0)))))
+                         " "
+                         (substring mystr (match-end 0)))))

     ;; Leading spaces.
     (when (string-match "^[ \t]+" mystr)
       (setq mystr (substring mystr (match-end 0))))
     ;; Leading spaces.
     (when (string-match "^[ \t]+" mystr)
       (setq mystr (substring mystr (match-end 0))))


@@ -1779,49 +1779,49 @@ increase the score of each group you read."
   (unless (boundp 'gnus-summary-misc-menu)
 
     (easy-menu-define
   (unless (boundp 'gnus-summary-misc-menu)
 
     (easy-menu-define

-     gnus-summary-kill-menu gnus-summary-mode-map ""
-     (cons
-      "Score"
-      (nconc
-       (list
-       ["Customize" gnus-score-customize t])
-       (gnus-make-score-map 'increase)
-       (gnus-make-score-map 'lower)
-       '(("Mark"
-         ["Kill below" gnus-summary-kill-below t]
-         ["Mark above" gnus-summary-mark-above t]
-         ["Tick above" gnus-summary-tick-above t]
-         ["Clear above" gnus-summary-clear-above t])
-        ["Current score" gnus-summary-current-score t]
-        ["Set score" gnus-summary-set-score t]
-        ["Switch current score file..." gnus-score-change-score-file t]
-        ["Set mark below..." gnus-score-set-mark-below t]
-        ["Set expunge below..." gnus-score-set-expunge-below t]
-        ["Edit current score file" gnus-score-edit-current-scores t]
-        ["Edit score file" gnus-score-edit-file t]
-        ["Trace score" gnus-score-find-trace t]
-        ["Find words" gnus-score-find-favourite-words t]
-        ["Rescore buffer" gnus-summary-rescore t]
-        ["Increase score..." gnus-summary-increase-score t]
-        ["Lower score..." gnus-summary-lower-score t]))))
-
-    ;; Define both the Article menu in the summary buffer and the equivalent
+      gnus-summary-kill-menu gnus-summary-mode-map ""
+      (cons
+       "Score"
+       (nconc
+       (list
+        ["Customize" gnus-score-customize t])
+       (gnus-make-score-map 'increase)
+       (gnus-make-score-map 'lower)
+       '(("Mark"
+          ["Kill below" gnus-summary-kill-below t]
+          ["Mark above" gnus-summary-mark-above t]
+          ["Tick above" gnus-summary-tick-above t]
+          ["Clear above" gnus-summary-clear-above t])
+         ["Current score" gnus-summary-current-score t]
+         ["Set score" gnus-summary-set-score t]
+         ["Switch current score file..." gnus-score-change-score-file t]
+         ["Set mark below..." gnus-score-set-mark-below t]
+         ["Set expunge below..." gnus-score-set-expunge-below t]
+         ["Edit current score file" gnus-score-edit-current-scores t]
+         ["Edit score file" gnus-score-edit-file t]
+         ["Trace score" gnus-score-find-trace t]
+         ["Find words" gnus-score-find-favourite-words t]
+         ["Rescore buffer" gnus-summary-rescore t]
+         ["Increase score..." gnus-summary-increase-score t]
+         ["Lower score..." gnus-summary-lower-score t]))))
+
+;; Define both the Article menu in the summary buffer and the equivalent

     ;; Commands menu in the article buffer here for consistency.
     (let ((innards
     ;; Commands menu in the article buffer here for consistency.
     (let ((innards

-           `(("Hide"
-              ["All" gnus-article-hide t]
-              ["Headers" gnus-article-hide-headers t]
-              ["Signature" gnus-article-hide-signature t]
-              ["Citation" gnus-article-hide-citation t]
+          `(("Hide"
+             ["All" gnus-article-hide t]
+             ["Headers" gnus-article-hide-headers t]
+             ["Signature" gnus-article-hide-signature t]
+             ["Citation" gnus-article-hide-citation t]

              ["List identifiers" gnus-article-hide-list-identifiers t]
              ["List identifiers" gnus-article-hide-list-identifiers t]

-              ["PGP" gnus-article-hide-pgp t]
+             ["PGP" gnus-article-hide-pgp t]

              ["Banner" gnus-article-strip-banner t]
              ["Banner" gnus-article-strip-banner t]

-              ["Boring headers" gnus-article-hide-boring-headers t])
-             ("Highlight"
-              ["All" gnus-article-highlight t]
-              ["Headers" gnus-article-highlight-headers t]
-              ["Signature" gnus-article-highlight-signature t]
-              ["Citation" gnus-article-highlight-citation t])
+             ["Boring headers" gnus-article-hide-boring-headers t])
+            ("Highlight"
+             ["All" gnus-article-highlight t]
+             ["Headers" gnus-article-highlight-headers t]
+             ["Signature" gnus-article-highlight-signature t]
+             ["Citation" gnus-article-highlight-citation t])

             ("MIME"
              ["Words" gnus-article-decode-mime-words t]
              ["Charset" gnus-article-decode-charset t]
             ("MIME"
              ["Words" gnus-article-decode-mime-words t]
              ["Charset" gnus-article-decode-charset t]


@@ -1830,182 +1830,182 @@ increase the score of each group you read."
              ["View all" gnus-mime-view-all-parts t]
              ["Verify and Decrypt" gnus-summary-force-verify-and-decrypt t]
              ["Encrypt body" gnus-article-encrypt-body t])
              ["View all" gnus-mime-view-all-parts t]
              ["Verify and Decrypt" gnus-summary-force-verify-and-decrypt t]
              ["Encrypt body" gnus-article-encrypt-body t])

-             ("Date"
-              ["Local" gnus-article-date-local t]
-              ["ISO8601" gnus-article-date-iso8601 t]
-              ["UT" gnus-article-date-ut t]
-              ["Original" gnus-article-date-original t]
-              ["Lapsed" gnus-article-date-lapsed t]
-              ["User-defined" gnus-article-date-user t])
-             ("Washing"
-              ("Remove Blanks"
-               ["Leading" gnus-article-strip-leading-blank-lines t]
-               ["Multiple" gnus-article-strip-multiple-blank-lines t]
-               ["Trailing" gnus-article-remove-trailing-blank-lines t]
-               ["All of the above" gnus-article-strip-blank-lines t]
-               ["All" gnus-article-strip-all-blank-lines t]
-               ["Leading space" gnus-article-strip-leading-space t]
+            ("Date"
+             ["Local" gnus-article-date-local t]
+             ["ISO8601" gnus-article-date-iso8601 t]
+             ["UT" gnus-article-date-ut t]
+             ["Original" gnus-article-date-original t]
+             ["Lapsed" gnus-article-date-lapsed t]
+             ["User-defined" gnus-article-date-user t])
+            ("Washing"
+             ("Remove Blanks"
+              ["Leading" gnus-article-strip-leading-blank-lines t]
+              ["Multiple" gnus-article-strip-multiple-blank-lines t]
+              ["Trailing" gnus-article-remove-trailing-blank-lines t]
+              ["All of the above" gnus-article-strip-blank-lines t]
+              ["All" gnus-article-strip-all-blank-lines t]
+              ["Leading space" gnus-article-strip-leading-space t]

               ["Trailing space" gnus-article-strip-trailing-space t]
               ["Trailing space" gnus-article-strip-trailing-space t]

-               ["Leading space in headers" 
+              ["Leading space in headers"

                gnus-article-remove-leading-whitespace t])
                gnus-article-remove-leading-whitespace t])

-              ["Overstrike" gnus-article-treat-overstrike t]
-              ["Dumb quotes" gnus-article-treat-dumbquotes t]
-              ["Emphasis" gnus-article-emphasize t]
-              ["Word wrap" gnus-article-fill-cited-article t]
+             ["Overstrike" gnus-article-treat-overstrike t]
+             ["Dumb quotes" gnus-article-treat-dumbquotes t]
+             ["Emphasis" gnus-article-emphasize t]
+             ["Word wrap" gnus-article-fill-cited-article t]

              ["Fill long lines" gnus-article-fill-long-lines t]
              ["Capitalize sentences" gnus-article-capitalize-sentences t]
              ["Fill long lines" gnus-article-fill-long-lines t]
              ["Capitalize sentences" gnus-article-capitalize-sentences t]

-              ["CR" gnus-article-remove-cr t]
-              ["Show X-Face" gnus-article-display-x-face t]
-              ["Quoted-Printable" gnus-article-de-quoted-unreadable t]
-              ["Base64" gnus-article-de-base64-unreadable t]
-              ["Rot 13" gnus-summary-caesar-message
+             ["CR" gnus-article-remove-cr t]
+             ["Show X-Face" gnus-article-display-x-face t]
+             ["Quoted-Printable" gnus-article-de-quoted-unreadable t]
+             ["Base64" gnus-article-de-base64-unreadable t]
+             ["Rot 13" gnus-summary-caesar-message

               ,@(if (featurep 'xemacs) '(t)
                   '(:help "\"Caesar rotate\" article by 13"))]
               ,@(if (featurep 'xemacs) '(t)
                   '(:help "\"Caesar rotate\" article by 13"))]

-              ["Unix pipe" gnus-summary-pipe-message t]
-              ["Add buttons" gnus-article-add-buttons t]
-              ["Add buttons to head" gnus-article-add-buttons-to-head t]
-              ["Stop page breaking" gnus-summary-stop-page-breaking t]
-              ["Verbose header" gnus-summary-verbose-headers t]
-              ["Toggle header" gnus-summary-toggle-header t]
+             ["Unix pipe" gnus-summary-pipe-message t]
+             ["Add buttons" gnus-article-add-buttons t]
+             ["Add buttons to head" gnus-article-add-buttons-to-head t]
+             ["Stop page breaking" gnus-summary-stop-page-breaking t]
+             ["Verbose header" gnus-summary-verbose-headers t]
+             ["Toggle header" gnus-summary-toggle-header t]

              ["Html" gnus-article-wash-html t]
              ["Verify X-PGP-Sig" gnus-article-verify-x-pgp-sig t]
              ["HZ" gnus-article-decode-HZ t])
              ["Html" gnus-article-wash-html t]
              ["Verify X-PGP-Sig" gnus-article-verify-x-pgp-sig t]
              ["HZ" gnus-article-decode-HZ t])

-             ("Output"
-              ["Save in default format" gnus-summary-save-article
+            ("Output"
+             ["Save in default format" gnus-summary-save-article

               ,@(if (featurep 'xemacs) '(t)
                   '(:help "Save article using default method"))]
               ,@(if (featurep 'xemacs) '(t)
                   '(:help "Save article using default method"))]

-              ["Save in file" gnus-summary-save-article-file
+             ["Save in file" gnus-summary-save-article-file

               ,@(if (featurep 'xemacs) '(t)
                   '(:help "Save article in file"))]
               ,@(if (featurep 'xemacs) '(t)
                   '(:help "Save article in file"))]

-              ["Save in Unix mail format" gnus-summary-save-article-mail t]
-              ["Save in MH folder" gnus-summary-save-article-folder t]
-              ["Save in VM folder" gnus-summary-save-article-vm t]
-              ["Save in RMAIL mbox" gnus-summary-save-article-rmail t]
-              ["Save body in file" gnus-summary-save-article-body-file t]
-              ["Pipe through a filter" gnus-summary-pipe-output t]
-              ["Add to SOUP packet" gnus-soup-add-article t]
-              ["Print" gnus-summary-print-article t])
-             ("Backend"
-              ["Respool article..." gnus-summary-respool-article t]
-              ["Move article..." gnus-summary-move-article
-               (gnus-check-backend-function
-                'request-move-article gnus-newsgroup-name)]
-              ["Copy article..." gnus-summary-copy-article t]
-              ["Crosspost article..." gnus-summary-crosspost-article
-               (gnus-check-backend-function
-                'request-replace-article gnus-newsgroup-name)]
-              ["Import file..." gnus-summary-import-article t]
-              ["Create article..." gnus-summary-create-article t]
-              ["Check if posted" gnus-summary-article-posted-p t]
-              ["Edit article" gnus-summary-edit-article
-               (not (gnus-group-read-only-p))]
-              ["Delete article" gnus-summary-delete-article
-               (gnus-check-backend-function
-                'request-expire-articles gnus-newsgroup-name)]
-              ["Query respool" gnus-summary-respool-query t]
+             ["Save in Unix mail format" gnus-summary-save-article-mail t]
+             ["Save in MH folder" gnus-summary-save-article-folder t]
+             ["Save in VM folder" gnus-summary-save-article-vm t]
+             ["Save in RMAIL mbox" gnus-summary-save-article-rmail t]
+             ["Save body in file" gnus-summary-save-article-body-file t]
+             ["Pipe through a filter" gnus-summary-pipe-output t]
+             ["Add to SOUP packet" gnus-soup-add-article t]
+             ["Print" gnus-summary-print-article t])
+            ("Backend"
+             ["Respool article..." gnus-summary-respool-article t]
+             ["Move article..." gnus-summary-move-article
+              (gnus-check-backend-function
+               'request-move-article gnus-newsgroup-name)]
+             ["Copy article..." gnus-summary-copy-article t]
+             ["Crosspost article..." gnus-summary-crosspost-article
+              (gnus-check-backend-function
+               'request-replace-article gnus-newsgroup-name)]
+             ["Import file..." gnus-summary-import-article t]
+             ["Create article..." gnus-summary-create-article t]
+             ["Check if posted" gnus-summary-article-posted-p t]
+             ["Edit article" gnus-summary-edit-article
+              (not (gnus-group-read-only-p))]
+             ["Delete article" gnus-summary-delete-article
+              (gnus-check-backend-function
+               'request-expire-articles gnus-newsgroup-name)]
+             ["Query respool" gnus-summary-respool-query t]

              ["Trace respool" gnus-summary-respool-trace t]
              ["Trace respool" gnus-summary-respool-trace t]

-              ["Delete expirable articles" gnus-summary-expire-articles-now
-               (gnus-check-backend-function
-                'request-expire-articles gnus-newsgroup-name)])
-             ("Extract"
-              ["Uudecode" gnus-uu-decode-uu
+             ["Delete expirable articles" gnus-summary-expire-articles-now
+              (gnus-check-backend-function
+               'request-expire-articles gnus-newsgroup-name)])
+            ("Extract"
+             ["Uudecode" gnus-uu-decode-uu

               ,@(if (featurep 'xemacs) '(t)
                   '(:help "Decode uuencoded article(s)"))]
               ,@(if (featurep 'xemacs) '(t)
                   '(:help "Decode uuencoded article(s)"))]

-              ["Uudecode and save" gnus-uu-decode-uu-and-save t]
-              ["Unshar" gnus-uu-decode-unshar t]
-              ["Unshar and save" gnus-uu-decode-unshar-and-save t]
-              ["Save" gnus-uu-decode-save t]
-              ["Binhex" gnus-uu-decode-binhex t]
-              ["Postscript" gnus-uu-decode-postscript t])
-             ("Cache"
-              ["Enter article" gnus-cache-enter-article t]
-              ["Remove article" gnus-cache-remove-article t])
+             ["Uudecode and save" gnus-uu-decode-uu-and-save t]
+             ["Unshar" gnus-uu-decode-unshar t]
+             ["Unshar and save" gnus-uu-decode-unshar-and-save t]
+             ["Save" gnus-uu-decode-save t]
+             ["Binhex" gnus-uu-decode-binhex t]
+             ["Postscript" gnus-uu-decode-postscript t])
+            ("Cache"
+             ["Enter article" gnus-cache-enter-article t]
+             ["Remove article" gnus-cache-remove-article t])

             ["Translate" gnus-article-babel t]
             ["Translate" gnus-article-babel t]

-             ["Select article buffer" gnus-summary-select-article-buffer t]
-             ["Enter digest buffer" gnus-summary-enter-digest-group t]
-             ["Isearch article..." gnus-summary-isearch-article t]
-             ["Beginning of the article" gnus-summary-beginning-of-article t]
-             ["End of the article" gnus-summary-end-of-article t]
-             ["Fetch parent of article" gnus-summary-refer-parent-article t]
-             ["Fetch referenced articles" gnus-summary-refer-references t]
-             ["Fetch current thread" gnus-summary-refer-thread t]
-             ["Fetch article with id..." gnus-summary-refer-article t]
-             ["Setup Mailing List Params" gnus-mailing-list-insinuate t]
-             ["Redisplay" gnus-summary-show-article t]
-             ["Raw article" gnus-summary-show-raw-article t])))
+            ["Select article buffer" gnus-summary-select-article-buffer t]
+            ["Enter digest buffer" gnus-summary-enter-digest-group t]
+            ["Isearch article..." gnus-summary-isearch-article t]
+            ["Beginning of the article" gnus-summary-beginning-of-article t]
+            ["End of the article" gnus-summary-end-of-article t]
+            ["Fetch parent of article" gnus-summary-refer-parent-article t]
+            ["Fetch referenced articles" gnus-summary-refer-references t]
+            ["Fetch current thread" gnus-summary-refer-thread t]
+            ["Fetch article with id..." gnus-summary-refer-article t]
+            ["Setup Mailing List Params" gnus-mailing-list-insinuate t]
+            ["Redisplay" gnus-summary-show-article t]
+            ["Raw article" gnus-summary-show-raw-article t])))

       (easy-menu-define
       (easy-menu-define

-       gnus-summary-article-menu gnus-summary-mode-map ""
-       (cons "Article" innards))
+       gnus-summary-article-menu gnus-summary-mode-map ""
+       (cons "Article" innards))

 
       (if (not (keymapp gnus-summary-article-menu))
          (easy-menu-define
            gnus-article-commands-menu gnus-article-mode-map ""
            (cons "Commands" innards))
        ;; in Emacs, don't share menu.
 
       (if (not (keymapp gnus-summary-article-menu))
          (easy-menu-define
            gnus-article-commands-menu gnus-article-mode-map ""
            (cons "Commands" innards))
        ;; in Emacs, don't share menu.

-       (setq gnus-article-commands-menu 
+       (setq gnus-article-commands-menu

              (copy-keymap gnus-summary-article-menu))
        (define-key gnus-article-mode-map [menu-bar commands]
          (cons "Commands" gnus-article-commands-menu))))
 
     (easy-menu-define
              (copy-keymap gnus-summary-article-menu))
        (define-key gnus-article-mode-map [menu-bar commands]
          (cons "Commands" gnus-article-commands-menu))))
 
     (easy-menu-define

-     gnus-summary-thread-menu gnus-summary-mode-map ""
-     '("Threads"
-       ["Toggle threading" gnus-summary-toggle-threads t]
-       ["Hide threads" gnus-summary-hide-all-threads t]
-       ["Show threads" gnus-summary-show-all-threads t]
-       ["Hide thread" gnus-summary-hide-thread t]
-       ["Show thread" gnus-summary-show-thread t]
-       ["Go to next thread" gnus-summary-next-thread t]
-       ["Go to previous thread" gnus-summary-prev-thread t]
-       ["Go down thread" gnus-summary-down-thread t]
-       ["Go up thread" gnus-summary-up-thread t]
-       ["Top of thread" gnus-summary-top-thread t]
-       ["Mark thread as read" gnus-summary-kill-thread t]
-       ["Lower thread score" gnus-summary-lower-thread t]
-       ["Raise thread score" gnus-summary-raise-thread t]
-       ["Rethread current" gnus-summary-rethread-current t]))
+      gnus-summary-thread-menu gnus-summary-mode-map ""
+      '("Threads"
+       ["Toggle threading" gnus-summary-toggle-threads t]
+       ["Hide threads" gnus-summary-hide-all-threads t]
+       ["Show threads" gnus-summary-show-all-threads t]
+       ["Hide thread" gnus-summary-hide-thread t]
+       ["Show thread" gnus-summary-show-thread t]
+       ["Go to next thread" gnus-summary-next-thread t]
+       ["Go to previous thread" gnus-summary-prev-thread t]
+       ["Go down thread" gnus-summary-down-thread t]
+       ["Go up thread" gnus-summary-up-thread t]
+       ["Top of thread" gnus-summary-top-thread t]
+       ["Mark thread as read" gnus-summary-kill-thread t]
+       ["Lower thread score" gnus-summary-lower-thread t]
+       ["Raise thread score" gnus-summary-raise-thread t]
+       ["Rethread current" gnus-summary-rethread-current t]))

 
     (easy-menu-define
 
     (easy-menu-define

-     gnus-summary-post-menu gnus-summary-mode-map ""
-     `("Post"
-       ["Post an article" gnus-summary-post-news
-       ,@(if (featurep 'xemacs) '(t)
-           '(:help "Post an article"))]
-       ["Followup" gnus-summary-followup
-       ,@(if (featurep 'xemacs) '(t)
-           '(:help "Post followup to this article"))]
-       ["Followup and yank" gnus-summary-followup-with-original
-       ,@(if (featurep 'xemacs) '(t)
-           '(:help "Post followup to this article, quoting its contents"))]
-       ["Supersede article" gnus-summary-supersede-article t]
-       ["Cancel article" gnus-summary-cancel-article
-       ,@(if (featurep 'xemacs) '(t)
-           '(:help "Cancel an article you posted"))]
-       ["Reply" gnus-summary-reply t]
-       ["Reply and yank" gnus-summary-reply-with-original t]
-       ["Wide reply" gnus-summary-wide-reply t]
-       ["Wide reply and yank" gnus-summary-wide-reply-with-original
-       ,@(if (featurep 'xemacs) '(t)
-           '(:help "Mail a reply, quoting this article"))]
-       ["Mail forward" gnus-summary-mail-forward t]
-       ["Post forward" gnus-summary-post-forward t]
-       ["Digest and mail" gnus-uu-digest-mail-forward t]
-       ["Digest and post" gnus-uu-digest-post-forward t]
-       ["Resend message" gnus-summary-resend-message t]
-       ["Send bounced mail" gnus-summary-resend-bounced-mail t]
-       ["Send a mail" gnus-summary-mail-other-window t]
-       ["Uuencode and post" gnus-uu-post-news
-       ,@(if (featurep 'xemacs) '(t)
-           '(:help "Post a uuencoded article"))]
-       ["Followup via news" gnus-summary-followup-to-mail t]
-       ["Followup via news and yank"
-       gnus-summary-followup-to-mail-with-original t]
-       ;;("Draft"
-       ;;["Send" gnus-summary-send-draft t]
-       ;;["Send bounced" gnus-resend-bounced-mail t])
-       ))
-
-    (cond 
+      gnus-summary-post-menu gnus-summary-mode-map ""
+      `("Post"
+       ["Post an article" gnus-summary-post-news
+        ,@(if (featurep 'xemacs) '(t)
+            '(:help "Post an article"))]
+       ["Followup" gnus-summary-followup
+        ,@(if (featurep 'xemacs) '(t)
+            '(:help "Post followup to this article"))]
+       ["Followup and yank" gnus-summary-followup-with-original
+        ,@(if (featurep 'xemacs) '(t)
+            '(:help "Post followup to this article, quoting its contents"))]
+       ["Supersede article" gnus-summary-supersede-article t]
+       ["Cancel article" gnus-summary-cancel-article
+        ,@(if (featurep 'xemacs) '(t)
+            '(:help "Cancel an article you posted"))]
+       ["Reply" gnus-summary-reply t]
+       ["Reply and yank" gnus-summary-reply-with-original t]
+       ["Wide reply" gnus-summary-wide-reply t]
+       ["Wide reply and yank" gnus-summary-wide-reply-with-original
+        ,@(if (featurep 'xemacs) '(t)
+            '(:help "Mail a reply, quoting this article"))]
+       ["Mail forward" gnus-summary-mail-forward t]
+       ["Post forward" gnus-summary-post-forward t]
+       ["Digest and mail" gnus-uu-digest-mail-forward t]
+       ["Digest and post" gnus-uu-digest-post-forward t]
+       ["Resend message" gnus-summary-resend-message t]
+       ["Send bounced mail" gnus-summary-resend-bounced-mail t]
+       ["Send a mail" gnus-summary-mail-other-window t]
+       ["Uuencode and post" gnus-uu-post-news
+        ,@(if (featurep 'xemacs) '(t)
+            '(:help "Post a uuencoded article"))]
+       ["Followup via news" gnus-summary-followup-to-mail t]
+       ["Followup via news and yank"
+        gnus-summary-followup-to-mail-with-original t]
+       ;;("Draft"
+       ;;["Send" gnus-summary-send-draft t]
+       ;;["Send bounced" gnus-resend-bounced-mail t])
+       ))
+
+    (cond

      ((not (keymapp gnus-summary-post-menu))
       (setq gnus-article-post-menu gnus-summary-post-menu))
      ((not gnus-article-post-menu)
      ((not (keymapp gnus-summary-post-menu))
       (setq gnus-article-post-menu gnus-summary-post-menu))
      ((not gnus-article-post-menu)


@@ -2016,139 +2016,139 @@ increase the score of each group you read."
       (cons "Post" gnus-article-post-menu))
 
     (easy-menu-define
       (cons "Post" gnus-article-post-menu))
 
     (easy-menu-define

-     gnus-summary-misc-menu gnus-summary-mode-map ""
-     `("Misc"
-       ("Mark Read"
-       ["Mark as read" gnus-summary-mark-as-read-forward t]
-       ["Mark same subject and select"
-        gnus-summary-kill-same-subject-and-select t]
-       ["Mark same subject" gnus-summary-kill-same-subject t]
-       ["Catchup" gnus-summary-catchup
-        ,@(if (featurep 'xemacs) '(t)
-            '(:help "Mark unread articles in this group as read"))]
-       ["Catchup all" gnus-summary-catchup-all t]
-       ["Catchup to here" gnus-summary-catchup-to-here t]
-       ["Catchup from here" gnus-summary-catchup-from-here t]
-       ["Catchup region" gnus-summary-mark-region-as-read t]
-       ["Mark excluded" gnus-summary-limit-mark-excluded-as-read t])
-       ("Mark Various"
-       ["Tick" gnus-summary-tick-article-forward t]
-       ["Mark as dormant" gnus-summary-mark-as-dormant t]
-       ["Remove marks" gnus-summary-clear-mark-forward t]
-       ["Set expirable mark" gnus-summary-mark-as-expirable t]
-       ["Set bookmark" gnus-summary-set-bookmark t]
-       ["Remove bookmark" gnus-summary-remove-bookmark t])
-       ("Mark Limit"
-       ["Marks..." gnus-summary-limit-to-marks t]
-       ["Subject..." gnus-summary-limit-to-subject t]
-       ["Author..." gnus-summary-limit-to-author t]
-       ["Age..." gnus-summary-limit-to-age t]
-       ["Extra..." gnus-summary-limit-to-extra t]
-       ["Score" gnus-summary-limit-to-score t]
-       ["Unread" gnus-summary-limit-to-unread t]
-       ["Non-dormant" gnus-summary-limit-exclude-dormant t]
-       ["Articles" gnus-summary-limit-to-articles t]
-       ["Pop limit" gnus-summary-pop-limit t]
-       ["Show dormant" gnus-summary-limit-include-dormant t]
-       ["Hide childless dormant"
-        gnus-summary-limit-exclude-childless-dormant t]
-       ;;["Hide thread" gnus-summary-limit-exclude-thread t]
-       ["Hide marked" gnus-summary-limit-exclude-marks t]
-       ["Show expunged" gnus-summary-limit-include-expunged t])
-       ("Process Mark"
-       ["Set mark" gnus-summary-mark-as-processable t]
-       ["Remove mark" gnus-summary-unmark-as-processable t]
-       ["Remove all marks" gnus-summary-unmark-all-processable t]
-       ["Mark above" gnus-uu-mark-over t]
-       ["Mark series" gnus-uu-mark-series t]
-       ["Mark region" gnus-uu-mark-region t]
-       ["Unmark region" gnus-uu-unmark-region t]
-       ["Mark by regexp..." gnus-uu-mark-by-regexp t]
-        ["Unmark by regexp..." gnus-uu-unmark-by-regexp t]
-       ["Mark all" gnus-uu-mark-all t]
-       ["Mark buffer" gnus-uu-mark-buffer t]
-       ["Mark sparse" gnus-uu-mark-sparse t]
-       ["Mark thread" gnus-uu-mark-thread t]
-       ["Unmark thread" gnus-uu-unmark-thread t]
-       ("Process Mark Sets"
-        ["Kill" gnus-summary-kill-process-mark t]
-        ["Yank" gnus-summary-yank-process-mark
-         gnus-newsgroup-process-stack]
-        ["Save" gnus-summary-save-process-mark t]))
-       ("Scroll article"
-       ["Page forward" gnus-summary-next-page
-        ,@(if (featurep 'xemacs) '(t)
-            '(:help "Show next page of article"))]
-       ["Page backward" gnus-summary-prev-page
-        ,@(if (featurep 'xemacs) '(t)
-            '(:help "Show previous page of article"))]
-       ["Line forward" gnus-summary-scroll-up t])
-       ("Move"
-       ["Next unread article" gnus-summary-next-unread-article t]
-       ["Previous unread article" gnus-summary-prev-unread-article t]
-       ["Next article" gnus-summary-next-article t]
-       ["Previous article" gnus-summary-prev-article t]
-       ["Next unread subject" gnus-summary-next-unread-subject t]
-       ["Previous unread subject" gnus-summary-prev-unread-subject t]
-       ["Next article same subject" gnus-summary-next-same-subject t]
-       ["Previous article same subject" gnus-summary-prev-same-subject t]
-       ["First unread article" gnus-summary-first-unread-article t]
-       ["Best unread article" gnus-summary-best-unread-article t]
-       ["Go to subject number..." gnus-summary-goto-subject t]
-       ["Go to article number..." gnus-summary-goto-article t]
-       ["Go to the last article" gnus-summary-goto-last-article t]
-       ["Pop article off history" gnus-summary-pop-article t])
-       ("Sort"
-       ["Sort by number" gnus-summary-sort-by-number t]
-       ["Sort by author" gnus-summary-sort-by-author t]
-       ["Sort by subject" gnus-summary-sort-by-subject t]
-       ["Sort by date" gnus-summary-sort-by-date t]
-       ["Sort by score" gnus-summary-sort-by-score t]
-       ["Sort by lines" gnus-summary-sort-by-lines t]
-       ["Sort by characters" gnus-summary-sort-by-chars t]
-       ["Original sort" gnus-summary-sort-by-original t])
-       ("Help"
-       ["Fetch group FAQ" gnus-summary-fetch-faq t]
-       ["Describe group" gnus-summary-describe-group t]
-       ["Read manual" gnus-info-find-node t])
-       ("Modes"
-       ["Pick and read" gnus-pick-mode t]
-       ["Binary" gnus-binary-mode t])
-       ("Regeneration"
-       ["Regenerate" gnus-summary-prepare t]
-       ["Insert cached articles" gnus-summary-insert-cached-articles t]
-       ["Toggle threading" gnus-summary-toggle-threads t])
-       ["See old articles" gnus-summary-insert-old-articles t]
-       ["See new articles" gnus-summary-insert-new-articles t]
-       ["Filter articles..." gnus-summary-execute-command t]
-       ["Run command on subjects..." gnus-summary-universal-argument t]
-       ["Search articles forward..." gnus-summary-search-article-forward t]
-       ["Search articles backward..." gnus-summary-search-article-backward t]
-       ["Toggle line truncation" gnus-summary-toggle-truncation t]
-       ["Expand window" gnus-summary-expand-window t]
-       ["Expire expirable articles" gnus-summary-expire-articles
-       (gnus-check-backend-function
-        'request-expire-articles gnus-newsgroup-name)]
-       ["Edit local kill file" gnus-summary-edit-local-kill t]
-       ["Edit main kill file" gnus-summary-edit-global-kill t]
-       ["Edit group parameters" gnus-summary-edit-parameters t]
-       ["Customize group parameters" gnus-summary-customize-parameters t]
-       ["Send a bug report" gnus-bug t]
-       ("Exit"
-       ["Catchup and exit" gnus-summary-catchup-and-exit
-        ,@(if (featurep 'xemacs) '(t)
-            '(:help "Mark unread articles in this group as read, then exit"))]
-       ["Catchup all and exit" gnus-summary-catchup-all-and-exit t]
-       ["Catchup and goto next" gnus-summary-catchup-and-goto-next-group t]
-       ["Exit group" gnus-summary-exit
-        ,@(if (featurep 'xemacs) '(t)
-            '(:help "Exit current group, return to group selection mode"))]
-       ["Exit group without updating" gnus-summary-exit-no-update t]
-       ["Exit and goto next group" gnus-summary-next-group t]
-       ["Exit and goto prev group" gnus-summary-prev-group t]
-       ["Reselect group" gnus-summary-reselect-current-group t]
-       ["Rescan group" gnus-summary-rescan-group t]
-       ["Update dribble" gnus-summary-save-newsrc t])))
+      gnus-summary-misc-menu gnus-summary-mode-map ""
+      `("Misc"
+       ("Mark Read"
+        ["Mark as read" gnus-summary-mark-as-read-forward t]
+        ["Mark same subject and select"
+         gnus-summary-kill-same-subject-and-select t]
+        ["Mark same subject" gnus-summary-kill-same-subject t]
+        ["Catchup" gnus-summary-catchup
+         ,@(if (featurep 'xemacs) '(t)
+             '(:help "Mark unread articles in this group as read"))]
+        ["Catchup all" gnus-summary-catchup-all t]
+        ["Catchup to here" gnus-summary-catchup-to-here t]
+        ["Catchup from here" gnus-summary-catchup-from-here t]
+        ["Catchup region" gnus-summary-mark-region-as-read t]
+        ["Mark excluded" gnus-summary-limit-mark-excluded-as-read t])
+       ("Mark Various"
+        ["Tick" gnus-summary-tick-article-forward t]
+        ["Mark as dormant" gnus-summary-mark-as-dormant t]
+        ["Remove marks" gnus-summary-clear-mark-forward t]
+        ["Set expirable mark" gnus-summary-mark-as-expirable t]
+        ["Set bookmark" gnus-summary-set-bookmark t]
+        ["Remove bookmark" gnus-summary-remove-bookmark t])
+       ("Mark Limit"
+        ["Marks..." gnus-summary-limit-to-marks t]
+        ["Subject..." gnus-summary-limit-to-subject t]
+        ["Author..." gnus-summary-limit-to-author t]
+        ["Age..." gnus-summary-limit-to-age t]
+        ["Extra..." gnus-summary-limit-to-extra t]
+        ["Score" gnus-summary-limit-to-score t]
+        ["Unread" gnus-summary-limit-to-unread t]
+        ["Non-dormant" gnus-summary-limit-exclude-dormant t]
+        ["Articles" gnus-summary-limit-to-articles t]
+        ["Pop limit" gnus-summary-pop-limit t]
+        ["Show dormant" gnus-summary-limit-include-dormant t]
+        ["Hide childless dormant"
+         gnus-summary-limit-exclude-childless-dormant t]
+        ;;["Hide thread" gnus-summary-limit-exclude-thread t]
+        ["Hide marked" gnus-summary-limit-exclude-marks t]
+        ["Show expunged" gnus-summary-limit-include-expunged t])
+       ("Process Mark"
+        ["Set mark" gnus-summary-mark-as-processable t]
+        ["Remove mark" gnus-summary-unmark-as-processable t]
+        ["Remove all marks" gnus-summary-unmark-all-processable t]
+        ["Mark above" gnus-uu-mark-over t]
+        ["Mark series" gnus-uu-mark-series t]
+        ["Mark region" gnus-uu-mark-region t]
+        ["Unmark region" gnus-uu-unmark-region t]
+        ["Mark by regexp..." gnus-uu-mark-by-regexp t]
+        ["Unmark by regexp..." gnus-uu-unmark-by-regexp t]
+        ["Mark all" gnus-uu-mark-all t]
+        ["Mark buffer" gnus-uu-mark-buffer t]
+        ["Mark sparse" gnus-uu-mark-sparse t]
+        ["Mark thread" gnus-uu-mark-thread t]
+        ["Unmark thread" gnus-uu-unmark-thread t]
+        ("Process Mark Sets"
+         ["Kill" gnus-summary-kill-process-mark t]
+         ["Yank" gnus-summary-yank-process-mark
+          gnus-newsgroup-process-stack]
+         ["Save" gnus-summary-save-process-mark t]))
+       ("Scroll article"
+        ["Page forward" gnus-summary-next-page
+         ,@(if (featurep 'xemacs) '(t)
+             '(:help "Show next page of article"))]
+        ["Page backward" gnus-summary-prev-page
+         ,@(if (featurep 'xemacs) '(t)
+             '(:help "Show previous page of article"))]
+        ["Line forward" gnus-summary-scroll-up t])
+       ("Move"
+        ["Next unread article" gnus-summary-next-unread-article t]
+        ["Previous unread article" gnus-summary-prev-unread-article t]
+        ["Next article" gnus-summary-next-article t]
+        ["Previous article" gnus-summary-prev-article t]
+        ["Next unread subject" gnus-summary-next-unread-subject t]
+        ["Previous unread subject" gnus-summary-prev-unread-subject t]
+        ["Next article same subject" gnus-summary-next-same-subject t]
+        ["Previous article same subject" gnus-summary-prev-same-subject t]
+        ["First unread article" gnus-summary-first-unread-article t]
+        ["Best unread article" gnus-summary-best-unread-article t]
+        ["Go to subject number..." gnus-summary-goto-subject t]
+        ["Go to article number..." gnus-summary-goto-article t]
+        ["Go to the last article" gnus-summary-goto-last-article t]
+        ["Pop article off history" gnus-summary-pop-article t])
+       ("Sort"
+        ["Sort by number" gnus-summary-sort-by-number t]
+        ["Sort by author" gnus-summary-sort-by-author t]
+        ["Sort by subject" gnus-summary-sort-by-subject t]
+        ["Sort by date" gnus-summary-sort-by-date t]
+        ["Sort by score" gnus-summary-sort-by-score t]
+        ["Sort by lines" gnus-summary-sort-by-lines t]
+        ["Sort by characters" gnus-summary-sort-by-chars t]
+        ["Original sort" gnus-summary-sort-by-original t])
+       ("Help"
+        ["Fetch group FAQ" gnus-summary-fetch-faq t]
+        ["Describe group" gnus-summary-describe-group t]
+        ["Read manual" gnus-info-find-node t])
+       ("Modes"
+        ["Pick and read" gnus-pick-mode t]
+        ["Binary" gnus-binary-mode t])
+       ("Regeneration"
+        ["Regenerate" gnus-summary-prepare t]
+        ["Insert cached articles" gnus-summary-insert-cached-articles t]
+        ["Toggle threading" gnus-summary-toggle-threads t])
+       ["See old articles" gnus-summary-insert-old-articles t]
+       ["See new articles" gnus-summary-insert-new-articles t]
+       ["Filter articles..." gnus-summary-execute-command t]
+       ["Run command on subjects..." gnus-summary-universal-argument t]
+       ["Search articles forward..." gnus-summary-search-article-forward t]
+       ["Search articles backward..." gnus-summary-search-article-backward t]
+       ["Toggle line truncation" gnus-summary-toggle-truncation t]
+       ["Expand window" gnus-summary-expand-window t]
+       ["Expire expirable articles" gnus-summary-expire-articles
+        (gnus-check-backend-function
+         'request-expire-articles gnus-newsgroup-name)]
+       ["Edit local kill file" gnus-summary-edit-local-kill t]
+       ["Edit main kill file" gnus-summary-edit-global-kill t]
+       ["Edit group parameters" gnus-summary-edit-parameters t]
+       ["Customize group parameters" gnus-summary-customize-parameters t]
+       ["Send a bug report" gnus-bug t]
+       ("Exit"
+        ["Catchup and exit" gnus-summary-catchup-and-exit
+         ,@(if (featurep 'xemacs) '(t)
+             '(:help "Mark unread articles in this group as read, then exit"))]
+        ["Catchup all and exit" gnus-summary-catchup-all-and-exit t]
+        ["Catchup and goto next" gnus-summary-catchup-and-goto-next-group t]
+        ["Exit group" gnus-summary-exit
+         ,@(if (featurep 'xemacs) '(t)
+             '(:help "Exit current group, return to group selection mode"))]
+        ["Exit group without updating" gnus-summary-exit-no-update t]
+        ["Exit and goto next group" gnus-summary-next-group t]
+        ["Exit and goto prev group" gnus-summary-prev-group t]
+        ["Reselect group" gnus-summary-reselect-current-group t]
+        ["Rescan group" gnus-summary-rescan-group t]
+        ["Update dribble" gnus-summary-save-newsrc t])))

 
     (gnus-run-hooks 'gnus-summary-menu-hook)))
 
 
     (gnus-run-hooks 'gnus-summary-menu-hook)))
 


@@ -2431,7 +2431,7 @@ The following commands are available:
            (setq gnus-newsgroup-data (nconc list gnus-newsgroup-data))
            (when offset
              (gnus-data-update-list odata offset)))
            (setq gnus-newsgroup-data (nconc list gnus-newsgroup-data))
            (when offset
              (gnus-data-update-list odata offset)))

-       ;; Find the last element in the list to be spliced into the main
+      ;; Find the last element in the list to be spliced into the main

        ;; list.
        (while (cdr list)
          (setq list (cdr list)))
        ;; list.
        (while (cdr list)
          (setq list (cdr list)))


@@ -2493,7 +2493,7 @@ The following commands are available:
 (defun gnus-article-parent-p (number)
   "Say whether this article is a parent or not."
   (let ((data (gnus-data-find-list number)))
 (defun gnus-article-parent-p (number)
   "Say whether this article is a parent or not."
   (let ((data (gnus-data-find-list number)))

-    (and (cdr data)                    ; There has to be an article after...
+    (and (cdr data)              ; There has to be an article after...

         (< (gnus-data-level (car data)) ; And it has to have a higher level.
            (gnus-data-level (nth 1 data))))))
 
         (< (gnus-data-level (car data)) ; And it has to have a higher level.
            (gnus-data-level (nth 1 data))))))
 


@@ -2699,7 +2699,7 @@ display only a single character."
     ;; Nix out all the control chars...
     (while (>= (setq i (1- i)) 0)
       (aset table i [??]))
     ;; Nix out all the control chars...
     (while (>= (setq i (1- i)) 0)
       (aset table i [??]))

-    ;; ... but not newline and cr, of course.  (cr is necessary for the
+   ;; ... but not newline and cr, of course.  (cr is necessary for the

     ;; selective display).
     (aset table ?\n nil)
     (aset table ?\r nil)
     ;; selective display).
     (aset table ?\n nil)
     (aset table ?\r nil)


@@ -2914,7 +2914,7 @@ buffer that was in action when the last article was fetched."
          (if (or (null gnus-summary-default-score)
                  (<= (abs (- gnus-tmp-score gnus-summary-default-score))
                      gnus-summary-zcore-fuzz))
          (if (or (null gnus-summary-default-score)
                  (<= (abs (- gnus-tmp-score gnus-summary-default-score))
                      gnus-summary-zcore-fuzz))

-             ?  ;Whitespace
+             ?                         ;Whitespace

            (if (< gnus-tmp-score gnus-summary-default-score)
                gnus-score-below-mark gnus-score-over-mark)))
         (gnus-tmp-replied
            (if (< gnus-tmp-score gnus-summary-default-score)
                gnus-score-below-mark gnus-score-over-mark)))
         (gnus-tmp-replied


@@ -2980,7 +2980,7 @@ buffer that was in action when the last article was fetched."
         (if (or (null gnus-summary-default-score)
                 (<= (abs (- score gnus-summary-default-score))
                     gnus-summary-zcore-fuzz))
         (if (or (null gnus-summary-default-score)
                 (<= (abs (- score gnus-summary-default-score))
                     gnus-summary-zcore-fuzz))

-            ?  ;Whitespace
+            ?                          ;Whitespace

           (if (< score gnus-summary-default-score)
               gnus-score-below-mark gnus-score-over-mark))
         'score))
           (if (< score gnus-summary-default-score)
               gnus-score-below-mark gnus-score-over-mark))
         'score))


@@ -2995,7 +2995,7 @@ buffer that was in action when the last article was fetched."
 This may be 0 in some cases -- if none of the articles in
 the thread are to be displayed."
   (let* ((number
 This may be 0 in some cases -- if none of the articles in
 the thread are to be displayed."
   (let* ((number

-         ;; Fix by Luc Van Eycken <Luc.VanEycken@esat.kuleuven.ac.be>.
+        ;; Fix by Luc Van Eycken <Luc.VanEycken@esat.kuleuven.ac.be>.

          (cond
           ((not (listp thread))
            1)
          (cond
           ((not (listp thread))
            1)


@@ -3021,7 +3021,7 @@ the thread are to be displayed."
 (defun gnus-summary-set-local-parameters (group)
   "Go through the local params of GROUP and set all variable specs in that list."
   (let ((params (gnus-group-find-parameter group))
 (defun gnus-summary-set-local-parameters (group)
   "Go through the local params of GROUP and set all variable specs in that list."
   (let ((params (gnus-group-find-parameter group))

-        (vars '(quit-config)) ; Ignore quit-config.
+       (vars '(quit-config))           ; Ignore quit-config.

        elem)
     (while params
       (setq elem (car params)
        elem)
     (while params
       (setq elem (car params)


@@ -3029,9 +3029,9 @@ the thread are to be displayed."
       (and (consp elem)                        ; Has to be a cons.
           (consp (cdr elem))           ; The cdr has to be a list.
           (symbolp (car elem))         ; Has to be a symbol in there.
       (and (consp elem)                        ; Has to be a cons.
           (consp (cdr elem))           ; The cdr has to be a list.
           (symbolp (car elem))         ; Has to be a symbol in there.

-           (not (memq (car elem) vars))
+          (not (memq (car elem) vars))

           (ignore-errors               ; So we set it.
           (ignore-errors               ; So we set it.

-             (push (car elem) vars)
+            (push (car elem) vars)

             (make-local-variable (car elem))
             (set (car elem) (eval (nth 1 elem))))))))
 
             (make-local-variable (car elem))
             (set (car elem) (eval (nth 1 elem))))))))
 


@@ -3071,7 +3071,7 @@ If NO-DISPLAY, don't generate a summary buffer."
   ;;  (when (and (not (gnus-group-native-p group))
   ;;        (not (gnus-gethash group gnus-newsrc-hashtb)))
   ;;    (error "Dead non-native groups can't be entered"))
   ;;  (when (and (not (gnus-group-native-p group))
   ;;        (not (gnus-gethash group gnus-newsrc-hashtb)))
   ;;    (error "Dead non-native groups can't be entered"))

-  (gnus-message 5 "Retrieving newsgroup: %s..." 
+  (gnus-message 5 "Retrieving newsgroup: %s..."

                (gnus-group-decoded-name group))
   (let* ((new-group (gnus-summary-setup-buffer group))
         (quit-config (gnus-group-quit-config group))
                (gnus-group-decoded-name group))
   (let* ((new-group (gnus-summary-setup-buffer group))
         (quit-config (gnus-group-quit-config group))


@@ -3103,10 +3103,10 @@ If NO-DISPLAY, don't generate a summary buffer."
              (gnus-group-next-unread-group 1))
          (gnus-handle-ephemeral-exit quit-config)))
       (let ((grpinfo (gnus-get-info group)))
              (gnus-group-next-unread-group 1))
          (gnus-handle-ephemeral-exit quit-config)))
       (let ((grpinfo (gnus-get-info group)))

-        (if (null (gnus-info-read grpinfo))
-            (gnus-message 3 "Group %s contains no messages" 
+       (if (null (gnus-info-read grpinfo))
+           (gnus-message 3 "Group %s contains no messages"

                          (gnus-group-decoded-name group))
                          (gnus-group-decoded-name group))

-          (gnus-message 3 "Can't select group")))
+         (gnus-message 3 "Can't select group")))

       nil)
      ;; The user did a `C-g' while prompting for number of articles,
      ;; so we exit this group.
       nil)
      ;; The user did a `C-g' while prompting for number of articles,
      ;; so we exit this group.


@@ -3267,7 +3267,7 @@ If NO-DISPLAY, don't generate a summary buffer."
 
   (if (and gnus-summary-gather-exclude-subject
           (string-match gnus-summary-gather-exclude-subject subject))
 
   (if (and gnus-summary-gather-exclude-subject
           (string-match gnus-summary-gather-exclude-subject subject))

-      nil                              ; This article shouldn't be gathered
+      nil                         ; This article shouldn't be gathered

     subject))
 
 (defun gnus-summary-simplify-subject-query ()
     subject))
 
 (defun gnus-summary-simplify-subject-query ()


@@ -3402,7 +3402,7 @@ If NO-DISPLAY, don't generate a summary buffer."
                  (setq threads nil)
                  (throw 'infloop t))
                (unless (car (symbol-value refs))
                  (setq threads nil)
                  (throw 'infloop t))
                (unless (car (symbol-value refs))

-                 ;; These threads do not refer back to any other articles,
+            ;; These threads do not refer back to any other articles,

                  ;; so they're roots.
                  (setq threads (append (cdr (symbol-value refs)) threads))))
              gnus-newsgroup-dependencies)))
                  ;; so they're roots.
                  (setq threads (append (cdr (symbol-value refs)) threads))))
              gnus-newsgroup-dependencies)))


@@ -3724,7 +3724,7 @@ the id of the parent article (if any)."
        (when parent
          (delq thread parent)))
       (if (gnus-summary-insert-subject id header)
        (when parent
          (delq thread parent)))
       (if (gnus-summary-insert-subject id header)

-         ;; Set the (possibly) new article number in the data structure.
+       ;; Set the (possibly) new article number in the data structure.

          (gnus-data-set-number data (gnus-id-to-article id))
        (setcar thread old)
        nil))))
          (gnus-data-set-number data (gnus-id-to-article id))
        (setcar thread old)
        nil))))


@@ -4118,7 +4118,7 @@ or a straight list of headers."
        gnus-tmp-dummy gnus-tmp-indentation gnus-tmp-lines gnus-tmp-score
        gnus-tmp-score-char gnus-tmp-from gnus-tmp-name
        gnus-tmp-number gnus-tmp-opening-bracket gnus-tmp-closing-bracket
        gnus-tmp-dummy gnus-tmp-indentation gnus-tmp-lines gnus-tmp-score
        gnus-tmp-score-char gnus-tmp-from gnus-tmp-name
        gnus-tmp-number gnus-tmp-opening-bracket gnus-tmp-closing-bracket

-        tree-stack)
+       tree-stack)

 
     (setq gnus-tmp-prev-subject nil)
 
 
     (setq gnus-tmp-prev-subject nil)
 


@@ -4156,7 +4156,7 @@ or a straight list of headers."
            ;; the stack.
            (setq state (car stack)
                  gnus-tmp-level (car state)
            ;; the stack.
            (setq state (car stack)
                  gnus-tmp-level (car state)

-                  tree-stack (cadr state)
+                 tree-stack (cadr state)

                  thread (caddr state)
                  stack (cdr stack)
                  gnus-tmp-header (caar thread))))
                  thread (caddr state)
                  stack (cdr stack)
                  gnus-tmp-header (caar thread))))


@@ -4298,7 +4298,7 @@ or a straight list of headers."
             (if (or (null gnus-summary-default-score)
                     (<= (abs (- gnus-tmp-score gnus-summary-default-score))
                         gnus-summary-zcore-fuzz))
             (if (or (null gnus-summary-default-score)
                     (<= (abs (- gnus-tmp-score gnus-summary-default-score))
                         gnus-summary-zcore-fuzz))

-                ?  ;Whitespace
+                ?                      ;Whitespace

               (if (< gnus-tmp-score gnus-summary-default-score)
                   gnus-score-below-mark gnus-score-over-mark))
             gnus-tmp-replied
               (if (< gnus-tmp-score gnus-summary-default-score)
                   gnus-score-below-mark gnus-score-over-mark))
             gnus-tmp-replied


@@ -4325,20 +4325,20 @@ or a straight list of headers."
               (substring gnus-tmp-from
                          (1+ (match-beginning 0)) (1- (match-end 0))))
              (t gnus-tmp-from))
               (substring gnus-tmp-from
                          (1+ (match-beginning 0)) (1- (match-end 0))))
              (t gnus-tmp-from))

-             gnus-tmp-thread-tree-header-string 
-             (if (zerop gnus-tmp-level)
-                 (if (cdar thread) 
-                     gnus-sum-thread-tree-root
-                   gnus-sum-thread-tree-single-indent)
-               (concat (apply 'concat
-                              (mapcar (lambda (item) 
-                                        (if (= item 1) 
-                                            gnus-sum-thread-tree-vertical
-                                          gnus-sum-thread-tree-indent))
-                                      (cdr (reverse tree-stack))))
-                       (if (nth 1 thread) 
-                           gnus-sum-thread-tree-leaf-with-other
-                         gnus-sum-thread-tree-single-leaf))))
+            gnus-tmp-thread-tree-header-string
+            (if (zerop gnus-tmp-level)
+                (if (cdar thread)
+                    gnus-sum-thread-tree-root
+                  gnus-sum-thread-tree-single-indent)
+              (concat (apply 'concat
+                             (mapcar (lambda (item)
+                                       (if (= item 1)
+                                           gnus-sum-thread-tree-vertical
+                                         gnus-sum-thread-tree-indent))
+                                     (cdr (reverse tree-stack))))
+                      (if (nth 1 thread)
+                          gnus-sum-thread-tree-leaf-with-other
+                        gnus-sum-thread-tree-single-leaf))))

 
            (when (string= gnus-tmp-name "")
              (setq gnus-tmp-name gnus-tmp-from))
 
            (when (string= gnus-tmp-name "")
              (setq gnus-tmp-name gnus-tmp-from))


@@ -4358,11 +4358,11 @@ or a straight list of headers."
            (setq gnus-tmp-prev-subject subject)))
 
        (when (nth 1 thread)
            (setq gnus-tmp-prev-subject subject)))
 
        (when (nth 1 thread)

-         (push (list (max 0 gnus-tmp-level) 
-                      (copy-list tree-stack)
-                      (nthcdr 1 thread))
-                stack))        
-        (push (if (nth 1 thread) 1 0) tree-stack)
+         (push (list (max 0 gnus-tmp-level)
+                     (copy-list tree-stack)
+                     (nthcdr 1 thread))
+               stack))
+       (push (if (nth 1 thread) 1 0) tree-stack)

        (incf gnus-tmp-level)
        (setq threads (if thread-end nil (cdar thread)))
        (unless threads
        (incf gnus-tmp-level)
        (setq threads (if thread-end nil (cdar thread)))
        (unless threads


@@ -4458,7 +4458,7 @@ If SELECT-ARTICLES, only select those articles from GROUP."
   (let* ((entry (gnus-gethash group gnus-newsrc-hashtb))
         ;;!!! Dirty hack; should be removed.
         (gnus-summary-ignore-duplicates
   (let* ((entry (gnus-gethash group gnus-newsrc-hashtb))
         ;;!!! Dirty hack; should be removed.
         (gnus-summary-ignore-duplicates

-         (if (eq (car (gnus-find-method-for-group group)) 'nnvirtual)
+         (if (eq (car (gnus-find-method-for-group group)) 'nnvirtual)

              t
            gnus-summary-ignore-duplicates))
         (info (nth 2 entry))
              t
            gnus-summary-ignore-duplicates))
         (info (nth 2 entry))


@@ -4492,7 +4492,7 @@ If SELECT-ARTICLES, only select those articles from GROUP."
     (when info
       (gnus-adjust-marked-articles info))
 
     (when info
       (gnus-adjust-marked-articles info))
 

-    ;; Kludge to avoid having cached articles nixed out in virtual groups.
+;; Kludge to avoid having cached articles nixed out in virtual groups.

     (when (gnus-virtual-group-p group)
       (setq cached gnus-newsgroup-cached))
 
     (when (gnus-virtual-group-p group)
       (setq cached gnus-newsgroup-cached))
 


@@ -4514,7 +4514,7 @@ If SELECT-ARTICLES, only select those articles from GROUP."
 
     (cond
      ((null articles)
 
     (cond
      ((null articles)

-      ;;(gnus-message 3 "Couldn't select newsgroup -- no articles to display")
+;;(gnus-message 3 "Couldn't select newsgroup -- no articles to display")

       'quit)
      ((eq articles 0) nil)
      (t
       'quit)
      ((eq articles 0) nil)
      (t


@@ -4525,7 +4525,7 @@ If SELECT-ARTICLES, only select those articles from GROUP."
       ;; Retrieve the headers and read them in.
       (setq gnus-newsgroup-headers (gnus-fetch-headers articles))
 
       ;; Retrieve the headers and read them in.
       (setq gnus-newsgroup-headers (gnus-fetch-headers articles))
 

-      ;; Kludge to avoid having cached articles nixed out in virtual groups.
+;; Kludge to avoid having cached articles nixed out in virtual groups.

       (when cached
        (setq gnus-newsgroup-cached cached))
 
       (when cached
        (setq gnus-newsgroup-cached cached))
 


@@ -4608,9 +4608,9 @@ If SELECT-ARTICLES, only select those articles from GROUP."
                         (read-string
                          (format
                           "How many articles from %s (default %d): "
                         (read-string
                          (format
                           "How many articles from %s (default %d): "

-                          (gnus-limit-string 
-                            (gnus-group-decoded-name gnus-newsgroup-name)
-                            35)        
+                          (gnus-limit-string
+                           (gnus-group-decoded-name gnus-newsgroup-name)
+                           35)

                           number))))
                    (if (string-match "^[ \t]*$" input) number input)))
                 ((and (> scored marked) (< scored number)
                           number))))
                    (if (string-match "^[ \t]*$" input) number input)))
                 ((and (> scored marked) (< scored number)


@@ -4620,7 +4620,7 @@ If SELECT-ARTICLES, only select those articles from GROUP."
                          (format "%s %s (%d scored, %d total): "
                                  "How many articles from"
                                  (gnus-group-decoded-name group)
                          (format "%s %s (%d scored, %d total): "
                                  "How many articles from"
                                  (gnus-group-decoded-name group)

-                                  scored number))))
+                                 scored number))))

                    (if (string-match "^[ \t]*$" input)
                        number input)))
                 (t number))
                    (if (string-match "^[ \t]*$" input)
                        number input)))
                 (t number))


@@ -4721,7 +4721,7 @@ If SELECT-ARTICLES, only select those articles from GROUP."
       (while types
        (setq var (intern (format "gnus-newsgroup-%s" (car (pop types)))))
        (when (symbol-value var)
       (while types
        (setq var (intern (format "gnus-newsgroup-%s" (car (pop types)))))
        (when (symbol-value var)

-         ;; This list has articles.  So we delete all missing articles
+        ;; This list has articles.  So we delete all missing articles

          ;; from it.
          (setq m missing)
          (while m
          ;; from it.
          (setq m missing)
          (while m


@@ -4814,12 +4814,12 @@ If WHERE is `summary', the summary mode line format will be used."
        ;; We evaluate this in the summary buffer since these
        ;; variables are buffer-local to that buffer.
        (set-buffer gnus-summary-buffer)
        ;; We evaluate this in the summary buffer since these
        ;; variables are buffer-local to that buffer.
        (set-buffer gnus-summary-buffer)

-       ;; We bind all these variables that are used in the `eval' form
+       ;; We bind all these variables that are used in the `eval' form

        ;; below.
        (let* ((mformat (symbol-value
                         (intern
                          (format "gnus-%s-mode-line-format-spec" where))))
        ;; below.
        (let* ((mformat (symbol-value
                         (intern
                          (format "gnus-%s-mode-line-format-spec" where))))

-              (gnus-tmp-group-name (gnus-group-decoded-name 
+              (gnus-tmp-group-name (gnus-group-decoded-name

                                     gnus-newsgroup-name))
               (gnus-tmp-article-number (or gnus-current-article 0))
               (gnus-tmp-unread gnus-newsgroup-unreads)
                                     gnus-newsgroup-name))
               (gnus-tmp-article-number (or gnus-current-article 0))
               (gnus-tmp-unread gnus-newsgroup-unreads)


@@ -4841,7 +4841,7 @@ If WHERE is `summary', the summary mode line format will be used."
                     (mail-header-subject gnus-current-headers))
                  ""))
               bufname-length max-len
                     (mail-header-subject gnus-current-headers))
                  ""))
               bufname-length max-len

-              gnus-tmp-header);; passed as argument to any user-format-funcs
+              gnus-tmp-header) ;; passed as argument to any user-format-funcs

          (setq mode-string (eval mformat))
          (setq bufname-length (if (string-match "%b" mode-string)
                                   (- (length
          (setq mode-string (eval mformat))
          (setq bufname-length (if (string-match "%b" mode-string)
                                   (- (length


@@ -5077,11 +5077,11 @@ The resulting hash table is returned, or nil if no Xrefs were found."
              (goto-char p)
              (setq id (if (re-search-forward
                            "^message-id: *\\(<[^\n\t> ]+>\\)" nil t)
              (goto-char p)
              (setq id (if (re-search-forward
                            "^message-id: *\\(<[^\n\t> ]+>\\)" nil t)

-                          ;; We do it this way to make sure the Message-ID
+                     ;; We do it this way to make sure the Message-ID

                           ;; is (somewhat) syntactically valid.
                           (buffer-substring (match-beginning 1)
                                             (match-end 1))
                           ;; is (somewhat) syntactically valid.
                           (buffer-substring (match-beginning 1)
                                             (match-end 1))

-                        ;; If there was no message-id, we just fake one
+                      ;; If there was no message-id, we just fake one

                         ;; to make subsequent routines simpler.
                         (nnheader-generate-fake-message-id))))
            ;; References.
                         ;; to make subsequent routines simpler.
                         (nnheader-generate-fake-message-id))))
            ;; References.


@@ -5101,7 +5101,7 @@ The resulting hash table is returned, or nil if no Xrefs were found."
                             (progn
                               (search-backward "<" end t)
                               (point))))))
                             (progn
                               (search-backward "<" end t)
                               (point))))))

-               ;; Get the references from the in-reply-to header if there
+           ;; Get the references from the in-reply-to header if there

                ;; were no references and the in-reply-to header looks
                ;; promising.
                (if (and (search-forward "\nin-reply-to:" nil t)
                ;; were no references and the in-reply-to header looks
                ;; promising.
                (if (and (search-forward "\nin-reply-to:" nil t)


@@ -5508,7 +5508,7 @@ Also do horizontal recentering."
 If `gnus-auto-center-summary' is nil, or the article buffer isn't
 displayed, no centering will be performed."
   ;; Suggested by earle@mahendo.JPL.NASA.GOV (Greg Earle).
 If `gnus-auto-center-summary' is nil, or the article buffer isn't
 displayed, no centering will be performed."
   ;; Suggested by earle@mahendo.JPL.NASA.GOV (Greg Earle).

-  ;; Recenter only when requested.  Suggested by popovich@park.cs.columbia.edu.
+;; Recenter only when requested.  Suggested by popovich@park.cs.columbia.edu.

   (interactive)
   (let* ((top (cond ((< (window-height) 4) 0)
                    ((< (window-height) 7) 1)
   (interactive)
   (let* ((top (cond ((< (window-height) 4) 0)
                    ((< (window-height) 7) 1)


@@ -5524,7 +5524,7 @@ displayed, no centering will be performed."
     (when gnus-auto-center-summary
       (when (get-buffer-window gnus-article-buffer)
        ;; Only do recentering when the article buffer is displayed,
     (when gnus-auto-center-summary
       (when (get-buffer-window gnus-article-buffer)
        ;; Only do recentering when the article buffer is displayed,

-       ;; Set the window start to either `bottom', which is the biggest
+      ;; Set the window start to either `bottom', which is the biggest

        ;; possible valid number, or the second line from the top,
        ;; whichever is the least.
        (let ((top-pos (save-excursion (forward-line (- top)) (point))))
        ;; possible valid number, or the second line from the top,
        ;; whichever is the least.
        (let ((top-pos (save-excursion (forward-line (- top)) (point))))


@@ -5753,7 +5753,7 @@ If FORCE (the prefix), also save the .newsrc file(s)."
   (let* ((group gnus-newsgroup-name)
         (quit-config (gnus-group-quit-config gnus-newsgroup-name))
         (mode major-mode)
   (let* ((group gnus-newsgroup-name)
         (quit-config (gnus-group-quit-config gnus-newsgroup-name))
         (mode major-mode)

-         (group-point nil)
+        (group-point nil)

         (buf (current-buffer)))
     (unless quit-config
       ;; Do adaptive scoring, and possibly save score files.
         (buf (current-buffer)))
     (unless quit-config
       ;; Do adaptive scoring, and possibly save score files.


@@ -5806,7 +5806,7 @@ If FORCE (the prefix), also save the .newsrc file(s)."
          (progn
            (gnus-deaden-summary)
            (setq mode nil))
          (progn
            (gnus-deaden-summary)
            (setq mode nil))

-       ;; We set all buffer-local variables to nil.  It is unclear why
+       ;; We set all buffer-local variables to nil.  It is unclear why

        ;; this is needed, but if we don't, buffer-local variables are
        ;; not garbage-collected, it seems.  This would the lead to en
        ;; ever-growing Emacs.
        ;; this is needed, but if we don't, buffer-local variables are
        ;; not garbage-collected, it seems.  This would the lead to en
        ;; ever-growing Emacs.


@@ -5886,7 +5886,7 @@ If FORCE (the prefix), also save the .newsrc file(s)."
       (when (equal (gnus-group-group-name) group)
        (gnus-group-next-unread-group 1))
       (when quit-config
       (when (equal (gnus-group-group-name) group)
        (gnus-group-next-unread-group 1))
       (when quit-config

-        (gnus-handle-ephemeral-exit quit-config)))))
+       (gnus-handle-ephemeral-exit quit-config)))))

 
 (defun gnus-handle-ephemeral-exit (quit-config)
   "Handle movement when leaving an ephemeral group.
 
 (defun gnus-handle-ephemeral-exit (quit-config)
   "Handle movement when leaving an ephemeral group.


@@ -5895,25 +5895,25 @@ The state which existed when entering the ephemeral is reset."
       (gnus-configure-windows 'group 'force)
     (set-buffer (car quit-config))
     (cond ((eq major-mode 'gnus-summary-mode)
       (gnus-configure-windows 'group 'force)
     (set-buffer (car quit-config))
     (cond ((eq major-mode 'gnus-summary-mode)

-           (gnus-set-global-variables))
-          ((eq major-mode 'gnus-article-mode)
-           (save-excursion
-             ;; The `gnus-summary-buffer' variable may point
-             ;; to the old summary buffer when using a single
-             ;; article buffer.
-             (unless (gnus-buffer-live-p gnus-summary-buffer)
-               (set-buffer gnus-group-buffer))
-             (set-buffer gnus-summary-buffer)
-             (gnus-set-global-variables))))
+          (gnus-set-global-variables))
+         ((eq major-mode 'gnus-article-mode)
+          (save-excursion
+            ;; The `gnus-summary-buffer' variable may point
+            ;; to the old summary buffer when using a single
+            ;; article buffer.
+            (unless (gnus-buffer-live-p gnus-summary-buffer)
+              (set-buffer gnus-group-buffer))
+            (set-buffer gnus-summary-buffer)
+            (gnus-set-global-variables))))

     (if (or (eq (cdr quit-config) 'article)
     (if (or (eq (cdr quit-config) 'article)

-            (eq (cdr quit-config) 'pick))
-        (progn
-          ;; The current article may be from the ephemeral group
-          ;; thus it is best that we reload this article
-          (gnus-summary-show-article)
-          (if (and (boundp 'gnus-pick-mode) (symbol-value 'gnus-pick-mode))
-              (gnus-configure-windows 'pick 'force)
-            (gnus-configure-windows (cdr quit-config) 'force)))
+           (eq (cdr quit-config) 'pick))
+       (progn
+         ;; The current article may be from the ephemeral group
+         ;; thus it is best that we reload this article
+         (gnus-summary-show-article)
+         (if (and (boundp 'gnus-pick-mode) (symbol-value 'gnus-pick-mode))
+             (gnus-configure-windows 'pick 'force)
+           (gnus-configure-windows (cdr quit-config) 'force)))

       (gnus-configure-windows (cdr quit-config) 'force))
     (when (eq major-mode 'gnus-summary-mode)
       (gnus-summary-next-subject 1 nil t)
       (gnus-configure-windows (cdr quit-config) 'force))
     (when (eq major-mode 'gnus-summary-mode)
       (gnus-summary-next-subject 1 nil t)


@@ -6043,7 +6043,7 @@ previous group instead."
   (let ((current-group gnus-newsgroup-name)
        (current-buffer (current-buffer))
        entered)
   (let ((current-group gnus-newsgroup-name)
        (current-buffer (current-buffer))
        entered)

-    ;; First we semi-exit this group to update Xrefs and all variables.
+   ;; First we semi-exit this group to update Xrefs and all variables.

     ;; We can't do a real exit, because the window conf must remain
     ;; the same in case the user is prompted for info, and we don't
     ;; want the window conf to change before that...
     ;; We can't do a real exit, because the window conf must remain
     ;; the same in case the user is prompted for info, and we don't
     ;; want the window conf to change before that...


@@ -6253,11 +6253,11 @@ be displayed."
                   (or (null gnus-current-article)
                       (not (eq gnus-current-article article))))
              force)
                   (or (null gnus-current-article)
                       (not (eq gnus-current-article article))))
              force)

-         ;; The requested article is different from the current article.
+       ;; The requested article is different from the current article.

          (progn
            (gnus-summary-display-article article all-headers)
            (when (gnus-buffer-live-p gnus-article-buffer)
          (progn
            (gnus-summary-display-article article all-headers)
            (when (gnus-buffer-live-p gnus-article-buffer)

-              (with-current-buffer gnus-article-buffer
+             (with-current-buffer gnus-article-buffer

                (if (not gnus-article-decoded-p) ;; a local variable
                    (mm-disable-multibyte-mule4))))
            (when (or all-headers gnus-show-all-headers)
                (if (not gnus-article-decoded-p) ;; a local variable
                    (mm-disable-multibyte-mule4))))
            (when (or all-headers gnus-show-all-headers)


@@ -6821,10 +6821,10 @@ article."
                   (gnus-id-to-thread (gnus-root-id id)))))
     (prog1
        (gnus-summary-limit (nconc articles gnus-newsgroup-limit))
                   (gnus-id-to-thread (gnus-root-id id)))))
     (prog1
        (gnus-summary-limit (nconc articles gnus-newsgroup-limit))

-       (gnus-summary-limit-include-matching-articles
-        "subject"
-        (regexp-quote (gnus-simplify-subject-re
-                       (mail-header-subject (gnus-id-to-header id)))))
+      (gnus-summary-limit-include-matching-articles
+       "subject"
+       (regexp-quote (gnus-simplify-subject-re
+                     (mail-header-subject (gnus-id-to-header id)))))

       (gnus-summary-position-point))))
 
 (defun gnus-summary-limit-include-matching-articles (header regexp)
       (gnus-summary-position-point))))
 
 (defun gnus-summary-limit-include-matching-articles (header regexp)


@@ -7051,7 +7051,7 @@ fetch-old-headers verbiage, and so on."
       (if (and
           (not (memq number gnus-newsgroup-marked))
           (or
       (if (and
           (not (memq number gnus-newsgroup-marked))
           (or

-           ;; If this article is dormant and has absolutely no visible
+          ;; If this article is dormant and has absolutely no visible

            ;; children, then this article isn't visible.
            (and (memq number gnus-newsgroup-dormant)
                 (zerop children))
            ;; children, then this article isn't visible.
            (and (memq number gnus-newsgroup-dormant)
                 (zerop children))


@@ -7065,7 +7065,7 @@ fetch-old-headers verbiage, and so on."
            ;; we don't want this article.
            (and (eq gnus-fetch-old-headers 'invisible)
                 (gnus-summary-article-ancient-p number))
            ;; we don't want this article.
            (and (eq gnus-fetch-old-headers 'invisible)
                 (gnus-summary-article-ancient-p number))

-           ;; If this is a sparsely inserted article with no children,
+          ;; If this is a sparsely inserted article with no children,

            ;; we don't want it.
            (and (eq gnus-build-sparse-threads 'some)
                 (gnus-summary-article-sparse-p number)
            ;; we don't want it.
            (and (eq gnus-build-sparse-threads 'some)
                 (gnus-summary-article-sparse-p number)


@@ -7100,7 +7100,7 @@ fetch-old-headers verbiage, and so on."
                  t))))
          ;; Nope, invisible article.
          0
                  t))))
          ;; Nope, invisible article.
          0

-       ;; Ok, this article is to be visible, so we add it to the limit
+       ;; Ok, this article is to be visible, so we add it to the limit

        ;; and return 1.
        (push number gnus-newsgroup-limit)
        1))))
        ;; and return 1.
        (push number gnus-newsgroup-limit)
        1))))


@@ -7325,21 +7325,21 @@ to guess what the document format is."
        (delete-matching-lines "^Path:\\|^From ")
        (widen))
       (unwind-protect
        (delete-matching-lines "^Path:\\|^From ")
        (widen))
       (unwind-protect

-          (if (let ((gnus-newsgroup-ephemeral-charset gnus-newsgroup-charset)
+         (if (let ((gnus-newsgroup-ephemeral-charset gnus-newsgroup-charset)

                    (gnus-newsgroup-ephemeral-ignored-charsets
                     gnus-newsgroup-ignored-charsets))
                (gnus-group-read-ephemeral-group
                 name `(nndoc ,name (nndoc-address ,(get-buffer dig))
                              (nndoc-article-type
                               ,(if force 'mbox 'guess))) t))
                    (gnus-newsgroup-ephemeral-ignored-charsets
                     gnus-newsgroup-ignored-charsets))
                (gnus-group-read-ephemeral-group
                 name `(nndoc ,name (nndoc-address ,(get-buffer dig))
                              (nndoc-article-type
                               ,(if force 'mbox 'guess))) t))

-             ;; Make all postings to this group go to the parent group.
-              (nconc (gnus-info-params (gnus-get-info name))
-                     params)
-            ;; Couldn't select this doc group.
-            (switch-to-buffer buf)
-            (gnus-set-global-variables)
-            (gnus-configure-windows 'summary)
-            (gnus-message 3 "Article couldn't be entered?"))
+           ;; Make all postings to this group go to the parent group.
+             (nconc (gnus-info-params (gnus-get-info name))
+                    params)
+           ;; Couldn't select this doc group.
+           (switch-to-buffer buf)
+           (gnus-set-global-variables)
+           (gnus-configure-windows 'summary)
+           (gnus-message 3 "Article couldn't be entered?"))

        (kill-buffer dig)))))
 
 (defun gnus-summary-read-document (n)
        (kill-buffer dig)))))
 
 (defun gnus-summary-read-document (n)


@@ -7372,7 +7372,7 @@ Obeys the standard process/prefix convention."
                                     (nndoc-article-type guess))
                       t nil t))
                (progn
                                     (nndoc-article-type guess))
                       t nil t))
                (progn

-                 ;; Make all postings to this group go to the parent group.
+           ;; Make all postings to this group go to the parent group.

                  (nconc (gnus-info-params (gnus-get-info egroup))
                         params)
                  (push egroup groups))
                  (nconc (gnus-info-params (gnus-get-info egroup))
                         params)
                  (push egroup groups))


@@ -7572,7 +7572,7 @@ article.  If BACKWARD (the prefix) is non-nil, search backward instead."
   (save-excursion
     (save-window-excursion
       (gnus-message 6 "Executing %s..." (key-description command))
   (save-excursion
     (save-window-excursion
       (gnus-message 6 "Executing %s..." (key-description command))

-      ;; We'd like to execute COMMAND interactively so as to give arguments.
+;; We'd like to execute COMMAND interactively so as to give arguments.

       (gnus-execute header regexp
                    `(call-interactively ',(key-binding command))
                    backward)
       (gnus-execute header regexp
                    `(call-interactively ',(key-binding command))
                    backward)


@@ -7829,7 +7829,7 @@ ACTION can be either `move' (the default), `crosspost' or `copy'."
         (error "The current group does not support article editing")))
   (let ((articles (gnus-summary-work-articles n))
        (prefix (if (gnus-check-backend-function
         (error "The current group does not support article editing")))
   (let ((articles (gnus-summary-work-articles n))
        (prefix (if (gnus-check-backend-function

-                   'request-move-article gnus-newsgroup-name)
+                    'request-move-article gnus-newsgroup-name)

                    (gnus-group-real-prefix gnus-newsgroup-name)
                  ""))
        (names '((move "Move" "Moving")
                    (gnus-group-real-prefix gnus-newsgroup-name)
                  ""))
        (names '((move "Move" "Moving")


@@ -7931,7 +7931,7 @@ ACTION can be either `move' (the default), `crosspost' or `copy'."
               (entry
                (gnus-gethash pto-group gnus-newsrc-hashtb))
               (info (nth 2 entry))
               (entry
                (gnus-gethash pto-group gnus-newsrc-hashtb))
               (info (nth 2 entry))

-               (to-group (gnus-info-group info))
+              (to-group (gnus-info-group info))

               to-marks)
          ;; Update the group that has been moved to.
          (when (and info
               to-marks)
          ;; Update the group that has been moved to.
          (when (and info


@@ -8104,15 +8104,15 @@ latter case, they will be copied into the relevant groups."
       (nnheader-insert-file-contents file)
       (goto-char (point-min))
       (if (nnheader-article-p)
       (nnheader-insert-file-contents file)
       (goto-char (point-min))
       (if (nnheader-article-p)

-          (save-restriction
-            (goto-char (point-min))
-            (search-forward "\n\n" nil t)
-            (narrow-to-region (point-min) (1- (point)))
-            (goto-char (point-min))
-            (unless (re-search-forward "^date:" nil t)
-              (goto-char (point-max))
-              (insert "Date: " (message-make-date (nth 5 atts)) "\n")))
-       ;; This doesn't look like an article, so we fudge some headers.
+         (save-restriction
+           (goto-char (point-min))
+           (search-forward "\n\n" nil t)
+           (narrow-to-region (point-min) (1- (point)))
+           (goto-char (point-min))
+           (unless (re-search-forward "^date:" nil t)
+             (goto-char (point-max))
+             (insert "Date: " (message-make-date (nth 5 atts)) "\n")))
+       ;; This doesn't look like an article, so we fudge some headers.

        (setq atts (file-attributes file)
              lines (count-lines (point-min) (point-max)))
        (insert "From: " (read-string "From: ") "\n"
        (setq atts (file-attributes file)
              lines (count-lines (point-min) (point-max)))
        (insert "From: " (read-string "From: ") "\n"


@@ -8176,7 +8176,7 @@ This will be the case if the article has both been mailed and posted."
           (expirable (if total
                          (progn
                            ;; We need to update the info for
           (expirable (if total
                          (progn
                            ;; We need to update the info for

-                           ;; this group for `gnus-list-of-read-articles'
+                       ;; this group for `gnus-list-of-read-articles'

                            ;; to give us the right answer.
                            (gnus-run-hooks 'gnus-exit-group-hook)
                            (gnus-summary-update-info)
                            ;; to give us the right answer.
                            (gnus-run-hooks 'gnus-exit-group-hook)
                            (gnus-summary-update-info)


@@ -8209,7 +8209,7 @@ This will be the case if the article has both been mailed and posted."
            (setq gnus-newsgroup-expirable es))
          ;; We go through the old list of expirable, and mark all
          ;; really expired articles as nonexistent.
            (setq gnus-newsgroup-expirable es))
          ;; We go through the old list of expirable, and mark all
          ;; really expired articles as nonexistent.

-         (unless (eq es expirable)     ;If nothing was expired, we don't mark.
+         (unless (eq es expirable) ;If nothing was expired, we don't mark.

            (let ((gnus-use-cache nil))
              (while expirable
                (unless (memq (car expirable) es)
            (let ((gnus-use-cache nil))
              (while expirable
                (unless (memq (car expirable) es)


@@ -8292,7 +8292,7 @@ groups."
                            (with-current-buffer gnus-article-buffer
                              (prog1
                                  gnus-article-mime-handles
                            (with-current-buffer gnus-article-buffer
                              (prog1
                                  gnus-article-mime-handles

-                                 (setq gnus-article-mime-handles nil))))))
+                               (setq gnus-article-mime-handles nil))))))

      (t (setq force t)))
     (if (and raw (not force) (equal gnus-newsgroup-name "nndraft:drafts"))
        (error "Can't edit the raw article in group nndraft:drafts"))
      (t (setq force t)))
     (if (and raw (not force) (equal gnus-newsgroup-name "nndraft:drafts"))
        (error "Can't edit the raw article in group nndraft:drafts"))


@@ -8345,7 +8345,7 @@ groups."
   "Make edits to the current article permanent."
   (interactive)
   (save-excursion
   "Make edits to the current article permanent."
   (interactive)
   (save-excursion

-    ;; The buffer restriction contains the entire article if it exists.
+   ;; The buffer restriction contains the entire article if it exists.

     (when (article-goto-body)
       (let ((lines (count-lines (point) (point-max)))
            (length (- (point-max) (point)))
     (when (article-goto-body)
       (let ((lines (count-lines (point) (point-max)))
            (length (- (point-max) (point)))


@@ -8540,8 +8540,8 @@ number of articles marked is returned."
       (while (and
              (> n 0)
              (if unmark
       (while (and
              (> n 0)
              (if unmark

-               (gnus-summary-remove-process-mark
-                (gnus-summary-article-number))
+                 (gnus-summary-remove-process-mark
+                  (gnus-summary-article-number))

                (gnus-summary-set-process-mark (gnus-summary-article-number)))
              (zerop (gnus-summary-next-subject (if backward -1 1) nil t)))
        (setq n (1- n)))
                (gnus-summary-set-process-mark (gnus-summary-article-number)))
              (zerop (gnus-summary-next-subject (if backward -1 1) nil t)))
        (setq n (1- n)))


@@ -8788,7 +8788,7 @@ Iff NO-EXPIRE, auto-expiry will be inhibited."
     (setq mark gnus-del-mark))
   (when (and (not no-expire)
             gnus-newsgroup-auto-expire
     (setq mark gnus-del-mark))
   (when (and (not no-expire)
             gnus-newsgroup-auto-expire

-            (memq mark gnus-auto-expirable-marks))
+            (memq mark gnus-auto-expirable-marks))

     (setq mark gnus-expirable-mark))
   (let ((article (or article (gnus-summary-article-number)))
        (old-mark (gnus-summary-article-mark article)))
     (setq mark gnus-expirable-mark))
   (let ((article (or article (gnus-summary-article-number)))
        (old-mark (gnus-summary-article-mark article)))


@@ -8842,7 +8842,7 @@ Iff NO-EXPIRE, auto-expiry will be inhibited."
 
 (defun gnus-summary-update-mark (mark type)
   (let ((forward (cdr (assq type gnus-summary-mark-positions)))
 
 (defun gnus-summary-update-mark (mark type)
   (let ((forward (cdr (assq type gnus-summary-mark-positions)))

-        (buffer-read-only nil))
+       (buffer-read-only nil))

     (re-search-backward "[\n\r]" (gnus-point-at-bol) 'move-to-limit)
     (when forward
       (when (looking-at "\r")
     (re-search-backward "[\n\r]" (gnus-point-at-bol) 'move-to-limit)
     (when forward
       (when (looking-at "\r")


@@ -8979,7 +8979,7 @@ The difference between N and the number of marks cleared is returned."
       (gnus-summary-mark-article gnus-current-article gnus-read-mark))))
 
 (defun gnus-summary-mark-unread-as-ticked ()
       (gnus-summary-mark-article gnus-current-article gnus-read-mark))))
 
 (defun gnus-summary-mark-unread-as-ticked ()

-   "Intended to be used by `gnus-summary-mark-article-hook'."
+  "Intended to be used by `gnus-summary-mark-article-hook'."

   (when (memq gnus-current-article gnus-newsgroup-unreads)
     (gnus-summary-mark-article gnus-current-article gnus-ticked-mark)))
 
   (when (memq gnus-current-article gnus-newsgroup-unreads)
     (gnus-summary-mark-article gnus-current-article gnus-ticked-mark)))
 


@@ -9067,7 +9067,7 @@ even ticked and dormant ones."
        (goto-char (point-min))
        (push gnus-newsgroup-limit gnus-newsgroup-limits)
        (setq gnus-newsgroup-limit (copy-sequence gnus-newsgroup-limit))
        (goto-char (point-min))
        (push gnus-newsgroup-limit gnus-newsgroup-limits)
        (setq gnus-newsgroup-limit (copy-sequence gnus-newsgroup-limit))

-       (mapcar (lambda (x) (push (mail-header-number x) 
+       (mapcar (lambda (x) (push (mail-header-number x)

                                  gnus-newsgroup-limit))
                headers)
        (gnus-summary-prepare-unthreaded (nreverse headers))
                                  gnus-newsgroup-limit))
                headers)
        (gnus-summary-prepare-unthreaded (nreverse headers))


@@ -9625,9 +9625,9 @@ pipe those articles instead."
   (let ((gnus-default-article-saver 'gnus-summary-save-in-pipe))
     (gnus-summary-save-article arg t))
   (let ((buffer (get-buffer "*Shell Command Output*")))
   (let ((gnus-default-article-saver 'gnus-summary-save-in-pipe))
     (gnus-summary-save-article arg t))
   (let ((buffer (get-buffer "*Shell Command Output*")))

-    (if (and buffer 
-             (with-current-buffer buffer (> (point-max) (point-min))))
-        (gnus-configure-windows 'pipe))))
+    (if (and buffer
+            (with-current-buffer buffer (> (point-max) (point-min))))
+       (gnus-configure-windows 'pipe))))

 
 (defun gnus-summary-save-article-mail (&optional arg)
   "Append the current article to an mail file.
 
 (defun gnus-summary-save-article-mail (&optional arg)
   "Append the current article to an mail file.


@@ -9691,11 +9691,11 @@ save those articles instead."
   (let ((mail-header-separator ""))
     (gnus-eval-in-buffer-window gnus-article-buffer
       (save-restriction
   (let ((mail-header-separator ""))
     (gnus-eval-in-buffer-window gnus-article-buffer
       (save-restriction

-        (widen)
-        (let ((start (window-start))
-              buffer-read-only)
-          (message-pipe-buffer-body program)
-          (set-window-start (get-buffer-window (current-buffer)) start))))))
+       (widen)
+       (let ((start (window-start))
+             buffer-read-only)
+         (message-pipe-buffer-body program)
+         (set-window-start (get-buffer-window (current-buffer)) start))))))

 
 (defun gnus-get-split-value (methods)
   "Return a value based on the split METHODS."
 
 (defun gnus-get-split-value (methods)
   "Return a value based on the split METHODS."


@@ -9770,7 +9770,7 @@ save those articles instead."
                                          (nreverse split-name))
                                  nil nil nil
                                  'gnus-group-history))))
                                          (nreverse split-name))
                                  nil nil nil
                                  'gnus-group-history))))

-         (to-method (gnus-server-to-method (gnus-group-method to-newsgroup))))
+        (to-method (gnus-server-to-method (gnus-group-method to-newsgroup))))

     (when to-newsgroup
       (if (or (string= to-newsgroup "")
              (string= to-newsgroup prefix))
     (when to-newsgroup
       (if (or (string= to-newsgroup "")
              (string= to-newsgroup prefix))


@@ -10323,7 +10323,7 @@ returned."
              (gnus-set-difference articles
                                   (mapcar (lambda (h) (mail-header-number h))
                                           gnus-newsgroup-headers)))
              (gnus-set-difference articles
                                   (mapcar (lambda (h) (mail-header-number h))
                                           gnus-newsgroup-headers)))

-    (setq gnus-newsgroup-headers 
+    (setq gnus-newsgroup-headers

          (merge 'list
                 gnus-newsgroup-headers
                 (gnus-fetch-headers articles)
          (merge 'list
                 gnus-newsgroup-headers
                 (gnus-fetch-headers articles)


@@ -10331,12 +10331,12 @@ returned."
     ;; Suppress duplicates?
     (when gnus-suppress-duplicates
       (gnus-dup-suppress-articles))
     ;; Suppress duplicates?
     (when gnus-suppress-duplicates
       (gnus-dup-suppress-articles))

-    
+

     ;; We might want to build some more threads first.
     (when (and gnus-fetch-old-headers
               (eq gnus-headers-retrieved-by 'nov))
       (if (eq gnus-fetch-old-headers 'invisible)
     ;; We might want to build some more threads first.
     (when (and gnus-fetch-old-headers
               (eq gnus-headers-retrieved-by 'nov))
       (if (eq gnus-fetch-old-headers 'invisible)

-       (gnus-build-all-threads)
+         (gnus-build-all-threads)

        (gnus-build-old-threads)))
     ;; Let the Gnus agent mark articles as read.
     (when gnus-agent
        (gnus-build-old-threads)))
     ;; Let the Gnus agent mark articles as read.
     (when gnus-agent


@@ -10367,9 +10367,9 @@ If ALL is a number, fetch this number of articles."
          (or (memq i old) (push i older))
          (incf i))
        (setq len (length older))
          (or (memq i old) (push i older))
          (incf i))
        (setq len (length older))

-       (cond 
+       (cond

         ((null older) nil)
         ((null older) nil)

-        ((numberp all) 
+        ((numberp all)

          (if (< all len)
              (setq older (subseq older 0 all))))
         (all nil)
          (if (< all len)
              (setq older (subseq older 0 all))))
         (all nil)


@@ -10380,10 +10380,10 @@ If ALL is a number, fetch this number of articles."
                     (read-string
                      (format
                       "How many articles from %s (default %d): "
                     (read-string
                      (format
                       "How many articles from %s (default %d): "

-                      (gnus-limit-string 
+                      (gnus-limit-string

                        (gnus-group-decoded-name gnus-newsgroup-name) 35)
                       len))))
                        (gnus-group-decoded-name gnus-newsgroup-name) 35)
                       len))))

-               (unless (string-match "^[ \t]*$" input) 
+               (unless (string-match "^[ \t]*$" input)

                  (setq all (string-to-number input))
                  (if (< all len)
                      (setq older (subseq older 0 all))))))))
                  (setq all (string-to-number input))
                  (if (< all len)
                      (setq older (subseq older 0 all))))))))


@@ -10401,7 +10401,7 @@ If ALL is a number, fetch this number of articles."
            (old-active gnus-newsgroup-active)
            (nnmail-fetched-sources (list t))
            i new)
            (old-active gnus-newsgroup-active)
            (nnmail-fetched-sources (list t))
            i new)

-       (setq gnus-newsgroup-active 
+       (setq gnus-newsgroup-active

              (gnus-activate-group gnus-newsgroup-name 'scan))
        (setq i (1+ (cdr old-active)))
        (while (<= i (cdr gnus-newsgroup-active))
              (gnus-activate-group gnus-newsgroup-name 'scan))
        (setq i (1+ (cdr old-active)))
        (while (<= i (cdr gnus-newsgroup-active))


@@ -10409,7 +10409,7 @@ If ALL is a number, fetch this number of articles."
          (incf i))
        (if (not new)
            (message "No gnus is bad news.")
          (incf i))
        (if (not new)
            (message "No gnus is bad news.")

-         (setq new (nreverse new))
+         (setq new (nreverse new))

          (gnus-summary-insert-articles new)
          (setq gnus-newsgroup-unreads
                (append gnus-newsgroup-unreads new))
          (gnus-summary-insert-articles new)
          (setq gnus-newsgroup-unreads
                (append gnus-newsgroup-unreads new))

diff --git a/lisp/gnus-topic.el b/lisp/gnus-topic.el
index b5eba3c..be05740 100644 (file)
--- a/lisp/gnus-topic.el
+++ b/lisp/gnus-topic.el
@@ -199,7 +199,7 @@ If TOPIC, start with that topic."
   "Return entries for all visible groups in TOPIC.
 If RECURSIVE is t, return groups in its subtopics too."
   (let ((groups (cdr (assoc topic gnus-topic-alist)))
   "Return entries for all visible groups in TOPIC.
 If RECURSIVE is t, return groups in its subtopics too."
   (let ((groups (cdr (assoc topic gnus-topic-alist)))

-        info clevel unread group params visible-groups entry active)
+       info clevel unread group params visible-groups entry active)

     (setq lowest (or lowest 1))
     (setq level (or level gnus-level-unsubscribed))
     ;; We go through the newsrc to look for matches.
     (setq lowest (or lowest 1))
     (setq level (or level gnus-level-unsubscribed))
     ;; We go through the newsrc to look for matches.


@@ -396,7 +396,7 @@ if it is t, list groups that have no unread articles.
 If LOWEST is non-nil, list all newsgroups of level LOWEST or higher."
   (set-buffer gnus-group-buffer)
   (let ((buffer-read-only nil)
 If LOWEST is non-nil, list all newsgroups of level LOWEST or higher."
   (set-buffer gnus-group-buffer)
   (let ((buffer-read-only nil)

-        (lowest (or lowest 1))
+       (lowest (or lowest 1))

        (not-in-list
         (and gnus-group-listed-groups
              (copy-sequence gnus-group-listed-groups))))
        (not-in-list
         (and gnus-group-listed-groups
              (copy-sequence gnus-group-listed-groups))))


@@ -644,7 +644,7 @@ articles in the topic and its subtopics."
   (when (and (eq major-mode 'gnus-group-mode)
             gnus-topic-mode)
     (let ((group (gnus-group-group-name))
   (when (and (eq major-mode 'gnus-group-mode)
             gnus-topic-mode)
     (let ((group (gnus-group-group-name))

-          (m (point-marker))
+         (m (point-marker))

          (buffer-read-only nil))
       (when (and group
                 (gnus-get-info group)
          (buffer-read-only nil))
       (when (and group
                 (gnus-get-info group)


@@ -1078,7 +1078,7 @@ articles in the topic and its subtopics."
            (> (prefix-numeric-value arg) 0)))
     ;; Infest Gnus with topics.
     (if (not gnus-topic-mode)
            (> (prefix-numeric-value arg) 0)))
     ;; Infest Gnus with topics.
     (if (not gnus-topic-mode)

-       (setq gnus-goto-missing-group-function nil)
+       (setq gnus-goto-missing-group-function nil)

       (when (gnus-visual-p 'topic-menu 'menu)
        (gnus-topic-make-menu-bar))
       (gnus-set-format 'topic t)
       (when (gnus-visual-p 'topic-menu 'menu)
        (gnus-topic-make-menu-bar))
       (gnus-set-format 'topic t)

diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index 174f2fb..579896c 100644 (file)
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -53,20 +53,20 @@
 (defmacro gnus-eval-in-buffer-window (buffer &rest forms)
   "Pop to BUFFER, evaluate FORMS, and then return to the original window."
   (let ((tempvar (make-symbol "GnusStartBufferWindow"))
 (defmacro gnus-eval-in-buffer-window (buffer &rest forms)
   "Pop to BUFFER, evaluate FORMS, and then return to the original window."
   (let ((tempvar (make-symbol "GnusStartBufferWindow"))

-        (w (make-symbol "w"))
-        (buf (make-symbol "buf")))
+       (w (make-symbol "w"))
+       (buf (make-symbol "buf")))

     `(let* ((,tempvar (selected-window))
     `(let* ((,tempvar (selected-window))

-            (,buf ,buffer)
-            (,w (get-buffer-window ,buf 'visible)))
+           (,buf ,buffer)
+           (,w (get-buffer-window ,buf 'visible)))

        (unwind-protect
        (unwind-protect

-           (progn
-             (if ,w
-                 (progn
-                   (select-window ,w)
-                   (set-buffer (window-buffer ,w)))
-               (pop-to-buffer ,buf))
-             ,@forms)
-         (select-window ,tempvar)))))
+          (progn
+            (if ,w
+                (progn
+                  (select-window ,w)
+                  (set-buffer (window-buffer ,w)))
+              (pop-to-buffer ,buf))
+            ,@forms)
+        (select-window ,tempvar)))))

 
 (put 'gnus-eval-in-buffer-window 'lisp-indent-function 1)
 (put 'gnus-eval-in-buffer-window 'edebug-form-spec '(form body))
 
 (put 'gnus-eval-in-buffer-window 'lisp-indent-function 1)
 (put 'gnus-eval-in-buffer-window 'edebug-form-spec '(form body))


@@ -700,10 +700,10 @@ with potentially long computations."
            (when msg
              (goto-char (point-min))
              (widen)
            (when msg
              (goto-char (point-min))
              (widen)

-             (search-backward "\n\^_")
-             (narrow-to-region (point) (point-max))
-             (rmail-count-new-messages t)
-             (when (rmail-summary-exists)
+             (search-backward "\n\^_")
+             (narrow-to-region (point) (point-max))
+             (rmail-count-new-messages t)
+             (when (rmail-summary-exists)

                (rmail-select-summary
                 (rmail-update-summary)))
              (rmail-count-new-messages t)
                (rmail-select-summary
                 (rmail-update-summary)))
              (rmail-count-new-messages t)


@@ -914,7 +914,7 @@ Entries without port tokens default to DEFAULTPORT."
 Return the modified alist."
     (let (entry)
       (while (setq entry (assq key alist))
 Return the modified alist."
     (let (entry)
       (while (setq entry (assq key alist))

-        (setq alist (delq entry alist)))
+       (setq alist (delq entry alist)))

       alist)))
 
 (defmacro gnus-pull (key alist &optional assoc-p)
       alist)))
 
 (defmacro gnus-pull (key alist &optional assoc-p)

diff --git a/lisp/gnus-uu.el b/lisp/gnus-uu.el
index b59c09e..262f7e6 100644 (file)
--- a/lisp/gnus-uu.el
+++ b/lisp/gnus-uu.el
@@ -1487,7 +1487,7 @@ When called interactively, prompt for REGEXP."
                (let ((nnheader-file-name-translation-alist
                       '((?/ . ?,) (?  . ?_) (?* . ?_) (?$ . ?_))))
                  (nnheader-translate-file-chars (match-string 1))))
                (let ((nnheader-file-name-translation-alist
                       '((?/ . ?,) (?  . ?_) (?* . ?_) (?$ . ?_))))
                  (nnheader-translate-file-chars (match-string 1))))

-          (replace-match (concat "begin 644 " gnus-uu-file-name) t t)
+         (replace-match (concat "begin 644 " gnus-uu-file-name) t t)

 
          ;; Remove any non gnus-uu-body-line right after start.
          (forward-line 1)
 
          ;; Remove any non gnus-uu-body-line right after start.
          (forward-line 1)

diff --git a/lisp/gnus-win.el b/lisp/gnus-win.el
index c8f8efc..e77393a 100644 (file)
--- a/lisp/gnus-win.el
+++ b/lisp/gnus-win.el
@@ -168,7 +168,7 @@
               (message 1.0 point)))
     (display-term
       (vertical 1.0
               (message 1.0 point)))
     (display-term
       (vertical 1.0

-                ("*display*" 1.0))))
+               ("*display*" 1.0))))

   "Window configuration for all possible Gnus buffers.
 See the Gnus manual for an explanation of the syntax used.")
 
   "Window configuration for all possible Gnus buffers.
 See the Gnus manual for an explanation of the syntax used.")
 


@@ -436,7 +436,7 @@ See the Gnus manual for an explanation of the syntax used.")
          ;; put point in the assigned buffer, and do not touch the
          ;; winconf.
          (select-window all-visible)
          ;; put point in the assigned buffer, and do not touch the
          ;; winconf.
          (select-window all-visible)

-       
+

        ;; Make sure "the other" buffer, nntp-server-buffer, is live.
        (unless (gnus-buffer-live-p nntp-server-buffer)
          (nnheader-init-server-buffer))
        ;; Make sure "the other" buffer, nntp-server-buffer, is live.
        (unless (gnus-buffer-live-p nntp-server-buffer)
          (nnheader-init-server-buffer))

diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el
index 8b5f2d2..1986602 100644 (file)
--- a/lisp/gnus-xmas.el
+++ b/lisp/gnus-xmas.el
@@ -142,12 +142,12 @@ It is provided only to ease porting of broken FSF Emacs programs."
   (if (stringp buffer)
       nil
     (map-extents (lambda (extent ignored)
   (if (stringp buffer)
       nil
     (map-extents (lambda (extent ignored)

-                   (remove-text-properties
-                    start end
-                    (list (extent-property extent 'text-prop) nil)
-                    buffer)
+                  (remove-text-properties
+                   start end
+                   (list (extent-property extent 'text-prop) nil)
+                   buffer)

                   nil)
                   nil)

-                 buffer start end nil nil 'text-prop)
+                buffer start end nil nil 'text-prop)

     (gnus-add-text-properties start end props buffer)))
 
 (defun gnus-xmas-highlight-selected-summary ()
     (gnus-add-text-properties start end props buffer)))
 
 (defun gnus-xmas-highlight-selected-summary ()


@@ -292,19 +292,19 @@ call it with the value of the `gnus-data' text property."
 (defun gnus-xmas-appt-select-lowest-window ()
   (let* ((lowest-window (selected-window))
         (bottom-edge (car (cdr (cdr (cdr (window-pixel-edges))))))
 (defun gnus-xmas-appt-select-lowest-window ()
   (let* ((lowest-window (selected-window))
         (bottom-edge (car (cdr (cdr (cdr (window-pixel-edges))))))

-         (last-window (previous-window))
-         (window-search t))
+        (last-window (previous-window))
+        (window-search t))

     (while window-search
       (let* ((this-window (next-window))
     (while window-search
       (let* ((this-window (next-window))

-             (next-bottom-edge (car (cdr (cdr (cdr
-                                               (window-pixel-edges
+            (next-bottom-edge (car (cdr (cdr (cdr
+                                              (window-pixel-edges

                                                this-window)))))))
                                                this-window)))))))

-        (when (< bottom-edge next-bottom-edge)
+       (when (< bottom-edge next-bottom-edge)

          (setq bottom-edge next-bottom-edge)
          (setq lowest-window this-window))
 
          (setq bottom-edge next-bottom-edge)
          (setq lowest-window this-window))
 

-        (select-window this-window)
-        (when (eq last-window this-window)
+       (select-window this-window)
+       (when (eq last-window this-window)

          (select-window lowest-window)
          (setq window-search nil))))))
 
          (select-window lowest-window)
          (setq window-search nil))))))
 

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 7683aa9..85f90e0 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -854,14 +854,14 @@ be set in `.emacs' instead."
 
 For example:
    ((\"mail\\\\..*\"  (gnus-show-threads nil)
 
 For example:
    ((\"mail\\\\..*\"  (gnus-show-threads nil)

-                  (gnus-use-scoring nil)
-                  (gnus-summary-line-format
-                        \"%U%R%z%I%(%[%d:%ub%-20,20f%]%) %s\\n\")
-                  (gcc-self . t)
-                  (display . all))
+                 (gnus-use-scoring nil)
+                 (gnus-summary-line-format
+                       \"%U%R%z%I%(%[%d:%ub%-20,20f%]%) %s\\n\")
+                 (gcc-self . t)
+                 (display . all))

      (\"mail\\\\.me\" (gnus-use-scoring  t))
      (\"list\\\\..*\" (total-expire . t)
      (\"mail\\\\.me\" (gnus-use-scoring  t))
      (\"list\\\\..*\" (total-expire . t)

-                  (broken-reply-to . t)))")
+                 (broken-reply-to . t)))")

 
 (defvar gnus-group-parameters-more nil)
 
 
 (defvar gnus-group-parameters-more nil)
 


@@ -1074,9 +1074,9 @@ If you want to save your mail in one group and the news articles you
 write in another group, you could say something like:
 
  \(setq gnus-message-archive-group
 write in another group, you could say something like:
 
  \(setq gnus-message-archive-group

-        '((if (message-news-p)
-              \"misc-news\"
-            \"misc-mail\")))
+       '((if (message-news-p)
+             \"misc-news\"
+           \"misc-mail\")))

 
 Normally the group names returned by this variable should be
 unprefixed -- which implicitly means \"store on the archive server\".
 
 Normally the group names returned by this variable should be
 unprefixed -- which implicitly means \"store on the archive server\".


@@ -1191,9 +1191,9 @@ If the default site is too slow, try one of these:
                  ftp.seas.gwu.edu               /pub/rtfm
                  rtfm.mit.edu                   /pub/usenet
    Europe:       ftp.uni-paderborn.de           /pub/FAQ
                  ftp.seas.gwu.edu               /pub/rtfm
                  rtfm.mit.edu                   /pub/usenet
    Europe:       ftp.uni-paderborn.de           /pub/FAQ

-                  src.doc.ic.ac.uk               /usenet/news-FAQS
+                 src.doc.ic.ac.uk               /usenet/news-FAQS

                  ftp.sunet.se                   /pub/usenet
                  ftp.sunet.se                   /pub/usenet

-                 sunsite.auc.dk                 /pub/usenet
+                 sunsite.auc.dk                 /pub/usenet

    Asia:         nctuccca.edu.tw                /USENET/FAQ
                  hwarang.postech.ac.kr          /pub/usenet
                  ftp.hk.super.net               /mirror/faqs"
    Asia:         nctuccca.edu.tw                /USENET/FAQ
                  hwarang.postech.ac.kr          /pub/usenet
                  ftp.hk.super.net               /mirror/faqs"


@@ -1469,9 +1469,9 @@ to be desirable; see the manual for further details."
  :function-document
  "Return GROUP's to-address."
  :variable-document
  :function-document
  "Return GROUP's to-address."
  :variable-document

-  "*Alist of group regexps and correspondent to-addresses."
-  :parameter-type '(gnus-email-address :tag "To Address")
-  :parameter-document "\
+ "*Alist of group regexps and correspondent to-addresses."
+ :parameter-type '(gnus-email-address :tag "To Address")
+ :parameter-document "\

 This will be used when doing followups and posts.
 
 This is primarily useful in mail groups that represent closed
 This will be used when doing followups and posts.
 
 This is primarily useful in mail groups that represent closed


@@ -1516,15 +1516,15 @@ address was listed in gnus-group-split Addresses (see below).")
  :variable gnus-auto-expirable-newsgroups
  :variable-default nil
  :variable-document
  :variable gnus-auto-expirable-newsgroups
  :variable-default nil
  :variable-document

-  "*Groups in which to automatically mark read articles as expirable.
+ "*Groups in which to automatically mark read articles as expirable.

 If non-nil, this should be a regexp that should match all groups in
 which to perform auto-expiry.  This only makes sense for mail groups."
 If non-nil, this should be a regexp that should match all groups in
 which to perform auto-expiry.  This only makes sense for mail groups."

-  :variable-group nnmail-expire
-  :variable-type '(choice (const nil)
-                         regexp)
-  :parameter-type '(const :tag "Automatic Expire" t)
-  :parameter-document
-  "All articles that are read will be marked as expirable.")
+ :variable-group nnmail-expire
+ :variable-type '(choice (const nil)
+                        regexp)
+ :parameter-type '(const :tag "Automatic Expire" t)
+ :parameter-document
+ "All articles that are read will be marked as expirable.")

 
 (gnus-define-group-parameter
  total-expire
 
 (gnus-define-group-parameter
  total-expire


@@ -1540,12 +1540,12 @@ Use with extreme caution.  All groups that match this regexp will be
 expiring - which means that all read articles will be deleted after
 \(say) one week.        (This only goes for mail groups and the like, of
 course.)"
 expiring - which means that all read articles will be deleted after
 \(say) one week.        (This only goes for mail groups and the like, of
 course.)"

-  :variable-group nnmail-expire
-  :variable-type '(choice (const nil)
-                         regexp)
-  :parameter-type '(const :tag "Total Expire" t)
-  :parameter-document
-  "All read articles will be put through the expiry process
+ :variable-group nnmail-expire
+ :variable-type '(choice (const nil)
+                        regexp)
+ :parameter-type '(const :tag "Total Expire" t)
+ :parameter-document
+ "All read articles will be put through the expiry process

 
 This happens even if they are not marked as expirable.
 Use with caution.")
 
 This happens even if they are not marked as expirable.
 Use with caution.")


@@ -1555,7 +1555,7 @@ Use with caution.")
  :function-document
  "Return the default charset of GROUP."
  :variable gnus-group-charset-alist
  :function-document
  "Return the default charset of GROUP."
  :variable gnus-group-charset-alist

- :variable-default 
+ :variable-default

  '(("\\(^\\|:\\)hk\\>\\|\\(^\\|:\\)tw\\>\\|\\<big5\\>" cn-big5)
    ("\\(^\\|:\\)cn\\>\\|\\<chinese\\>" cn-gb-2312)
    ("\\(^\\|:\\)fj\\>\\|\\(^\\|:\\)japan\\>" iso-2022-jp-2)
  '(("\\(^\\|:\\)hk\\>\\|\\(^\\|:\\)tw\\>\\|\\<big5\\>" cn-big5)
    ("\\(^\\|:\\)cn\\>\\|\\<chinese\\>" cn-gb-2312)
    ("\\(^\\|:\\)fj\\>\\|\\(^\\|:\\)japan\\>" iso-2022-jp-2)


@@ -1570,12 +1570,12 @@ Use with caution.")
    ("\\(^\\|:\\)\\(comp\\|rec\\|alt\\|sci\\|soc\\|news\\|gnu\\|bofh\\)\\>" iso-8859-1)
    (".*" iso-8859-1))
  :variable-document
    ("\\(^\\|:\\)\\(comp\\|rec\\|alt\\|sci\\|soc\\|news\\|gnu\\|bofh\\)\\>" iso-8859-1)
    (".*" iso-8859-1))
  :variable-document

-  "Alist of regexps (to match group names) and default charsets to be used when reading."
-  :variable-group gnus-charset
-  :variable-type '(repeat (list (regexp :tag "Group")
-                               (symbol :tag "Charset")))
-  :parameter-type '(symbol :tag "Charset")
-  :parameter-document "\
+ "Alist of regexps (to match group names) and default charsets to be used when reading."
+ :variable-group gnus-charset
+ :variable-type '(repeat (list (regexp :tag "Group")
+                              (symbol :tag "Charset")))
+ :parameter-type '(symbol :tag "Charset")
+ :parameter-document "\

 The default charset to use in the group.")
 
 (defcustom gnus-group-uncollapsed-levels 1
 The default charset to use in the group.")
 
 (defcustom gnus-group-uncollapsed-levels 1


@@ -1753,7 +1753,7 @@ covered by that variable."
       ,(nnheader-concat gnus-cache-directory "active"))))
   "List of predefined (convenience) servers.")
 
       ,(nnheader-concat gnus-cache-directory "active"))))
   "List of predefined (convenience) servers.")
 

-(defvar gnus-topic-indentation "");; Obsolete variable.
+(defvar gnus-topic-indentation "") ;; Obsolete variable.

 
 (defconst gnus-article-mark-lists
   '((marked . tick) (replied . reply)
 
 (defconst gnus-article-mark-lists
   '((marked . tick) (replied . reply)


@@ -2749,7 +2749,7 @@ You should probably use `gnus-find-method-for-group' instead."
        params-list)
     (while alist
       (when (string-match (caar alist) group)
        params-list)
     (while alist
       (when (string-match (caar alist) group)

-       (setq params-list 
+       (setq params-list

              (nconc (copy-sequence (cdar alist))
                     params-list)))
       (pop alist))
              (nconc (copy-sequence (cdar alist))
                     params-list)))
       (pop alist))


@@ -2760,7 +2760,7 @@ You should probably use `gnus-find-method-for-group' instead."
 If SYMBOL, return the value of that symbol in the group parameters."
   (save-excursion
     (set-buffer gnus-group-buffer)
 If SYMBOL, return the value of that symbol in the group parameters."
   (save-excursion
     (set-buffer gnus-group-buffer)

-    (let ((parameters 
+    (let ((parameters

           (nconc
            (copy-sequence
             (funcall gnus-group-get-parameter-function group))
           (nconc
            (copy-sequence
             (funcall gnus-group-get-parameter-function group))


@@ -2852,7 +2852,7 @@ just the host name."
                               depth (+ depth 1)))
                       depth))))
     ;; Separate foreign select method from group name and collapse.
                               depth (+ depth 1)))
                       depth))))
     ;; Separate foreign select method from group name and collapse.

-    ;; If method contains a server, collapse to non-domain server name,
+   ;; If method contains a server, collapse to non-domain server name,

     ;; otherwise collapse to select method.
     (let* ((colon (string-match ":" group))
           (server (and colon (substring group 0 colon)))
     ;; otherwise collapse to select method.
     (let* ((colon (string-match ":" group))
           (server (and colon (substring group 0 colon)))


@@ -3013,7 +3013,7 @@ If NEWSGROUP is nil, return the global kill file name instead."
   (or gnus-override-method
       (and (not group)
           gnus-select-method)
   (or gnus-override-method
       (and (not group)
           gnus-select-method)

-      (and (not (gnus-group-entry group));; a new group
+      (and (not (gnus-group-entry group)) ;; a new group

           (gnus-group-name-to-method group))
       (let ((info (or info (gnus-get-info group)))
            method)
           (gnus-group-name-to-method group))
       (let ((info (or info (gnus-get-info group)))
            method)


@@ -3063,7 +3063,7 @@ Disallow invalid group names."
 (defun gnus-read-method (prompt)
   "Prompt the user for a method.
 Allow completion over sensible values."
 (defun gnus-read-method (prompt)
   "Prompt the user for a method.
 Allow completion over sensible values."

-  (let* ((open-servers 
+  (let* ((open-servers

          (mapcar (lambda (i) (cons (format "%s:%s" (caar i) (cadar i)) i))
                  gnus-opened-servers))
         (valid-methods
          (mapcar (lambda (i) (cons (format "%s:%s" (caar i) (cadar i)) i))
                  gnus-opened-servers))
         (valid-methods


@@ -3129,8 +3129,8 @@ As opposed to `gnus', this command will not connect to the local server."
   (let ((window (get-buffer-window gnus-group-buffer)))
     (cond (window
           (select-frame (window-frame window)))
   (let ((window (get-buffer-window gnus-group-buffer)))
     (cond (window
           (select-frame (window-frame window)))

-         (t
-          (select-frame (make-frame)))))
+         (t
+          (select-frame (make-frame)))))

   (gnus arg))
 
 ;;(setq thing ?                                ; this is a comment
   (gnus arg))
 
 ;;(setq thing ?                                ; this is a comment

diff --git a/lisp/imap.el b/lisp/imap.el
index 057d98e..785cb03 100644 (file)
--- a/lisp/imap.el
+++ b/lisp/imap.el
@@ -44,7 +44,7 @@
 ;;
 ;; Mailbox commands:
 ;;
 ;;
 ;; Mailbox commands:
 ;;

-;; imap-mailbox-get,       imap-mailbox-map,         imap-current-mailbox, 
+;; imap-mailbox-get,       imap-mailbox-map,         imap-current-mailbox,

 ;; imap-current-mailbox-p, imap-search,              imap-mailbox-select,
 ;; imap-mailbox-examine,   imap-mailbox-unselect,    imap-mailbox-expunge
 ;; imap-mailbox-close,     imap-mailbox-create,      imap-mailbox-delete
 ;; imap-current-mailbox-p, imap-search,              imap-mailbox-select,
 ;; imap-mailbox-examine,   imap-mailbox-unselect,    imap-mailbox-expunge
 ;; imap-mailbox-close,     imap-mailbox-create,      imap-mailbox-delete


@@ -57,7 +57,7 @@
 ;; imap-fetch-asynch,                 imap-fetch,
 ;; imap-current-message,              imap-list-to-message-set,
 ;; imap-message-get,                  imap-message-map
 ;; imap-fetch-asynch,                 imap-fetch,
 ;; imap-current-message,              imap-list-to-message-set,
 ;; imap-message-get,                  imap-message-map

-;; imap-message-envelope-date,        imap-message-envelope-subject, 
+;; imap-message-envelope-date,        imap-message-envelope-subject,

 ;; imap-message-envelope-from,        imap-message-envelope-sender,
 ;; imap-message-envelope-reply-to,    imap-message-envelope-to,
 ;; imap-message-envelope-cc,          imap-message-envelope-bcc
 ;; imap-message-envelope-from,        imap-message-envelope-sender,
 ;; imap-message-envelope-reply-to,    imap-message-envelope-to,
 ;; imap-message-envelope-cc,          imap-message-envelope-bcc


@@ -120,7 +120,7 @@
 ;; => "X-Sieve: cmu-sieve 1.3^M\nX-Username: <jas@pdc.kth.se>^M\r...."
 ;;
 ;; Todo:
 ;; => "X-Sieve: cmu-sieve 1.3^M\nX-Username: <jas@pdc.kth.se>^M\r...."
 ;;
 ;; Todo:

-;; 
+;;

 ;; o Parse UIDs as strings? We need to overcome the 28 bit limit somehow.
 ;; o Don't use `read' at all (important places already fixed)
 ;; o Accept list of articles instead of message set string in most
 ;; o Parse UIDs as strings? We need to overcome the 28 bit limit somehow.
 ;; o Don't use `read' at all (important places already fixed)
 ;; o Accept list of articles instead of message set string in most


@@ -251,7 +251,7 @@ NAME names the stream, CHECK is a function returning non-nil if the
 server support the stream and OPEN is a function for opening the
 stream.")
 
 server support the stream and OPEN is a function for opening the
 stream.")
 

-(defvar imap-authenticators '(gssapi 
+(defvar imap-authenticators '(gssapi

                              kerberos4
                              digest-md5
                              cram-md5
                              kerberos4
                              digest-md5
                              cram-md5


@@ -259,7 +259,7 @@ stream.")
                              anonymous)
   "Priority of authenticators to consider when authenticating to server.")
 
                              anonymous)
   "Priority of authenticators to consider when authenticating to server.")
 

-(defvar imap-authenticator-alist 
+(defvar imap-authenticator-alist

   '((gssapi     imap-gssapi-auth-p    imap-gssapi-auth)
     (kerberos4  imap-kerberos4-auth-p imap-kerberos4-auth)
     (cram-md5   imap-cram-md5-p       imap-cram-md5-auth)
   '((gssapi     imap-gssapi-auth-p    imap-gssapi-auth)
     (kerberos4  imap-kerberos4-auth-p imap-kerberos4-auth)
     (cram-md5   imap-cram-md5-p       imap-cram-md5-auth)


@@ -317,7 +317,7 @@ encoded mailboxes which doesn't translate into ISO-8859-1.")
 (defvar imap-username nil)
 (defvar imap-password nil)
 (defvar imap-calculate-literal-size-first nil)
 (defvar imap-username nil)
 (defvar imap-password nil)
 (defvar imap-calculate-literal-size-first nil)

-(defvar imap-state 'closed 
+(defvar imap-state 'closed

   "IMAP state.
 Valid states are `closed', `initial', `nonauth', `auth', `selected'
 and `examine'.")
   "IMAP state.
 Valid states are `closed', `initial', `nonauth', `auth', `selected'
 and `examine'.")


@@ -358,7 +358,7 @@ and `examine'.")
 (defvar imap-reached-tag 0
   "Lower limit on command tags that have been parsed.")
 
 (defvar imap-reached-tag 0
   "Lower limit on command tags that have been parsed.")
 

-(defvar imap-failed-tags nil 
+(defvar imap-failed-tags nil

   "Alist of tags that failed.
 Each element is a list with four elements; tag (a integer), response
 state (a symbol, `OK', `NO' or `BAD'), response code (a string), and
   "Alist of tags that failed.
 Each element is a list with four elements; tag (a integer), response
 state (a symbol, `OK', `NO' or `BAD'), response code (a string), and


@@ -411,7 +411,7 @@ If ARGS, PROMPT is used as an argument to `format'."
       (and string
           (condition-case ()
               (utf7-encode string t)
       (and string
           (condition-case ()
               (utf7-encode string t)

-            (error (message 
+            (error (message

                     "imap: Could not UTF7 encode `%s', using it unencoded..."
                     string)
                    string)))
                     "imap: Could not UTF7 encode `%s', using it unencoded..."
                     string)
                    string)))


@@ -454,7 +454,7 @@ If ARGS, PROMPT is used as an argument to `format'."
             (coding-system-for-read imap-coding-system-for-read)
             (coding-system-for-write imap-coding-system-for-write)
             (process-connection-type imap-process-connection-type)
             (coding-system-for-read imap-coding-system-for-read)
             (coding-system-for-write imap-coding-system-for-write)
             (process-connection-type imap-process-connection-type)

-            (process (start-process 
+            (process (start-process

                       name buffer shell-file-name shell-command-switch
                       (format-spec
                        cmd
                       name buffer shell-file-name shell-command-switch
                       (format-spec
                        cmd


@@ -470,11 +470,11 @@ If ARGS, PROMPT is used as an argument to `format'."
            (while (and (memq (process-status process) '(open run))
                        (set-buffer buffer) ;; XXX "blue moon" nntp.el bug
                        (goto-char (point-min))
            (while (and (memq (process-status process) '(open run))
                        (set-buffer buffer) ;; XXX "blue moon" nntp.el bug
                        (goto-char (point-min))

-                        ;; cyrus 1.6.x (13? < x <= 22) queries capabilities
+                  ;; cyrus 1.6.x (13? < x <= 22) queries capabilities

                        (or (while (looking-at "^C:")
                              (forward-line))
                            t)
                        (or (while (looking-at "^C:")
                              (forward-line))
                            t)

-                       ;; cyrus 1.6 imtest print "S: " before server greeting
+               ;; cyrus 1.6 imtest print "S: " before server greeting

                        (or (not (looking-at "S: "))
                            (forward-char 3)
                            t)
                        (or (not (looking-at "S: "))
                            (forward-char 3)
                            t)


@@ -505,7 +505,7 @@ If ARGS, PROMPT is used as an argument to `format'."
              (delete-process process)
              nil)))))
     done))
              (delete-process process)
              nil)))))
     done))

-  
+

 (defun imap-gssapi-stream-p (buffer)
   (imap-capability 'AUTH=GSSAPI buffer))
 
 (defun imap-gssapi-stream-p (buffer)
   (imap-capability 'AUTH=GSSAPI buffer))
 


@@ -518,7 +518,7 @@ If ARGS, PROMPT is used as an argument to `format'."
             (coding-system-for-read imap-coding-system-for-read)
             (coding-system-for-write imap-coding-system-for-write)
             (process-connection-type imap-process-connection-type)
             (coding-system-for-read imap-coding-system-for-read)
             (coding-system-for-write imap-coding-system-for-write)
             (process-connection-type imap-process-connection-type)

-            (process (start-process 
+            (process (start-process

                       name buffer shell-file-name shell-command-switch
                       (format-spec
                        cmd
                       name buffer shell-file-name shell-command-switch
                       (format-spec
                        cmd


@@ -534,11 +534,11 @@ If ARGS, PROMPT is used as an argument to `format'."
            (while (and (memq (process-status process) '(open run))
                        (set-buffer buffer) ;; XXX "blue moon" nntp.el bug
                        (goto-char (point-min))
            (while (and (memq (process-status process) '(open run))
                        (set-buffer buffer) ;; XXX "blue moon" nntp.el bug
                        (goto-char (point-min))

-                        ;; cyrus 1.6.x (13? < x <= 22) queries capabilities
+                  ;; cyrus 1.6.x (13? < x <= 22) queries capabilities

                        (or (while (looking-at "^C:")
                              (forward-line))
                            t)
                        (or (while (looking-at "^C:")
                              (forward-line))
                            t)

-                       ;; cyrus 1.6 imtest print "S: " before server greeting
+               ;; cyrus 1.6 imtest print "S: " before server greeting

                        (or (not (looking-at "S: "))
                            (forward-char 3)
                            t)
                        (or (not (looking-at "S: "))
                            (forward-char 3)
                            t)


@@ -611,7 +611,7 @@ If ARGS, PROMPT is used as an argument to `format'."
        (progn
          (message "imap: Opening SSL connection with `%s'...done" cmd)
          done)
        (progn
          (message "imap: Opening SSL connection with `%s'...done" cmd)
          done)

-         (message "imap: Opening SSL connection with `%s'...failed" cmd)
+      (message "imap: Opening SSL connection with `%s'...failed" cmd)

       nil)))
 
 (defun imap-network-p (buffer)
       nil)))
 
 (defun imap-network-p (buffer)


@@ -650,7 +650,7 @@ If ARGS, PROMPT is used as an argument to `format'."
       (let* ((port (or port imap-default-port))
             (coding-system-for-read imap-coding-system-for-read)
             (coding-system-for-write imap-coding-system-for-write)
       (let* ((port (or port imap-default-port))
             (coding-system-for-read imap-coding-system-for-read)
             (coding-system-for-write imap-coding-system-for-write)

-            (process (start-process 
+            (process (start-process

                       name buffer shell-file-name shell-command-switch
                       (format-spec
                        cmd
                       name buffer shell-file-name shell-command-switch
                       (format-spec
                        cmd


@@ -679,7 +679,7 @@ If ARGS, PROMPT is used as an argument to `format'."
        (progn
          (message "imap: Opening IMAP connection with `%s'...done" cmd)
          done)
        (progn
          (message "imap: Opening IMAP connection with `%s'...done" cmd)
          done)

-         (message "imap: Opening IMAP connection with `%s'...failed" cmd)
+      (message "imap: Opening IMAP connection with `%s'...failed" cmd)

       nil)))
 
 (defun imap-starttls-p (buffer)
       nil)))
 
 (defun imap-starttls-p (buffer)


@@ -725,7 +725,7 @@ If ARGS, PROMPT is used as an argument to `format'."
          done)
       (message "imap: Connecting with STARTTLS...failed")
       nil)))
          done)
       (message "imap: Connecting with STARTTLS...failed")
       nil)))

-  
+

 ;; Server functions; authenticator stuff:
 
 (defun imap-interactive-login (buffer loginfunc)
 ;; Server functions; authenticator stuff:
 
 (defun imap-interactive-login (buffer loginfunc)


@@ -740,12 +740,12 @@ Returns t if login was successful, nil otherwise."
       ;;      (condition-case ()
       (while (or (not user) (not passwd))
        (setq user (or imap-username
       ;;      (condition-case ()
       (while (or (not user) (not passwd))
        (setq user (or imap-username

-                      (read-from-minibuffer 
+                      (read-from-minibuffer

                        (concat "IMAP username for " imap-server ": ")
                        (or user imap-default-user))))
        (setq passwd (or imap-password
                         (imap-read-passwd
                        (concat "IMAP username for " imap-server ": ")
                        (or user imap-default-user))))
        (setq passwd (or imap-password
                         (imap-read-passwd

-                         (concat "IMAP password for " user "@" 
+                         (concat "IMAP password for " user "@"

                                  imap-server ": "))))
        (when (and user passwd)
          (if (funcall loginfunc user passwd)
                                  imap-server ": "))))
        (when (and user passwd)
          (if (funcall loginfunc user passwd)


@@ -812,10 +812,10 @@ Returns t if login was successful, nil otherwise."
 (defun imap-login-auth (buffer)
   "Login to server using the LOGIN command."
   (message "imap: Plaintext authentication...")
 (defun imap-login-auth (buffer)
   "Login to server using the LOGIN command."
   (message "imap: Plaintext authentication...")

-  (imap-interactive-login buffer 
+  (imap-interactive-login buffer

                          (lambda (user passwd)
                          (lambda (user passwd)

-                           (imap-ok-p (imap-send-command-wait 
-                                       (concat "LOGIN \"" user "\" \"" 
+                           (imap-ok-p (imap-send-command-wait
+                                       (concat "LOGIN \"" user "\" \""

                                                passwd "\""))))))
 
 (defun imap-anonymous-p (buffer)
                                                passwd "\""))))))
 
 (defun imap-anonymous-p (buffer)


@@ -825,7 +825,7 @@ Returns t if login was successful, nil otherwise."
   (message "imap: Loging in anonymously...")
   (with-current-buffer buffer
     (imap-ok-p (imap-send-command-wait
   (message "imap: Loging in anonymously...")
   (with-current-buffer buffer
     (imap-ok-p (imap-send-command-wait

-               (concat "LOGIN anonymous \"" (concat (user-login-name) "@" 
+               (concat "LOGIN anonymous \"" (concat (user-login-name) "@"

                                                     (system-name)) "\"")))))
 
 (defun imap-digest-md5-p (buffer)
                                                     (system-name)) "\"")))))
 
 (defun imap-digest-md5-p (buffer)


@@ -840,7 +840,7 @@ Returns t if login was successful, nil otherwise."
   (imap-interactive-login
    buffer
    (lambda (user passwd)
   (imap-interactive-login
    buffer
    (lambda (user passwd)

-     (let ((tag 
+     (let ((tag

            (imap-send-command
             (list
              "AUTHENTICATE DIGEST-MD5"
            (imap-send-command
             (list
              "AUTHENTICATE DIGEST-MD5"


@@ -848,10 +848,10 @@ Returns t if login was successful, nil otherwise."
                (digest-md5-parse-digest-challenge
                 (base64-decode-string challenge))
                (let* ((digest-uri
                (digest-md5-parse-digest-challenge
                 (base64-decode-string challenge))
                (let* ((digest-uri

-                       (digest-md5-digest-uri 
+                       (digest-md5-digest-uri

                         "imap" (digest-md5-challenge 'realm)))
                       (response
                         "imap" (digest-md5-challenge 'realm)))
                       (response

-                       (digest-md5-digest-response 
+                       (digest-md5-digest-response

                         user passwd digest-uri)))
                  (base64-encode-string response 'no-line-break))))
             )))
                         user passwd digest-uri)))
                  (base64-encode-string response 'no-line-break))))
             )))


@@ -870,7 +870,7 @@ Returns t if login was successful, nil otherwise."
          imap-current-message nil
          imap-state 'initial
          imap-process (condition-case ()
          imap-current-message nil
          imap-state 'initial
          imap-process (condition-case ()

-                          (funcall (nth 2 (assq imap-stream 
+                          (funcall (nth 2 (assq imap-stream

                                                 imap-stream-alist))
                                    "imap" buffer imap-server imap-port)
                         ((error quit) nil)))
                                                 imap-stream-alist))
                                    "imap" buffer imap-server imap-port)
                         ((error quit) nil)))


@@ -917,7 +917,7 @@ necessery.  If nil, the buffer name is generated."
            (let ((streams imap-streams))
              (while (setq stream (pop streams))
                (if (funcall (nth 1 (assq stream imap-stream-alist)) buffer)
            (let ((streams imap-streams))
              (while (setq stream (pop streams))
                (if (funcall (nth 1 (assq stream imap-stream-alist)) buffer)

-                   (setq stream-changed (not (eq (or imap-stream 
+                   (setq stream-changed (not (eq (or imap-stream

                                                      imap-default-stream)
                                                  stream))
                          imap-stream stream
                                                      imap-default-stream)
                                                  stream))
                          imap-stream stream


@@ -930,7 +930,7 @@ necessery.  If nil, the buffer name is generated."
            (if (imap-open-1 buffer)
                (message "imap: Reconnecting with stream `%s'...done"
                         imap-stream)
            (if (imap-open-1 buffer)
                (message "imap: Reconnecting with stream `%s'...done"
                         imap-stream)

-             (message "imap: Reconnecting with stream `%s'...failed" 
+             (message "imap: Reconnecting with stream `%s'...failed"

                       imap-stream))
            (setq imap-capability nil))
          (if (imap-opened buffer)
                       imap-stream))
            (setq imap-capability nil))
          (if (imap-opened buffer)


@@ -938,7 +938,7 @@ necessery.  If nil, the buffer name is generated."
              (when (and (null imap-auth) (not (eq imap-state 'auth)))
                (let ((auths imap-authenticators))
                  (while (setq auth (pop auths))
              (when (and (null imap-auth) (not (eq imap-state 'auth)))
                (let ((auths imap-authenticators))
                  (while (setq auth (pop auths))

-                   (if (funcall (nth 1 (assq auth imap-authenticator-alist)) 
+                   (if (funcall (nth 1 (assq auth imap-authenticator-alist))

                                 buffer)
                        (setq imap-auth auth
                              auths nil)))
                                 buffer)
                        (setq imap-auth auth
                              auths nil)))


@@ -1041,7 +1041,7 @@ If BUFFER is nil, the current buffer is assumed."
 (defun imap-mailbox-map-1 (func &optional mailbox-decoder buffer)
   (with-current-buffer (or buffer (current-buffer))
     (let (result)
 (defun imap-mailbox-map-1 (func &optional mailbox-decoder buffer)
   (with-current-buffer (or buffer (current-buffer))
     (let (result)

-      (mapatoms 
+      (mapatoms

        (lambda (s)
         (push (funcall func (if mailbox-decoder
                                 (funcall mailbox-decoder (symbol-name s))
        (lambda (s)
         (push (funcall func (if mailbox-decoder
                                 (funcall mailbox-decoder (symbol-name s))


@@ -1077,7 +1077,7 @@ If EXAMINE is non-nil, do a read-only select."
       imap-current-mailbox
     (setq imap-current-mailbox mailbox)
     (if (imap-ok-p (imap-send-command-wait
       imap-current-mailbox
     (setq imap-current-mailbox mailbox)
     (if (imap-ok-p (imap-send-command-wait

-                   (concat (if examine "EXAMINE" "SELECT") " \"" 
+                   (concat (if examine "EXAMINE" "SELECT") " \""

                            mailbox "\"")))
        (progn
          (setq imap-message-data (make-vector imap-message-prime 0)
                            mailbox "\"")))
        (progn
          (setq imap-message-data (make-vector imap-message-prime 0)


@@ -1086,9 +1086,9 @@ If EXAMINE is non-nil, do a read-only select."
       ;; Failed SELECT/EXAMINE unselects current mailbox
       (setq imap-current-mailbox nil))))
 
       ;; Failed SELECT/EXAMINE unselects current mailbox
       (setq imap-current-mailbox nil))))
 

-(defun imap-mailbox-select (mailbox &optional examine buffer)  
+(defun imap-mailbox-select (mailbox &optional examine buffer)

   (with-current-buffer (or buffer (current-buffer))
   (with-current-buffer (or buffer (current-buffer))

-    (imap-utf7-decode 
+    (imap-utf7-decode

      (imap-mailbox-select-1 (imap-utf7-encode mailbox) examine))))
 
 (defun imap-mailbox-examine-1 (mailbox &optional buffer)
      (imap-mailbox-select-1 (imap-utf7-encode mailbox) examine))))
 
 (defun imap-mailbox-examine-1 (mailbox &optional buffer)


@@ -1105,7 +1105,7 @@ If EXAMINE is non-nil, do a read-only select."
     (when (or (eq imap-state 'auth)
              (and (imap-capability 'UNSELECT)
                   (imap-ok-p (imap-send-command-wait "UNSELECT")))
     (when (or (eq imap-state 'auth)
              (and (imap-capability 'UNSELECT)
                   (imap-ok-p (imap-send-command-wait "UNSELECT")))

-             (and (imap-ok-p 
+             (and (imap-ok-p

                    (imap-send-command-wait (concat "EXAMINE \""
                                                    imap-current-mailbox
                                                    "\"")))
                    (imap-send-command-wait (concat "EXAMINE \""
                                                    imap-current-mailbox
                                                    "\"")))


@@ -1160,7 +1160,7 @@ If BUFFER is nil the current buffer is assumed."
        (imap-send-command-wait (list "RENAME \"" oldname "\" "
                                     "\"" newname "\""))))))
 
        (imap-send-command-wait (list "RENAME \"" oldname "\" "
                                     "\"" newname "\""))))))
 

-(defun imap-mailbox-lsub (&optional root reference add-delimiter buffer) 
+(defun imap-mailbox-lsub (&optional root reference add-delimiter buffer)

   "Return a list of subscribed mailboxes on server in BUFFER.
 If ROOT is non-nil, only list matching mailboxes.  If ADD-DELIMITER is
 non-nil, a hierarchy delimiter is added to root.  REFERENCE is a
   "Return a list of subscribed mailboxes on server in BUFFER.
 If ROOT is non-nil, only list matching mailboxes.  If ADD-DELIMITER is
 non-nil, a hierarchy delimiter is added to root.  REFERENCE is a


@@ -1174,7 +1174,7 @@ implementation-specific string that has to be passed to lsub command."
     (imap-mailbox-map-1 (lambda (mailbox)
                          (imap-mailbox-put 'lsub nil mailbox)))
     (when (imap-ok-p
     (imap-mailbox-map-1 (lambda (mailbox)
                          (imap-mailbox-put 'lsub nil mailbox)))
     (when (imap-ok-p

-          (imap-send-command-wait 
+          (imap-send-command-wait

            (concat "LSUB \"" reference "\" \"" (imap-utf7-encode root)
                    (and add-delimiter (imap-mailbox-get-1 'delimiter root))
                    "%\"")))
            (concat "LSUB \"" reference "\" \"" (imap-utf7-encode root)
                    (and add-delimiter (imap-mailbox-get-1 'delimiter root))
                    "%\"")))


@@ -1198,7 +1198,7 @@ passed to list command."
     (imap-mailbox-map-1 (lambda (mailbox)
                          (imap-mailbox-put 'list nil mailbox)))
     (when (imap-ok-p
     (imap-mailbox-map-1 (lambda (mailbox)
                          (imap-mailbox-put 'list nil mailbox)))
     (when (imap-ok-p

-          (imap-send-command-wait 
+          (imap-send-command-wait

            (concat "LIST \"" reference "\" \"" (imap-utf7-encode root)
                    (and add-delimiter (imap-mailbox-get-1 'delimiter root))
                    "%\"")))
            (concat "LIST \"" reference "\" \"" (imap-utf7-encode root)
                    (and add-delimiter (imap-mailbox-get-1 'delimiter root))
                    "%\"")))


@@ -1212,7 +1212,7 @@ passed to list command."
   "Send the SUBSCRIBE command on the mailbox to server in BUFFER.
 Returns non-nil if successful."
   (with-current-buffer (or buffer (current-buffer))
   "Send the SUBSCRIBE command on the mailbox to server in BUFFER.
 Returns non-nil if successful."
   (with-current-buffer (or buffer (current-buffer))

-    (imap-ok-p (imap-send-command-wait (concat "SUBSCRIBE \"" 
+    (imap-ok-p (imap-send-command-wait (concat "SUBSCRIBE \""

                                               (imap-utf7-encode mailbox)
                                               "\"")))))
 
                                               (imap-utf7-encode mailbox)
                                               "\"")))))
 


@@ -1220,7 +1220,7 @@ Returns non-nil if successful."
   "Send the SUBSCRIBE command on the mailbox to server in BUFFER.
 Returns non-nil if successful."
   (with-current-buffer (or buffer (current-buffer))
   "Send the SUBSCRIBE command on the mailbox to server in BUFFER.
 Returns non-nil if successful."
   (with-current-buffer (or buffer (current-buffer))

-    (imap-ok-p (imap-send-command-wait (concat "UNSUBSCRIBE " 
+    (imap-ok-p (imap-send-command-wait (concat "UNSUBSCRIBE "

                                               (imap-utf7-encode mailbox)
                                               "\"")))))
 
                                               (imap-utf7-encode mailbox)
                                               "\"")))))
 


@@ -1231,13 +1231,13 @@ the STATUS data items -- ie 'messages, 'recent, 'uidnext, 'uidvalidity
 or 'unseen.  If ITEMS is a list of symbols, a list of values is
 returned, if ITEMS is a symbol only it's value is returned."
   (with-current-buffer (or buffer (current-buffer))
 or 'unseen.  If ITEMS is a list of symbols, a list of values is
 returned, if ITEMS is a symbol only it's value is returned."
   (with-current-buffer (or buffer (current-buffer))

-    (when (imap-ok-p 
+    (when (imap-ok-p

           (imap-send-command-wait (list "STATUS \""
                                         (imap-utf7-encode mailbox)
                                         "\" "
                                         (format "%s"
                                                 (if (listp items)
           (imap-send-command-wait (list "STATUS \""
                                         (imap-utf7-encode mailbox)
                                         "\" "
                                         (format "%s"
                                                 (if (listp items)

-                                                    items 
+                                                    items

                                                   (list items))))))
       (if (listp items)
          (mapcar (lambda (item)
                                                   (list items))))))
       (if (listp items)
          (mapcar (lambda (item)


@@ -1296,8 +1296,8 @@ returned, if ITEMS is a symbol only it's value is returned."
   (mapconcat
    (lambda (item)
      (if (consp item)
   (mapconcat
    (lambda (item)
      (if (consp item)

-         (format "%d:%d"
-                 (car item) (cdr item))
+        (format "%d:%d"
+                (car item) (cdr item))

        (format "%d" item)))
    (if (and (listp range) (not (listp (cdr range))))
        (list range) ;; make (1 . 2) into ((1 . 2))
        (format "%d" item)))
    (if (and (listp range) (not (listp (cdr range))))
        (list range) ;; make (1 . 2) into ((1 . 2))


@@ -1317,7 +1317,7 @@ returned, if ITEMS is a symbol only it's value is returned."
 UIDS can be a string, number or a list of numbers.  If RECEIVE
 is non-nil return theese properties."
   (with-current-buffer (or buffer (current-buffer))
 UIDS can be a string, number or a list of numbers.  If RECEIVE
 is non-nil return theese properties."
   (with-current-buffer (or buffer (current-buffer))

-    (when (imap-ok-p (imap-send-command-wait 
+    (when (imap-ok-p (imap-send-command-wait

                      (format "%sFETCH %s %s" (if nouidfetch "" "UID ")
                              (if (listp uids)
                                  (imap-list-to-message-set uids)
                      (format "%sFETCH %s %s" (if nouidfetch "" "UID ")
                              (if (listp uids)
                                  (imap-list-to-message-set uids)


@@ -1334,7 +1334,7 @@ is non-nil return theese properties."
                        (imap-message-get uid receive)))
                    uids)
          (imap-message-get uids receive))))))
                        (imap-message-get uid receive)))
                    uids)
          (imap-message-get uids receive))))))

-    
+

 (defun imap-message-put (uid propname value &optional buffer)
   (with-current-buffer (or buffer (current-buffer))
     (if imap-message-data
 (defun imap-message-put (uid propname value &optional buffer)
   (with-current-buffer (or buffer (current-buffer))
     (if imap-message-data


@@ -1482,7 +1482,7 @@ first element, rest of list contain the saved articles' UIDs."
                  (imap-ok-p (imap-send-command-wait cmd)))))
            (or no-copyuid
                (imap-message-copyuid-1 mailbox)))))))
                  (imap-ok-p (imap-send-command-wait cmd)))))
            (or no-copyuid
                (imap-message-copyuid-1 mailbox)))))))

-      
+

 (defun imap-message-appenduid-1 (mailbox)
   (if (imap-capability 'UIDPLUS)
       (imap-mailbox-get-1 'appenduid mailbox)
 (defun imap-message-appenduid-1 (mailbox)
   (if (imap-capability 'UIDPLUS)
       (imap-mailbox-get-1 'appenduid mailbox)


@@ -1511,11 +1511,11 @@ on failure."
   (let ((mailbox (imap-utf7-encode mailbox)))
     (with-current-buffer (or buffer (current-buffer))
       (and (let ((imap-current-target-mailbox mailbox))
   (let ((mailbox (imap-utf7-encode mailbox)))
     (with-current-buffer (or buffer (current-buffer))
       (and (let ((imap-current-target-mailbox mailbox))

-            (imap-ok-p 
-             (imap-send-command-wait 
+            (imap-ok-p
+             (imap-send-command-wait

               (list "APPEND \"" mailbox "\" "  article))))
           (imap-message-appenduid-1 mailbox)))))
               (list "APPEND \"" mailbox "\" "  article))))
           (imap-message-appenduid-1 mailbox)))))

-  
+

 (defun imap-body-lines (body)
   "Return number of lines in article by looking at the mime bodystructure BODY."
   (if (listp body)
 (defun imap-body-lines (body)
   "Return number of lines in article by looking at the mime bodystructure BODY."
   (if (listp body)


@@ -1535,8 +1535,8 @@ on failure."
   (and from
        (concat (aref from 0)
               (if (aref from 0) " <")
   (and from
        (concat (aref from 0)
               (if (aref from 0) " <")

-              (aref from 2) 
-              "@" 
+              (aref from 2)
+              "@"

               (aref from 3)
               (if (aref from 0) ">"))))
 
               (aref from 3)
               (if (aref from 0) ">"))))
 


@@ -1576,14 +1576,14 @@ on failure."
                       (replace-match eol)))
                   (if (not calcfirst)
                       (setq size (buffer-size))))
                       (replace-match eol)))
                   (if (not calcfirst)
                       (setq size (buffer-size))))

-                (setq cmdstr 
+                (setq cmdstr

                       (concat cmdstr (format "{%d}" size))))
               (unwind-protect
                   (progn
                     (imap-send-command-1 cmdstr)
                     (setq cmdstr nil)
                     (if (not (eq (imap-wait-for-tag tag) 'INCOMPLETE))
                       (concat cmdstr (format "{%d}" size))))
               (unwind-protect
                   (progn
                     (imap-send-command-1 cmdstr)
                     (setq cmdstr nil)
                     (if (not (eq (imap-wait-for-tag tag) 'INCOMPLETE))

-                        (setq command nil);; abort command if no cont-req
+                        (setq command nil) ;; abort command if no cont-req

                       (let ((process imap-process)
                             (stream imap-stream)
                             (eol imap-client-eol))
                       (let ((process imap-process)
                             (stream imap-stream)
                             (eol imap-client-eol))


@@ -1604,7 +1604,7 @@ on failure."
               (setq cmdstr nil)
               (unwind-protect
                   (if (not (eq (imap-wait-for-tag tag) 'INCOMPLETE))
               (setq cmdstr nil)
               (unwind-protect
                   (if (not (eq (imap-wait-for-tag tag) 'INCOMPLETE))

-                      (setq command nil);; abort command if no cont-req
+                      (setq command nil) ;; abort command if no cont-req

                     (setq command (cons (funcall cmd imap-continuation)
                                         command)))
                 (setq imap-continuation nil)))
                     (setq command (cons (funcall cmd imap-continuation)
                                         command)))
                 (setq imap-continuation nil)))


@@ -1674,7 +1674,7 @@ Return nil if no complete line has arrived."
                         (eq imap-state 'examine))
                     (imap-parse-response))
                    (t
                         (eq imap-state 'examine))
                     (imap-parse-response))
                    (t

-                    (message "Unknown state %s in arrival filter" 
+                    (message "Unknown state %s in arrival filter"

                              imap-state)))
            (delete-region (point-min) (point-max))))))))
 
                              imap-state)))
            (delete-region (point-min) (point-max))))))))
 


@@ -1761,7 +1761,7 @@ Return nil if no complete line has arrived."
 
 (defsubst imap-parse-astring ()
   (or (imap-parse-string)
 
 (defsubst imap-parse-astring ()
   (or (imap-parse-string)

-      (buffer-substring (point) 
+      (buffer-substring (point)

                        (if (re-search-forward "[(){ \r\n%*\"\\]" nil t)
                            (goto-char (1- (match-end 0)))
                          (end-of-line)
                        (if (re-search-forward "[(){ \r\n%*\"\\]" nil t)
                            (goto-char (1- (match-end 0)))
                          (end-of-line)


@@ -1907,11 +1907,11 @@ Return nil if no complete line has arrived."
           (FLAGS      (imap-mailbox-put 'flags (imap-parse-flag-list)))
           (LIST       (imap-parse-data-list 'list))
           (LSUB       (imap-parse-data-list 'lsub))
           (FLAGS      (imap-mailbox-put 'flags (imap-parse-flag-list)))
           (LIST       (imap-parse-data-list 'list))
           (LSUB       (imap-parse-data-list 'lsub))

-          (SEARCH     (imap-mailbox-put 
-                       'search 
+          (SEARCH     (imap-mailbox-put
+                       'search

                        (read (concat "(" (buffer-substring (point) (point-max)) ")"))))
           (STATUS     (imap-parse-status))
                        (read (concat "(" (buffer-substring (point) (point-max)) ")"))))
           (STATUS     (imap-parse-status))

-          (CAPABILITY (setq imap-capability 
+          (CAPABILITY (setq imap-capability

                             (read (concat "(" (upcase (buffer-substring
                                                        (point) (point-max)))
                                           ")"))))
                             (read (concat "(" (upcase (buffer-substring
                                                        (point) (point-max)))
                                           ")"))))


@@ -1941,7 +1941,7 @@ Return nil if no complete line has arrived."
                                                       (search-forward "]")))
                          (imap-forward))
                        (setq text (buffer-substring (point) (point-max)))
                                                       (search-forward "]")))
                          (imap-forward))
                        (setq text (buffer-substring (point) (point-max)))

-                       (push (list token status code text) 
+                       (push (list token status code text)

                              imap-failed-tags))))
               (BAD (progn
                      (setq imap-reached-tag (max imap-reached-tag token))
                              imap-failed-tags))))
               (BAD (progn
                      (setq imap-reached-tag (max imap-reached-tag token))


@@ -1969,14 +1969,14 @@ Return nil if no complete line has arrived."
 
 ;;   resp-text-code  = "ALERT" /
 ;;                     "BADCHARSET [SP "(" astring *(SP astring) ")" ] /
 
 ;;   resp-text-code  = "ALERT" /
 ;;                     "BADCHARSET [SP "(" astring *(SP astring) ")" ] /

-;;                     "NEWNAME" SP string SP string / 
+;;                     "NEWNAME" SP string SP string /

 ;;                    "PARSE" /
 ;;                    "PARSE" /

-;;                     "PERMANENTFLAGS" SP "(" 
+;;                     "PERMANENTFLAGS" SP "("

 ;;                               [flag-perm *(SP flag-perm)] ")" /
 ;;                               [flag-perm *(SP flag-perm)] ")" /

-;;                     "READ-ONLY" / 
-;;                    "READ-WRITE" / 
+;;                     "READ-ONLY" /
+;;                    "READ-WRITE" /

 ;;                    "TRYCREATE" /
 ;;                    "TRYCREATE" /

-;;                     "UIDNEXT" SP nz-number / 
+;;                     "UIDNEXT" SP nz-number /

 ;;                    "UIDVALIDITY" SP nz-number /
 ;;                     "UNSEEN" SP nz-number /
 ;;                     resp-text-atom [SP 1*<any TEXT-CHAR except "]">]
 ;;                    "UIDVALIDITY" SP nz-number /
 ;;                     "UNSEEN" SP nz-number /
 ;;                     resp-text-atom [SP 1*<any TEXT-CHAR except "]">]


@@ -1995,7 +1995,7 @@ Return nil if no complete line has arrived."
 ;;                          ; delimits between two numbers inclusive.
 ;;                          ; Example: 2,4:7,9,12:* is 2,4,5,6,7,9,12,13,
 ;;                          ; 14,15 for a mailbox with 15 messages.
 ;;                          ; delimits between two numbers inclusive.
 ;;                          ; Example: 2,4:7,9,12:* is 2,4,5,6,7,9,12,13,
 ;;                          ; 14,15 for a mailbox with 15 messages.

-;; 
+;;

 ;;   sequence-num    = nz-number / "*"
 ;;                          ; * is the largest number in use.  For message
 ;;                          ; sequence numbers, it is the number of messages
 ;;   sequence-num    = nz-number / "*"
 ;;                          ; * is the largest number in use.  For message
 ;;                          ; sequence numbers, it is the number of messages


@@ -2096,18 +2096,18 @@ Return nil if no complete line has arrived."
 ;;                      "BODY" ["STRUCTURE"] SPACE body /
 ;;                      "BODY" section ["<" number ">"] SPACE nstring /
 ;;                      "UID" SPACE uniqueid) ")"
 ;;                      "BODY" ["STRUCTURE"] SPACE body /
 ;;                      "BODY" section ["<" number ">"] SPACE nstring /
 ;;                      "UID" SPACE uniqueid) ")"

-;;  
+;;

 ;;  date_time       ::= <"> date_day_fixed "-" date_month "-" date_year
 ;;                      SPACE time SPACE zone <">
 ;;  date_time       ::= <"> date_day_fixed "-" date_month "-" date_year
 ;;                      SPACE time SPACE zone <">

-;;  
+;;

 ;;  section         ::= "[" [section_text / (nz_number *["." nz_number]
 ;;                      ["." (section_text / "MIME")])] "]"
 ;;  section         ::= "[" [section_text / (nz_number *["." nz_number]
 ;;                      ["." (section_text / "MIME")])] "]"

-;;  
+;;

 ;;  section_text    ::= "HEADER" / "HEADER.FIELDS" [".NOT"]
 ;;                      SPACE header_list / "TEXT"
 ;;  section_text    ::= "HEADER" / "HEADER.FIELDS" [".NOT"]
 ;;                      SPACE header_list / "TEXT"

-;;  
+;;

 ;;  header_fld_name ::= astring
 ;;  header_fld_name ::= astring

-;;  
+;;

 ;;  header_list     ::= "(" 1#header_fld_name ")"
 
 (defsubst imap-parse-header-list ()
 ;;  header_list     ::= "(" 1#header_fld_name ")"
 
 (defsubst imap-parse-header-list ()


@@ -2120,7 +2120,7 @@ Return nil if no complete line has arrived."
       (nreverse strlist))))
 
 (defsubst imap-parse-fetch-body-section ()
       (nreverse strlist))))
 
 (defsubst imap-parse-fetch-body-section ()

-  (let ((section 
+  (let ((section

         (buffer-substring (point) (1- (re-search-forward "[] ]" nil t)))))
     (if (eq (char-before) ? )
        (prog1
         (buffer-substring (point) (1- (re-search-forward "[] ]" nil t)))))
     (if (eq (char-before) ? )
        (prog1


@@ -2130,7 +2130,7 @@ Return nil if no complete line has arrived."
 
 (defun imap-parse-fetch (response)
   (when (eq (char-after) ?\()
 
 (defun imap-parse-fetch (response)
   (when (eq (char-after) ?\()

-    (let (uid flags envelope internaldate rfc822 rfc822header rfc822text 
+    (let (uid flags envelope internaldate rfc822 rfc822header rfc822text

              rfc822size body bodydetail bodystructure)
       (while (not (eq (char-after) ?\)))
        (imap-forward)
              rfc822size body bodydetail bodystructure)
       (while (not (eq (char-after) ?\)))
        (imap-forward)


@@ -2182,7 +2182,7 @@ Return nil if no complete line has arrived."
 
 ;;   mailbox-data    =  ...
 ;;                      "STATUS" SP mailbox SP "("
 
 ;;   mailbox-data    =  ...
 ;;                      "STATUS" SP mailbox SP "("

-;;                           [status-att SP number 
+;;                           [status-att SP number

 ;;                            *(SP status-att SP number)] ")"
 ;;                      ...
 ;;
 ;;                            *(SP status-att SP number)] ")"
 ;;                      ...
 ;;


@@ -2207,7 +2207,7 @@ Return nil if no complete line has arrived."
                ((eq token 'UNSEEN)
                 (imap-mailbox-put 'unseen (read (current-buffer)) mailbox))
                (t
                ((eq token 'UNSEEN)
                 (imap-mailbox-put 'unseen (read (current-buffer)) mailbox))
                (t

-                (message "Unknown status data %s in mailbox %s ignored" 
+                (message "Unknown status data %s in mailbox %s ignored"

                          token mailbox))))))))
 
 ;;   acl_data        ::= "ACL" SPACE mailbox *(SPACE identifier SPACE
                          token mailbox))))))))
 
 ;;   acl_data        ::= "ACL" SPACE mailbox *(SPACE identifier SPACE


@@ -2286,31 +2286,31 @@ Return nil if no complete line has arrived."
 (defun imap-parse-envelope ()
   (when (eq (char-after) ?\()
     (imap-forward)
 (defun imap-parse-envelope ()
   (when (eq (char-after) ?\()
     (imap-forward)

-    (vector (prog1 (imap-parse-nstring);; date
+    (vector (prog1 (imap-parse-nstring)        ;; date

              (imap-forward))
              (imap-forward))

-           (prog1 (imap-parse-nstring);; subject
+           (prog1 (imap-parse-nstring) ;; subject

              (imap-forward))
              (imap-forward))

-           (prog1 (imap-parse-address-list);; from
+           (prog1 (imap-parse-address-list) ;; from

              (imap-forward))
              (imap-forward))

-           (prog1 (imap-parse-address-list);; sender
+           (prog1 (imap-parse-address-list) ;; sender

              (imap-forward))
              (imap-forward))

-           (prog1 (imap-parse-address-list);; reply-to
+           (prog1 (imap-parse-address-list) ;; reply-to

              (imap-forward))
              (imap-forward))

-           (prog1 (imap-parse-address-list);; to
+           (prog1 (imap-parse-address-list) ;; to

              (imap-forward))
              (imap-forward))

-           (prog1 (imap-parse-address-list);; cc
+           (prog1 (imap-parse-address-list) ;; cc

              (imap-forward))
              (imap-forward))

-           (prog1 (imap-parse-address-list);; bcc
+           (prog1 (imap-parse-address-list) ;; bcc

              (imap-forward))
              (imap-forward))

-           (prog1 (imap-parse-nstring);; in-reply-to
+           (prog1 (imap-parse-nstring) ;; in-reply-to

              (imap-forward))
              (imap-forward))

-           (prog1 (imap-parse-nstring);; message-id
+           (prog1 (imap-parse-nstring) ;; message-id

              (imap-forward)))))
 
 ;;   body-fld-param  = "(" string SP string *(SP string SP string) ")" / nil
 
 (defsubst imap-parse-string-list ()
              (imap-forward)))))
 
 ;;   body-fld-param  = "(" string SP string *(SP string SP string) ")" / nil
 
 (defsubst imap-parse-string-list ()

-  (cond ((eq (char-after) ?\();; body-fld-param
+  (cond ((eq (char-after) ?\() ;; body-fld-param

         (let (strlist str)
           (imap-forward)
           (while (setq str (imap-parse-string))
         (let (strlist str)
           (imap-forward)
           (while (setq str (imap-parse-string))


@@ -2358,7 +2358,7 @@ Return nil if no complete line has arrived."
 
 (defsubst imap-parse-body-ext ()
   (let (ext)
 
 (defsubst imap-parse-body-ext ()
   (let (ext)

-    (when (eq (char-after) ?\ );; body-fld-dsp
+    (when (eq (char-after) ?\ )        ;; body-fld-dsp

       (imap-forward)
       (let (dsp)
        (if (eq (char-after) ?\()
       (imap-forward)
       (let (dsp)
        (if (eq (char-after) ?\()


@@ -2370,12 +2370,12 @@ Return nil if no complete line has arrived."
              (imap-forward))
          (assert (imap-parse-nil) t "In imap-parse-body-ext"))
        (push (nreverse dsp) ext))
              (imap-forward))
          (assert (imap-parse-nil) t "In imap-parse-body-ext"))
        (push (nreverse dsp) ext))

-      (when (eq (char-after) ?\ );; body-fld-lang
+      (when (eq (char-after) ?\ ) ;; body-fld-lang

        (imap-forward)
        (if (eq (char-after) ?\()
            (push (imap-parse-string-list) ext)
          (push (imap-parse-nstring) ext))
        (imap-forward)
        (if (eq (char-after) ?\()
            (push (imap-parse-string-list) ext)
          (push (imap-parse-nstring) ext))

-       (while (eq (char-after) ?\ );; body-extension
+       (while (eq (char-after) ?\ ) ;; body-extension

          (imap-forward)
          (setq ext (append (imap-parse-body-extension) ext)))))
     ext))
          (imap-forward)
          (setq ext (append (imap-parse-body-extension) ext)))))
     ext))


@@ -2449,81 +2449,81 @@ Return nil if no complete line has arrived."
          (let (subbody)
            (while (and (eq (char-after) ?\()
                        (setq subbody (imap-parse-body)))
          (let (subbody)
            (while (and (eq (char-after) ?\()
                        (setq subbody (imap-parse-body)))

-             ;; buggy stalker communigate pro 3.0 insert a SPC between
+            ;; buggy stalker communigate pro 3.0 insert a SPC between

              ;; parts in multiparts
              (when (and (eq (char-after) ?\ )
                         (eq (char-after (1+ (point))) ?\())
                (imap-forward))
              (push subbody body))
            (imap-forward)
              ;; parts in multiparts
              (when (and (eq (char-after) ?\ )
                         (eq (char-after (1+ (point))) ?\())
                (imap-forward))
              (push subbody body))
            (imap-forward)

-           (push (imap-parse-string) body);; media-subtype
-           (when (eq (char-after) ?\ );; body-ext-mpart:
+           (push (imap-parse-string) body) ;; media-subtype
+           (when (eq (char-after) ?\ ) ;; body-ext-mpart:

              (imap-forward)
              (imap-forward)

-             (if (eq (char-after) ?\();; body-fld-param
+             (if (eq (char-after) ?\() ;; body-fld-param

                  (push (imap-parse-string-list) body)
                (push (and (imap-parse-nil) nil) body))
              (setq body
                  (push (imap-parse-string-list) body)
                (push (and (imap-parse-nil) nil) body))
              (setq body

-                   (append (imap-parse-body-ext) body)));; body-ext-...
+                   (append (imap-parse-body-ext) body))) ;; body-ext-...

            (assert (eq (char-after) ?\)) t "In imap-parse-body")
            (imap-forward)
            (nreverse body))
 
            (assert (eq (char-after) ?\)) t "In imap-parse-body")
            (imap-forward)
            (nreverse body))
 

-       (push (imap-parse-string) body);; media-type
+       (push (imap-parse-string) body) ;; media-type

        (imap-forward)
        (imap-forward)

-       (push (imap-parse-string) body);; media-subtype
+       (push (imap-parse-string) body) ;; media-subtype

        (imap-forward)
        ;; next line for Sun SIMS bug
        (and (eq (char-after) ? ) (imap-forward))
        (imap-forward)
        ;; next line for Sun SIMS bug
        (and (eq (char-after) ? ) (imap-forward))

-       (if (eq (char-after) ?\();; body-fld-param
+       (if (eq (char-after) ?\() ;; body-fld-param

            (push (imap-parse-string-list) body)
          (push (and (imap-parse-nil) nil) body))
        (imap-forward)
            (push (imap-parse-string-list) body)
          (push (and (imap-parse-nil) nil) body))
        (imap-forward)

-       (push (imap-parse-nstring) body);; body-fld-id
+       (push (imap-parse-nstring) body) ;; body-fld-id

        (imap-forward)
        (imap-forward)

-       (push (imap-parse-nstring) body);; body-fld-desc
+       (push (imap-parse-nstring) body) ;; body-fld-desc

        (imap-forward)
        ;; next `or' for Sun SIMS bug, it regard body-fld-enc as a
        ;; nstring and return NIL instead of defaulting back to 7BIT
        ;; as the standard says.
        (imap-forward)
        ;; next `or' for Sun SIMS bug, it regard body-fld-enc as a
        ;; nstring and return NIL instead of defaulting back to 7BIT
        ;; as the standard says.

-       (push (or (imap-parse-nstring) "7BIT") body);; body-fld-enc
+       (push (or (imap-parse-nstring) "7BIT") body) ;; body-fld-enc

        (imap-forward)
        (imap-forward)

-       (push (imap-parse-number) body);; body-fld-octets
+       (push (imap-parse-number) body) ;; body-fld-octets

 
 

-       ;; ok, we're done parsing the required parts, what comes now is one
+   ;; ok, we're done parsing the required parts, what comes now is one

        ;; of three things:
        ;;
        ;; envelope       (then we're parsing body-type-msg)
        ;; body-fld-lines (then we're parsing body-type-text)
        ;; body-ext-1part (then we're parsing body-type-basic)
        ;;
        ;; of three things:
        ;;
        ;; envelope       (then we're parsing body-type-msg)
        ;; body-fld-lines (then we're parsing body-type-text)
        ;; body-ext-1part (then we're parsing body-type-basic)
        ;;

-       ;; the problem is that the two first are in turn optionally followed
-       ;; by the third.  So we parse the first two here (if there are any)...
+  ;; the problem is that the two first are in turn optionally followed
+;; by the third.  So we parse the first two here (if there are any)...

 
        (when (eq (char-after) ?\ )
          (imap-forward)
          (let (lines)
 
        (when (eq (char-after) ?\ )
          (imap-forward)
          (let (lines)

-           (cond ((eq (char-after) ?\();; body-type-msg:
-                  (push (imap-parse-envelope) body);; envelope
+           (cond ((eq (char-after) ?\() ;; body-type-msg:
+                  (push (imap-parse-envelope) body) ;; envelope

                   (imap-forward)
                   (imap-forward)

-                  (push (imap-parse-body) body);; body
+                  (push (imap-parse-body) body) ;; body

                   ;; buggy stalker communigate pro 3.0 doesn't print
                   ;; number of lines in message/rfc822 attachment
                   (if (eq (char-after) ?\))
                       (push 0 body)
                     (imap-forward)
                     (push (imap-parse-number) body))) ;; body-fld-lines
                   ;; buggy stalker communigate pro 3.0 doesn't print
                   ;; number of lines in message/rfc822 attachment
                   (if (eq (char-after) ?\))
                       (push 0 body)
                     (imap-forward)
                     (push (imap-parse-number) body))) ;; body-fld-lines

-                 ((setq lines (imap-parse-number))    ;; body-type-text:
-                  (push lines body))                  ;; body-fld-lines
+                 ((setq lines (imap-parse-number)) ;; body-type-text:
+                  (push lines body)) ;; body-fld-lines

                  (t
                  (t

-                  (backward-char)))))                 ;; no match...
+                  (backward-char))))) ;; no match...

 
        ;; ...and then parse the third one here...
 
 
        ;; ...and then parse the third one here...
 

-       (when (eq (char-after) ?\ );; body-ext-1part:
+       (when (eq (char-after) ?\ ) ;; body-ext-1part:

          (imap-forward)
          (imap-forward)

-         (push (imap-parse-nstring) body);; body-fld-md5
-         (setq body (append (imap-parse-body-ext) body)));; body-ext-1part..
-    
+         (push (imap-parse-nstring) body) ;; body-fld-md5
+         (setq body (append (imap-parse-body-ext) body))) ;; body-ext-1part..
+

        (assert (eq (char-after) ?\)) t "In imap-parse-body 2")
        (imap-forward)
        (nreverse body)))))
        (assert (eq (char-after) ?\)) t "In imap-parse-body 2")
        (imap-forward)
        (nreverse body)))))


@@ -2531,7 +2531,7 @@ Return nil if no complete line has arrived."
 (when imap-debug                       ; (untrace-all)
   (require 'trace)
   (buffer-disable-undo (get-buffer-create imap-debug))
 (when imap-debug                       ; (untrace-all)
   (require 'trace)
   (buffer-disable-undo (get-buffer-create imap-debug))

-  (mapcar (lambda (f) (trace-function-background f imap-debug)) 
+  (mapcar (lambda (f) (trace-function-background f imap-debug))

          '(
            imap-read-passwd
            imap-utf7-encode
          '(
            imap-read-passwd
            imap-utf7-encode


@@ -2625,7 +2625,7 @@ Return nil if no complete line has arrived."
            imap-parse-body-extension
            imap-parse-body
            )))
            imap-parse-body-extension
            imap-parse-body
            )))

-       
+

 (provide 'imap)
 
 ;;; imap.el ends here
 (provide 'imap)
 
 ;;; imap.el ends here

diff --git a/lisp/lpath.el b/lisp/lpath.el
index 96fa5da..a0d2a6c 100644 (file)
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -13,7 +13,7 @@
 
 (maybe-fbind '(babel-fetch
               babel-wash create-image decode-coding-string display-graphic-p
 
 (maybe-fbind '(babel-fetch
               babel-wash create-image decode-coding-string display-graphic-p

-               bbdb-complete-name
+              bbdb-complete-name

               display-time-event-handler
               find-image font-create-object gnus-mule-get-coding-system
               font-lock-set-defaults
               display-time-event-handler
               find-image font-create-object gnus-mule-get-coding-system
               font-lock-set-defaults

diff --git a/lisp/mailcap.el b/lisp/mailcap.el
index bcfd238..4c6b238 100644 (file)
--- a/lisp/mailcap.el
+++ b/lisp/mailcap.el
@@ -314,7 +314,7 @@ If you are unsure what to do, please answer \"no\"."
   "Text of warning message displayed by `mailcap-maybe-eval'.
 Make sure that this text consists only of few text lines.  Otherwise,
 Gnus might fail to display all of it.")
   "Text of warning message displayed by `mailcap-maybe-eval'.
 Make sure that this text consists only of few text lines.  Otherwise,
 Gnus might fail to display all of it.")

- 
+

 (defun mailcap-maybe-eval ()
   "Maybe evaluate a buffer of Emacs Lisp code."
   (let ((lisp-buffer (current-buffer)))
 (defun mailcap-maybe-eval ()
   "Maybe evaluate a buffer of Emacs Lisp code."
   (let ((lisp-buffer (current-buffer)))

diff --git a/lisp/message.el b/lisp/message.el
index 7a11b46..6af0bcd 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -32,7 +32,7 @@
 
 (eval-when-compile
   (require 'cl)
 
 (eval-when-compile
   (require 'cl)

-  (defvar gnus-list-identifiers))      ; gnus-sum is required where necessary
+  (defvar gnus-list-identifiers)) ; gnus-sum is required where necessary

 (require 'mailheader)
 (require 'nnheader)
 ;; This is apparently necessary even though things are autoloaded:
 (require 'mailheader)
 (require 'nnheader)
 ;; This is apparently necessary even though things are autoloaded:


@@ -420,8 +420,8 @@ query the user whether to use the value.  If it is the symbol `use',
 always use the value."
   :group 'message-interface
   :type '(choice (const :tag "ignore" nil)
 always use the value."
   :group 'message-interface
   :type '(choice (const :tag "ignore" nil)

-                (const use)
-                (const ask)))
+                (const use)
+                (const ask)))

 
 (defcustom message-sendmail-f-is-evil nil
   "*Non-nil means don't add \"-f username\" to the sendmail command line.
 
 (defcustom message-sendmail-f-is-evil nil
   "*Non-nil means don't add \"-f username\" to the sendmail command line.


@@ -670,9 +670,9 @@ these lines."
                   (let ((case-fold-search nil))
                     (re-search-forward "^OR\\>" nil t)))
               (kill-buffer buffer))))
                   (let ((case-fold-search nil))
                     (re-search-forward "^OR\\>" nil t)))
               (kill-buffer buffer))))

-      ;; According to RFC822, "The field-name must be composed of printable
-      ;; ASCII characters (i. e., characters that have decimal values between
-      ;; 33 and 126, except colon)", i. e., any chars except ctl chars,
+ ;; According to RFC822, "The field-name must be composed of printable
+;; ASCII characters (i. e., characters that have decimal values between
+     ;; 33 and 126, except colon)", i. e., any chars except ctl chars,

       ;; space, or colon.
       '(looking-at "[ \t]\\|[][!\"#$%&'()*+,-./0-9;<=>?@A-Z\\\\^_`a-z{|}~]+:"))
   "*Set this non-nil if the system's mailer runs the header and body together.
       ;; space, or colon.
       '(looking-at "[ \t]\\|[][!\"#$%&'()*+,-./0-9;<=>?@A-Z\\\\^_`a-z{|}~]+:"))
   "*Set this non-nil if the system's mailer runs the header and body together.


@@ -1036,14 +1036,14 @@ no, only reply back to the author."
     (concat
      "From "
 
     (concat
      "From "
 

-     ;; Many things can happen to an RFC 822 mailbox before it is put into
+ ;; Many things can happen to an RFC 822 mailbox before it is put into

      ;; a `From' line.  The leading phrase can be stripped, e.g.
      ;; a `From' line.  The leading phrase can be stripped, e.g.

-     ;; `Joe <@w.x:joe@y.z>' -> `<@w.x:joe@y.z>'.  The <> can be stripped, e.g.
-     ;; `<@x.y:joe@y.z>' -> `@x.y:joe@y.z'.  Everything starting with a CRLF
+;; `Joe <@w.x:joe@y.z>' -> `<@w.x:joe@y.z>'.  The <> can be stripped, e.g.
+;; `<@x.y:joe@y.z>' -> `@x.y:joe@y.z'.  Everything starting with a CRLF

      ;; can be removed, e.g.
      ;;                From: joe@y.z (Joe      K
      ;;                        User)
      ;; can be removed, e.g.
      ;;                From: joe@y.z (Joe      K
      ;;                        User)

-     ;; can yield `From joe@y.z (Joe   K Fri Mar 22 08:11:15 1996', and
+ ;; can yield `From joe@y.z (Joe       K Fri Mar 22 08:11:15 1996', and

      ;;                From: Joe User
      ;;                        <joe@y.z>
      ;; can yield `From Joe User Fri Mar 22 08:11:15 1996'.
      ;;                From: Joe User
      ;;                        <joe@y.z>
      ;; can yield `From Joe User Fri Mar 22 08:11:15 1996'.


@@ -1051,7 +1051,7 @@ no, only reply back to the author."
      ;;                From: "Joe User"{space}{tab}
      ;;                        <joe@y.z>
      ;; can yield `From {space}{tab} Fri Mar 22 08:11:15 1996',
      ;;                From: "Joe User"{space}{tab}
      ;;                        <joe@y.z>
      ;; can yield `From {space}{tab} Fri Mar 22 08:11:15 1996',

-     ;; where {space} and {tab} represent the Ascii space and tab characters.
+;; where {space} and {tab} represent the Ascii space and tab characters.

      ;; We want to match the results of any of these manglings.
      ;; The following regexp rejects names whose first characters are
      ;; obviously bogus, but after that anything goes.
      ;; We want to match the results of any of these manglings.
      ;; The following regexp rejects names whose first characters are
      ;; obviously bogus, but after that anything goes.


@@ -1150,11 +1150,11 @@ no, only reply back to the author."
 (defun message-unquote-tokens (elems)
   "Remove double quotes (\") from strings in list ELEMS."
   (mapcar (lambda (item)
 (defun message-unquote-tokens (elems)
   "Remove double quotes (\") from strings in list ELEMS."
   (mapcar (lambda (item)

-            (while (string-match "^\\(.*\\)\"\\(.*\\)$" item)
-              (setq item (concat (match-string 1 item)
-                                 (match-string 2 item))))
-            item)
-          elems))
+           (while (string-match "^\\(.*\\)\"\\(.*\\)$" item)
+             (setq item (concat (match-string 1 item)
+                                (match-string 2 item))))
+           item)
+         elems))

 
 (defun message-tokenize-header (header &optional separator)
   "Split HEADER into a list of header elements.
 
 (defun message-tokenize-header (header &optional separator)
   "Split HEADER into a list of header elements.


@@ -1189,7 +1189,7 @@ is used by default."
                ((and (eq (char-after) ?\))
                      (not quoted))
                 (setq paren nil))))
                ((and (eq (char-after) ?\))
                      (not quoted))
                 (setq paren nil))))

-        (nreverse elems)))))
+       (nreverse elems)))))

 
 (defun message-mail-file-mbox-p (file)
   "Say whether FILE looks like a Unix mbox file."
 
 (defun message-mail-file-mbox-p (file)
   "Say whether FILE looks like a Unix mbox file."


@@ -1273,7 +1273,7 @@ is used by default."
                    gnus-list-identifiers
                  (mapconcat 'identity gnus-list-identifiers " *\\|"))))
     (if (string-match (concat "\\(\\(\\(Re: +\\)?\\(" regexp
                    gnus-list-identifiers
                  (mapconcat 'identity gnus-list-identifiers " *\\|"))))
     (if (string-match (concat "\\(\\(\\(Re: +\\)?\\(" regexp

-                               " *\\)\\)+\\(Re: +\\)?\\)") subject)
+                             " *\\)\\)+\\(Re: +\\)?\\)") subject)

        (concat (substring subject 0 (match-beginning 1))
                (or (match-string 3 subject)
                    (match-string 5 subject))
        (concat (substring subject 0 (match-beginning 1))
                (or (match-string 3 subject)
                    (match-string 5 subject))


@@ -1308,7 +1308,7 @@ Return the number of headers removed."
              (setq last t))
            (delete-region
             (point)
              (setq last t))
            (delete-region
             (point)

-            ;; There might be a continuation header, so we have to search
+        ;; There might be a continuation header, so we have to search

             ;; until we find a new non-continuation line.
             (progn
               (forward-line 1)
             ;; until we find a new non-continuation line.
             (progn
               (forward-line 1)


@@ -1496,53 +1496,53 @@ Point is left at the beginning of the narrowed-to region."
   (define-key message-mode-map "\M-;" 'comment-region))
 
 (easy-menu-define
   (define-key message-mode-map "\M-;" 'comment-region))
 
 (easy-menu-define

- message-mode-menu message-mode-map "Message Menu."
- `("Message"
-   ["Sort Headers" message-sort-headers t]
-   ["Yank Original" message-yank-original t]
-   ["Fill Yanked Message" message-fill-yanked-message t]
-   ["Insert Signature" message-insert-signature t]
-   ["Caesar (rot13) Message" message-caesar-buffer-body t]
-   ["Caesar (rot13) Region" message-caesar-region (mark t)]
-   ["Elide Region" message-elide-region (mark t)]
-   ["Delete Outside Region" message-delete-not-region (mark t)]
-   ["Kill To Signature" message-kill-to-signature t]
-   ["Newline and Reformat" message-newline-and-reformat t]
-   ["Rename buffer" message-rename-buffer t]
-   ["Spellcheck" ispell-message
-    ,@(if (featurep 'xemacs) '(t)
-       '(:help "Spellcheck this message"))]
-   ["Attach file as MIME" mml-attach-file
-    ,@(if (featurep 'xemacs) '(t)
-       '(:help "Attach a file at point"))]
-   "----"
-   ["Send Message" message-send-and-exit
-    ,@(if (featurep 'xemacs) '(t)
-       '(:help "Send this message"))]
-   ["Abort Message" message-dont-send
-    ,@(if (featurep 'xemacs) '(t)
-       '(:help "File this draft message and exit"))]
-   ["Kill Message" message-kill-buffer
-    ,@(if (featurep 'xemacs) '(t)
-       '(:help "Delete this message without sending"))]))
+  message-mode-menu message-mode-map "Message Menu."
+  `("Message"
+    ["Sort Headers" message-sort-headers t]
+    ["Yank Original" message-yank-original t]
+    ["Fill Yanked Message" message-fill-yanked-message t]
+    ["Insert Signature" message-insert-signature t]
+    ["Caesar (rot13) Message" message-caesar-buffer-body t]
+    ["Caesar (rot13) Region" message-caesar-region (mark t)]
+    ["Elide Region" message-elide-region (mark t)]
+    ["Delete Outside Region" message-delete-not-region (mark t)]
+    ["Kill To Signature" message-kill-to-signature t]
+    ["Newline and Reformat" message-newline-and-reformat t]
+    ["Rename buffer" message-rename-buffer t]
+    ["Spellcheck" ispell-message
+     ,@(if (featurep 'xemacs) '(t)
+        '(:help "Spellcheck this message"))]
+    ["Attach file as MIME" mml-attach-file
+     ,@(if (featurep 'xemacs) '(t)
+        '(:help "Attach a file at point"))]
+    "----"
+    ["Send Message" message-send-and-exit
+     ,@(if (featurep 'xemacs) '(t)
+        '(:help "Send this message"))]
+    ["Abort Message" message-dont-send
+     ,@(if (featurep 'xemacs) '(t)
+        '(:help "File this draft message and exit"))]
+    ["Kill Message" message-kill-buffer
+     ,@(if (featurep 'xemacs) '(t)
+        '(:help "Delete this message without sending"))]))

 
 (easy-menu-define
 
 (easy-menu-define

- message-mode-field-menu message-mode-map ""
- '("Field"
-   ["Fetch To" message-insert-to t]
-   ["Fetch Newsgroups" message-insert-newsgroups t]
-   "----"
-   ["To" message-goto-to t]
-   ["Subject" message-goto-subject t]
-   ["Cc" message-goto-cc t]
-   ["Reply-To" message-goto-reply-to t]
-   ["Summary" message-goto-summary t]
-   ["Keywords" message-goto-keywords t]
-   ["Newsgroups" message-goto-newsgroups t]
-   ["Followup-To" message-goto-followup-to t]
-   ["Distribution" message-goto-distribution t]
-   ["Body" message-goto-body t]
-   ["Signature" message-goto-signature t]))
+  message-mode-field-menu message-mode-map ""
+  '("Field"
+    ["Fetch To" message-insert-to t]
+    ["Fetch Newsgroups" message-insert-newsgroups t]
+    "----"
+    ["To" message-goto-to t]
+    ["Subject" message-goto-subject t]
+    ["Cc" message-goto-cc t]
+    ["Reply-To" message-goto-reply-to t]
+    ["Summary" message-goto-summary t]
+    ["Keywords" message-goto-keywords t]
+    ["Newsgroups" message-goto-newsgroups t]
+    ["Followup-To" message-goto-followup-to t]
+    ["Distribution" message-goto-distribution t]
+    ["Body" message-goto-body t]
+    ["Signature" message-goto-signature t]))

 
 (defvar message-tool-bar-map nil)
 
 
 (defvar message-tool-bar-map nil)
 


@@ -1633,22 +1633,22 @@ M-RET    `message-newline-and-reformat' (break the line and reformat)."
   (let ((quote-prefix-regexp
         ;; User should change message-cite-prefix-regexp if
         ;; message-yank-prefix is set to an abnormal value.
   (let ((quote-prefix-regexp
         ;; User should change message-cite-prefix-regexp if
         ;; message-yank-prefix is set to an abnormal value.

-         (concat "\\(" message-cite-prefix-regexp "\\)[ \t]*")))
+        (concat "\\(" message-cite-prefix-regexp "\\)[ \t]*")))

     (setq paragraph-start
     (setq paragraph-start

-          (concat
-           (regexp-quote mail-header-separator) "$\\|"
-           "[ \t]*$\\|"                 ; blank lines
-           "-- $\\|"                    ; signature delimiter
-           "---+$\\|"                   ; delimiters for forwarded messages
-           page-delimiter "$\\|"        ; spoiler warnings
-           ".*wrote:$\\|"               ; attribution lines
-           quote-prefix-regexp "$"))    ; empty lines in quoted text
+         (concat
+          (regexp-quote mail-header-separator) "$\\|"
+          "[ \t]*$\\|"                 ; blank lines
+          "-- $\\|"                    ; signature delimiter
+          "---+$\\|"              ; delimiters for forwarded messages
+          page-delimiter "$\\|"        ; spoiler warnings
+          ".*wrote:$\\|"               ; attribution lines
+          quote-prefix-regexp "$"))    ; empty lines in quoted text

     (setq paragraph-separate paragraph-start)
     (setq adaptive-fill-regexp
     (setq paragraph-separate paragraph-start)
     (setq adaptive-fill-regexp

-          (concat quote-prefix-regexp "\\|" adaptive-fill-regexp))
+         (concat quote-prefix-regexp "\\|" adaptive-fill-regexp))

     (setq adaptive-fill-first-line-regexp
     (setq adaptive-fill-first-line-regexp

-          (concat quote-prefix-regexp "\\|"
-                  adaptive-fill-first-line-regexp))
+         (concat quote-prefix-regexp "\\|"
+                 adaptive-fill-first-line-regexp))

     (setq auto-fill-inhibit-regexp "^[A-Z][^: \n\t]+:")))
 
 \f
     (setq auto-fill-inhibit-regexp "^[A-Z][^: \n\t]+:")))
 
 \f


@@ -1843,7 +1843,7 @@ Prefix arg means justify as well."
     (if not-break
        (while (and (not (eobp))
                    (not (looking-at message-cite-prefix-regexp))
     (if not-break
        (while (and (not (eobp))
                    (not (looking-at message-cite-prefix-regexp))

-               (looking-at paragraph-start))
+                   (looking-at paragraph-start))

          (forward-line 1)))
     ;; Find the prefix
     (when (looking-at message-cite-prefix-regexp)
          (forward-line 1)))
     ;; Find the prefix
     (when (looking-at message-cite-prefix-regexp)


@@ -1906,7 +1906,7 @@ Prefix arg means justify as well."
          (insert quoted leading-space)))
       (if quoted
          (let* ((adaptive-fill-regexp
          (insert quoted leading-space)))
       (if quoted
          (let* ((adaptive-fill-regexp

-                (regexp-quote (concat quoted leading-space)))
+                 (regexp-quote (concat quoted leading-space)))

                 (adaptive-fill-first-line-regexp
                  adaptive-fill-regexp ))
            (fill-paragraph arg))
                 (adaptive-fill-first-line-regexp
                  adaptive-fill-regexp ))
            (fill-paragraph arg))


@@ -1976,7 +1976,7 @@ text was killed."
       (prefix-numeric-value current-prefix-arg))))
 
   (setq n (if (numberp n) (mod n 26) 13)) ;canonize N
       (prefix-numeric-value current-prefix-arg))))
 
   (setq n (if (numberp n) (mod n 26) 13)) ;canonize N

-  (unless (or (zerop n)                        ; no action needed for a rot of 0
+  (unless (or (zerop n)                     ; no action needed for a rot of 0

              (= b e))                  ; no region to rotate
     ;; We build the table, if necessary.
     (when (or (not message-caesar-translation-table)
              (= b e))                  ; no region to rotate
     ;; We build the table, if necessary.
     (when (or (not message-caesar-translation-table)


@@ -2019,7 +2019,7 @@ Mail and USENET news headers are not rotated."
   (save-excursion
     (save-restriction
       (when (message-goto-body)
   (save-excursion
     (save-restriction
       (when (message-goto-body)

-        (narrow-to-region (point) (point-max)))
+       (narrow-to-region (point) (point-max)))

       (shell-command-on-region
        (point-min) (point-max) program nil t))))
 
       (shell-command-on-region
        (point-min) (point-max) program nil t))))
 


@@ -2178,7 +2178,7 @@ prefix, and don't delete any headers."
        (insert "\n"))
       (funcall message-citation-line-function))))
 
        (insert "\n"))
       (funcall message-citation-line-function))))
 

-(eval-when-compile (defvar mail-citation-hook))                ;Compiler directive
+(eval-when-compile (defvar mail-citation-hook))        ;Compiler directive

 (defun message-cite-original ()
   "Cite function in the standard Message manner."
   (if (and (boundp 'mail-citation-hook)
 (defun message-cite-original ()
   "Cite function in the standard Message manner."
   (if (and (boundp 'mail-citation-hook)


@@ -2476,7 +2476,7 @@ It should typically alter the sending method in some way or other."
              (widen)
              (mm-with-unibyte-current-buffer
                (funcall (or message-send-mail-real-function
              (widen)
              (mm-with-unibyte-current-buffer
                (funcall (or message-send-mail-real-function

-                             message-send-mail-function))))
+                            message-send-mail-function))))

            (setq n (+ n 1))
            (setq p (pop plist))
            (erase-buffer)))
            (setq n (+ n 1))
            (setq p (pop plist))
            (erase-buffer)))


@@ -2543,7 +2543,7 @@ It should typically alter the sending method in some way or other."
              (mm-with-unibyte-current-buffer
                (message "Sending via mail...")
                (funcall (or message-send-mail-real-function
              (mm-with-unibyte-current-buffer
                (message "Sending via mail...")
                (funcall (or message-send-mail-real-function

-                             message-send-mail-function)))
+                            message-send-mail-function)))

            (message-send-mail-partially)))
       (kill-buffer tembuf))
     (set-buffer mailbuf)
            (message-send-mail-partially)))
       (kill-buffer tembuf))
     (set-buffer mailbuf)


@@ -2630,23 +2630,23 @@ to find out how to use this."
        (apply
         'call-process-region 1 (point-max) message-qmail-inject-program
         nil nil nil
        (apply
         'call-process-region 1 (point-max) message-qmail-inject-program
         nil nil nil

-        ;; qmail-inject's default behaviour is to look for addresses on the
+   ;; qmail-inject's default behaviour is to look for addresses on the

         ;; command line; if there're none, it scans the headers.
         ;; command line; if there're none, it scans the headers.

-        ;; yes, it does The Right Thing w.r.t. Resent-To and it's kin.
+       ;; yes, it does The Right Thing w.r.t. Resent-To and it's kin.

         ;;
         ;;

-        ;; in general, ALL of qmail-inject's defaults are perfect for simply
-        ;; reading a formatted (i. e., at least a To: or Resent-To header)
+  ;; in general, ALL of qmail-inject's defaults are perfect for simply
+    ;; reading a formatted (i. e., at least a To: or Resent-To header)

         ;; message from stdin.
         ;;
         ;; qmail also has the advantage of not having been raped by
         ;; message from stdin.
         ;;
         ;; qmail also has the advantage of not having been raped by

-        ;; various vendors, so we don't have to allow for that, either --
+     ;; various vendors, so we don't have to allow for that, either --

         ;; compare this with message-send-mail-with-sendmail and weep
         ;; for sendmail's lost innocence.
         ;;
         ;; compare this with message-send-mail-with-sendmail and weep
         ;; for sendmail's lost innocence.
         ;;

-        ;; all this is way cool coz it lets us keep the arguments entirely
-        ;; free for -inject-arguments -- a big win for the user and for us
-        ;; since we don't have to play that double-guessing game and the user
-        ;; gets full control (no gestapo'ish -f's, for instance).  --sj
+    ;; all this is way cool coz it lets us keep the arguments entirely
+    ;; free for -inject-arguments -- a big win for the user and for us
+ ;; since we don't have to play that double-guessing game and the user
+       ;; gets full control (no gestapo'ish -f's, for instance).  --sj

         message-qmail-inject-args))
     ;; qmail-inject doesn't say anything on it's stdout/stderr,
     ;; we have to look at the retval instead
         message-qmail-inject-args))
     ;; qmail-inject doesn't say anything on it's stdout/stderr,
     ;; we have to look at the retval instead


@@ -2887,23 +2887,23 @@ to find out how to use this."
                     (if followup-to
                         (concat newsgroups "," followup-to)
                       newsgroups)))
                     (if followup-to
                         (concat newsgroups "," followup-to)
                       newsgroups)))

-            (known-groups
-             (mapcar '(lambda (n) (gnus-group-real-name n))
-                     (gnus-groups-from-server
-                      (cond ((equal gnus-post-method 'current)
-                             gnus-current-select-method)
-                            (gnus-post-method gnus-post-method)
-                            (t gnus-select-method)))))
+           (known-groups
+            (mapcar '(lambda (n) (gnus-group-real-name n))
+                    (gnus-groups-from-server
+                     (cond ((equal gnus-post-method 'current)
+                            gnus-current-select-method)
+                           (gnus-post-method gnus-post-method)
+                           (t gnus-select-method)))))

            errors)
        (while groups
            errors)
        (while groups

-         (unless (or (equal (car groups) "poster")
-                     (member (car groups) known-groups))
-           (push (car groups) errors))
-         (pop groups))
+        (unless (or (equal (car groups) "poster")
+                    (member (car groups) known-groups))
+          (push (car groups) errors))
+        (pop groups))

        (cond
        ;; Gnus is not running.
        ((or (not (and (boundp 'gnus-active-hashtb)
        (cond
        ;; Gnus is not running.
        ((or (not (and (boundp 'gnus-active-hashtb)

-                       gnus-active-hashtb))
+                      gnus-active-hashtb))

             (not (boundp 'gnus-read-active-file)))
         t)
        ;; We don't have all the group names.
             (not (boundp 'gnus-read-active-file)))
         t)
        ;; We don't have all the group names.


@@ -2927,95 +2927,95 @@ to find out how to use this."
           (if (= (length errors) 1) "this" "these")
           (if (= (length errors) 1) "" "s")
           (mapconcat 'identity errors ", ")))))))
           (if (= (length errors) 1) "this" "these")
           (if (= (length errors) 1) "" "s")
           (mapconcat 'identity errors ", ")))))))

-     ;; Check the Newsgroups & Followup-To headers for syntax errors.
-     (message-check 'valid-newsgroups
-       (let ((case-fold-search t)
-            (headers '("Newsgroups" "Followup-To"))
-            header error)
-        (while (and headers (not error))
-          (when (setq header (mail-fetch-field (car headers)))
-            (if (or
-                 (not
-                  (string-match
-                   "\\`\\([-+_&.a-zA-Z0-9]+\\)?\\(,[-+_&.a-zA-Z0-9]+\\)*\\'"
-                   header))
-                 (memq
-                  nil (mapcar
-                       (lambda (g)
-                         (not (string-match "\\.\\'\\|\\.\\." g)))
-                       (message-tokenize-header header ","))))
-                (setq error t)))
-          (unless error
-            (pop headers)))
-        (if (not error)
-            t
-          (y-or-n-p
-           (format "The %s header looks odd: \"%s\".  Really post? "
-                   (car headers) header)))))
-     (message-check 'repeated-newsgroups
-       (let ((case-fold-search t)
-            (headers '("Newsgroups" "Followup-To"))
-            header error groups group)
-        (while (and headers
-                    (not error))
-          (when (setq header (mail-fetch-field (pop headers)))
-            (setq groups (message-tokenize-header header ","))
-            (while (setq group (pop groups))
-              (when (member group groups)
-                (setq error group
-                      groups nil)))))
-        (if (not error)
-            t
-          (y-or-n-p
-           (format "Group %s is repeated in headers.  Really post? " error)))))
-     ;; Check the From header.
-     (message-check 'from
-       (let* ((case-fold-search t)
-             (from (message-fetch-field "from"))
-             ad)
-        (cond
-         ((not from)
-          (message "There is no From line.  Posting is denied.")
-          nil)
-         ((or (not (string-match
-                    "@[^\\.]*\\."
-                    (setq ad (nth 1 (mail-extract-address-components
-                                     from))))) ;larsi@ifi
-              (string-match "\\.\\." ad) ;larsi@ifi..uio
-              (string-match "@\\." ad) ;larsi@.ifi.uio
-              (string-match "\\.$" ad) ;larsi@ifi.uio.
-              (not (string-match "^[^@]+@[^@]+$" ad)) ;larsi.ifi.uio
-              (string-match "(.*).*(.*)" from)) ;(lars) (lars)
-          (message
-           "Denied posting -- the From looks strange: \"%s\"." from)
-          nil)
-         (t t))))
-     ;; Check the Reply-To header.
-     (message-check 'reply-to
-       (let* ((case-fold-search t)
-             (reply-to (message-fetch-field "reply-to"))
-             ad)
-        (cond
-          ((not reply-to)
-           t)
-          ((string-match "," reply-to)
-           (y-or-n-p
-            (format "Multiple Reply-To addresses: \"%s\". Really post? "
-                    reply-to)))
-         ((or (not (string-match
-                    "@[^\\.]*\\."
-                    (setq ad (nth 1 (mail-extract-address-components
-                                     reply-to))))) ;larsi@ifi
-              (string-match "\\.\\." ad) ;larsi@ifi..uio
-              (string-match "@\\." ad) ;larsi@.ifi.uio
-              (string-match "\\.$" ad) ;larsi@ifi.uio.
-              (not (string-match "^[^@]+@[^@]+$" ad)) ;larsi.ifi.uio
-              (string-match "(.*).*(.*)" reply-to)) ;(lars) (lars)
-           (y-or-n-p
-            (format
-             "The Reply-To looks strange: \"%s\". Really post? " 
-             reply-to)))
-         (t t))))))
+   ;; Check the Newsgroups & Followup-To headers for syntax errors.
+   (message-check 'valid-newsgroups
+     (let ((case-fold-search t)
+          (headers '("Newsgroups" "Followup-To"))
+          header error)
+       (while (and headers (not error))
+        (when (setq header (mail-fetch-field (car headers)))
+          (if (or
+               (not
+                (string-match
+                 "\\`\\([-+_&.a-zA-Z0-9]+\\)?\\(,[-+_&.a-zA-Z0-9]+\\)*\\'"
+                 header))
+               (memq
+                nil (mapcar
+                     (lambda (g)
+                       (not (string-match "\\.\\'\\|\\.\\." g)))
+                     (message-tokenize-header header ","))))
+              (setq error t)))
+        (unless error
+          (pop headers)))
+       (if (not error)
+          t
+        (y-or-n-p
+         (format "The %s header looks odd: \"%s\".  Really post? "
+                 (car headers) header)))))
+   (message-check 'repeated-newsgroups
+     (let ((case-fold-search t)
+          (headers '("Newsgroups" "Followup-To"))
+          header error groups group)
+       (while (and headers
+                  (not error))
+        (when (setq header (mail-fetch-field (pop headers)))
+          (setq groups (message-tokenize-header header ","))
+          (while (setq group (pop groups))
+            (when (member group groups)
+              (setq error group
+                    groups nil)))))
+       (if (not error)
+          t
+        (y-or-n-p
+         (format "Group %s is repeated in headers.  Really post? " error)))))
+   ;; Check the From header.
+   (message-check 'from
+     (let* ((case-fold-search t)
+           (from (message-fetch-field "from"))
+           ad)
+       (cond
+       ((not from)
+        (message "There is no From line.  Posting is denied.")
+        nil)
+       ((or (not (string-match
+                  "@[^\\.]*\\."
+                  (setq ad (nth 1 (mail-extract-address-components
+                                   from))))) ;larsi@ifi
+            (string-match "\\.\\." ad) ;larsi@ifi..uio
+            (string-match "@\\." ad)   ;larsi@.ifi.uio
+            (string-match "\\.$" ad)   ;larsi@ifi.uio.
+            (not (string-match "^[^@]+@[^@]+$" ad)) ;larsi.ifi.uio
+            (string-match "(.*).*(.*)" from)) ;(lars) (lars)
+        (message
+         "Denied posting -- the From looks strange: \"%s\"." from)
+        nil)
+       (t t))))
+   ;; Check the Reply-To header.
+   (message-check 'reply-to
+     (let* ((case-fold-search t)
+           (reply-to (message-fetch-field "reply-to"))
+           ad)
+       (cond
+       ((not reply-to)
+        t)
+       ((string-match "," reply-to)
+        (y-or-n-p
+         (format "Multiple Reply-To addresses: \"%s\". Really post? "
+                 reply-to)))
+       ((or (not (string-match
+                  "@[^\\.]*\\."
+                  (setq ad (nth 1 (mail-extract-address-components
+                                   reply-to))))) ;larsi@ifi
+            (string-match "\\.\\." ad) ;larsi@ifi..uio
+            (string-match "@\\." ad)   ;larsi@.ifi.uio
+            (string-match "\\.$" ad)   ;larsi@ifi.uio.
+            (not (string-match "^[^@]+@[^@]+$" ad)) ;larsi.ifi.uio
+            (string-match "(.*).*(.*)" reply-to)) ;(lars) (lars)
+        (y-or-n-p
+         (format
+          "The Reply-To looks strange: \"%s\". Really post? "
+          reply-to)))
+       (t t))))))

 
 (defun message-check-news-body-syntax ()
   (and
 
 (defun message-check-news-body-syntax ()
   (and


@@ -3111,8 +3111,8 @@ to find out how to use this."
        (concat "^" (regexp-quote mail-header-separator) "$"))
       (while (not (eobp))
        (when (not (looking-at "[ \t\n]"))
        (concat "^" (regexp-quote mail-header-separator) "$"))
       (while (not (eobp))
        (when (not (looking-at "[ \t\n]"))

-         (setq sum (logxor (ash sum 1) (if (natnump sum) 0 1)
-                           (char-after))))
+         (setq sum (logxor (ash sum 1) (if (natnump sum) 0 1)
+                           (char-after))))

        (forward-char 1)))
     sum))
 
        (forward-char 1)))
     sum))
 


@@ -3124,47 +3124,47 @@ to find out how to use this."
     (save-excursion
       (save-restriction
        (message-narrow-to-headers)
     (save-excursion
       (save-restriction
        (message-narrow-to-headers)

-        (setq file (message-fetch-field "fcc" t)))
+       (setq file (message-fetch-field "fcc" t)))

       (when file
       (when file

-        (set-buffer (get-buffer-create " *message temp*"))
-        (erase-buffer)
-        (insert-buffer-substring buf)
-        (message-encode-message-body)
-        (save-restriction
-          (message-narrow-to-headers)
-          (while (setq file (message-fetch-field "fcc" t))
-            (push file list)
-            (message-remove-header "fcc" nil t))
-          (let ((mail-parse-charset message-default-charset)
-                (rfc2047-header-encoding-alist
-                 (cons '("Newsgroups" . default)
-                       rfc2047-header-encoding-alist)))
-            (mail-encode-encoded-word-buffer)))
-        (goto-char (point-min))
-        (when (re-search-forward
-               (concat "^" (regexp-quote mail-header-separator) "$")
-               nil t)
-          (replace-match "" t t ))
-        ;; Process FCC operations.
-        (while list
-          (setq file (pop list))
-          (if (string-match "^[ \t]*|[ \t]*\\(.*\\)[ \t]*$" file)
-              ;; Pipe the article to the program in question.
-              (call-process-region (point-min) (point-max) shell-file-name
-                                   nil nil nil shell-command-switch
-                                   (match-string 1 file))
-            ;; Save the article.
-            (setq file (expand-file-name file))
-            (unless (file-exists-p (file-name-directory file))
-              (make-directory (file-name-directory file) t))
-            (if (and message-fcc-handler-function
-                     (not (eq message-fcc-handler-function 'rmail-output)))
-                (funcall message-fcc-handler-function file)
-              (if (and (file-readable-p file) (mail-file-babyl-p file))
-                  (rmail-output file 1 nil t)
-                (let ((mail-use-rfc822 t))
-                  (rmail-output file 1 t t))))))
-        (kill-buffer (current-buffer))))))
+       (set-buffer (get-buffer-create " *message temp*"))
+       (erase-buffer)
+       (insert-buffer-substring buf)
+       (message-encode-message-body)
+       (save-restriction
+         (message-narrow-to-headers)
+         (while (setq file (message-fetch-field "fcc" t))
+           (push file list)
+           (message-remove-header "fcc" nil t))
+         (let ((mail-parse-charset message-default-charset)
+               (rfc2047-header-encoding-alist
+                (cons '("Newsgroups" . default)
+                      rfc2047-header-encoding-alist)))
+           (mail-encode-encoded-word-buffer)))
+       (goto-char (point-min))
+       (when (re-search-forward
+              (concat "^" (regexp-quote mail-header-separator) "$")
+              nil t)
+         (replace-match "" t t ))
+       ;; Process FCC operations.
+       (while list
+         (setq file (pop list))
+         (if (string-match "^[ \t]*|[ \t]*\\(.*\\)[ \t]*$" file)
+             ;; Pipe the article to the program in question.
+             (call-process-region (point-min) (point-max) shell-file-name
+                                  nil nil nil shell-command-switch
+                                  (match-string 1 file))
+           ;; Save the article.
+           (setq file (expand-file-name file))
+           (unless (file-exists-p (file-name-directory file))
+             (make-directory (file-name-directory file) t))
+           (if (and message-fcc-handler-function
+                    (not (eq message-fcc-handler-function 'rmail-output)))
+               (funcall message-fcc-handler-function file)
+             (if (and (file-readable-p file) (mail-file-babyl-p file))
+                 (rmail-output file 1 nil t)
+               (let ((mail-use-rfc822 t))
+                 (rmail-output file 1 t t))))))
+       (kill-buffer (current-buffer))))))

 
 (defun message-output (filename)
   "Append this article to Unix/babyl mail file FILENAME."
 
 (defun message-output (filename)
   "Append this article to Unix/babyl mail file FILENAME."


@@ -3196,7 +3196,7 @@ to find out how to use this."
           (point)))
        (goto-char (point-min))
        (while (re-search-forward "\n[ \t]+" nil t)
           (point)))
        (goto-char (point-min))
        (while (re-search-forward "\n[ \t]+" nil t)

-         (replace-match " " t t))      ;No line breaks (too confusing)
+         (replace-match " " t t))     ;No line breaks (too confusing)

        (goto-char (point-min))
        (while (re-search-forward "[ \t\n]*,[ \t\n]*\\|[ \t]+" nil t)
          (replace-match "," t t))
        (goto-char (point-min))
        (while (re-search-forward "[ \t\n]*,[ \t\n]*\\|[ \t]+" nil t)
          (replace-match "," t t))


@@ -3254,7 +3254,7 @@ If NOW, use that time instead."
 ;; You might for example insert a "." somewhere (not next to another dot
 ;; or string boundary), or modify the "fsf" string.
 (defun message-unique-id ()
 ;; You might for example insert a "." somewhere (not next to another dot
 ;; or string boundary), or modify the "fsf" string.
 (defun message-unique-id ()

-  ;; Don't use microseconds from (current-time), they may be unsupported.
+;; Don't use microseconds from (current-time), they may be unsupported.

   ;; Instead we use this randomly inited counter.
   (setq message-unique-id-char
        (% (1+ (or message-unique-id-char (logand (random t) (1- (lsh 1 20)))))
   ;; Instead we use this randomly inited counter.
   (setq message-unique-id-char
        (% (1+ (or message-unique-id-char (logand (random t) (1- (lsh 1 20)))))


@@ -3378,7 +3378,7 @@ If NOW, use that time instead."
        (insert login))
        ((or (eq style 'angles)
            (and (not (eq style 'parens))
        (insert login))
        ((or (eq style 'angles)
            (and (not (eq style 'parens))

-                ;; Use angles if no quoting is needed, or if parens would
+            ;; Use angles if no quoting is needed, or if parens would

                 ;; need quoting too.
                 (or (not (string-match "[^- !#-'*+/-9=?A-Z^-~]" fullname))
                     (let ((tmp (concat fullname nil)))
                 ;; need quoting too.
                 (or (not (string-match "[^- !#-'*+/-9=?A-Z^-~]" fullname))
                     (let ((tmp (concat fullname nil)))


@@ -3501,7 +3501,7 @@ Headers already prepared in the buffer are not modified."
               (get-text-property (1+ (match-beginning 0)) 'message-deletable)
               (message-delete-line))
          (pop headers)))
               (get-text-property (1+ (match-beginning 0)) 'message-deletable)
               (message-delete-line))
          (pop headers)))

-      ;; Go through all the required headers and see if they are in the
+     ;; Go through all the required headers and see if they are in the

       ;; articles already.  If they are not, or are empty, they are
       ;; inserted automatically - except for Subject, Newsgroups and
       ;; Distribution.
       ;; articles already.  If they are not, or are empty, they are
       ;; inserted automatically - except for Subject, Newsgroups and
       ;; Distribution.


@@ -3523,7 +3523,7 @@ Headers already prepared in the buffer are not modified."
                                ":")
                        nil t))
                  (progn
                                ":")
                        nil t))
                  (progn

-                   ;; The header was found.  We insert a space after the
+                ;; The header was found.  We insert a space after the

                    ;; colon, if there is none.
                    (if (/= (char-after) ? ) (insert " ") (forward-char 1))
                    ;; Find out whether the header is empty...
                    ;; colon, if there is none.
                    (if (/= (char-after) ? ) (insert " ") (forward-char 1))
                    ;; Find out whether the header is empty...


@@ -3569,7 +3569,7 @@ Headers already prepared in the buffer are not modified."
                ;; totally and insert the new value.
                (delete-region (point) (gnus-point-at-eol))
                (insert value))
                ;; totally and insert the new value.
                (delete-region (point) (gnus-point-at-eol))
                (insert value))

-             ;; Add the deletable property to the headers that require it.
+        ;; Add the deletable property to the headers that require it.

              (and (memq header message-deletable-headers)
                   (progn (beginning-of-line) (looking-at "[^:]+: "))
                   (add-text-properties
              (and (memq header message-deletable-headers)
                   (progn (beginning-of-line) (looking-at "[^:]+: "))
                   (add-text-properties


@@ -3706,8 +3706,8 @@ than 988 characters long, and if they are not, trim them until they are."
     ;; If folding is disallowed, make sure the total length (including
     ;; the spaces between) will be less than MAXSIZE characters.
     ;;
     ;; If folding is disallowed, make sure the total length (including
     ;; the spaces between) will be less than MAXSIZE characters.
     ;;

-    ;; Only disallow folding for News messages. At this point the headers
-    ;; have not been generated, thus we use message-this-is-news directly.
+ ;; Only disallow folding for News messages. At this point the headers
+;; have not been generated, thus we use message-this-is-news directly.

     (when (and message-this-is-news message-cater-to-broken-inn)
       (let ((maxsize 988)
            (totalsize (+ (apply #'+ (mapcar #'length refs))
     (when (and message-this-is-news message-cater-to-broken-inn)
       (let ((maxsize 988)
            (totalsize (+ (apply #'+ (mapcar #'length refs))


@@ -3803,7 +3803,7 @@ than 988 characters long, and if they are not, trim them until they are."
   ;; list of buffers.
   (setq message-buffer-list (delq (current-buffer) message-buffer-list))
   (while (and message-max-buffers
   ;; list of buffers.
   (setq message-buffer-list (delq (current-buffer) message-buffer-list))
   (while (and message-max-buffers

-              message-buffer-list
+             message-buffer-list

              (>= (length message-buffer-list) message-max-buffers))
     ;; Kill the oldest buffer -- unless it has been changed.
     (let ((buffer (pop message-buffer-list)))
              (>= (length message-buffer-list) message-max-buffers))
     ;; Kill the oldest buffer -- unless it has been changed.
     (let ((buffer (pop message-buffer-list)))


@@ -4027,7 +4027,7 @@ OTHER-HEADERS is an alist of header/value pairs."
          reply-to (message-fetch-field "reply-to")
          mrt (message-fetch-field "mail-reply-to")
          mft (and message-use-mail-followup-to
          reply-to (message-fetch-field "reply-to")
          mrt (message-fetch-field "mail-reply-to")
          mft (and message-use-mail-followup-to

-                   (message-fetch-field "mail-followup-to")))
+                  (message-fetch-field "mail-followup-to")))

 
     ;; Handle special values of Mail-Copies-To.
     (when mct
 
     ;; Handle special values of Mail-Copies-To.
     (when mct


@@ -4040,8 +4040,8 @@ OTHER-HEADERS is an alist of header/value pairs."
             (setq mct (or mrt reply-to from)))))
 
     (if (and (not mft)
             (setq mct (or mrt reply-to from)))))
 
     (if (and (not mft)

-             (or (not wide)
-                 to-address))
+            (or (not wide)
+                to-address))

        (progn
          (setq follow-to (list (cons 'To (or to-address mrt reply-to from))))
          (when (and (and wide mct)
        (progn
          (setq follow-to (list (cons 'To (or to-address mrt reply-to from))))
          (when (and (and wide mct)


@@ -4050,19 +4050,19 @@ OTHER-HEADERS is an alist of header/value pairs."
       (let (ccalist)
        (save-excursion
          (message-set-work-buffer)
       (let (ccalist)
        (save-excursion
          (message-set-work-buffer)

-          (if (and mft
-                   wide
-                   (or (not (eq message-use-mail-followup-to 'ask))
-                       (message-y-or-n-p
-                       (concat "Obey Mail-Followup-To? ") t "\
+         (if (and mft
+                  wide
+                  (or (not (eq message-use-mail-followup-to 'ask))
+                      (message-y-or-n-p
+                       (concat "Obey Mail-Followup-To? ") t "\

 You should normally obey the Mail-Followup-To: header.  In this
 article, it has the value of
 
 " mft "
 
 which directs your response to " (if (string-match "," mft)
 You should normally obey the Mail-Followup-To: header.  In this
 article, it has the value of
 
 " mft "
 
 which directs your response to " (if (string-match "," mft)

-                              "the specified addresses"
-                            "that address only") ".
+                                    "the specified addresses"
+                                  "that address only") ".

 
 Most commonly, Mail-Followup-To is used by a mailing list poster to
 express that responses should be sent to just the list, and not the
 
 Most commonly, Mail-Followup-To is used by a mailing list poster to
 express that responses should be sent to just the list, and not the


@@ -4075,7 +4075,7 @@ fragmented and very difficult to follow.
 
 Also, some source/announcement lists are not intended for discussion;
 responses here are directed to other addresses.")))
 
 Also, some source/announcement lists are not intended for discussion;
 responses here are directed to other addresses.")))

-              (insert mft)
+             (insert mft)

            (unless never-mct
              (insert (or mrt reply-to from "")))
            (insert (if to (concat (if (bolp) "" ", ") to "") ""))
            (unless never-mct
              (insert (or mrt reply-to from "")))
            (insert (if to (concat (if (bolp) "" ", ") to "") ""))


@@ -4144,16 +4144,16 @@ responses here are directed to other addresses.")))
            date (message-fetch-field "date")
            from (message-fetch-field "from")
            subject (or (message-fetch-field "subject") "none"))
            date (message-fetch-field "date")
            from (message-fetch-field "from")
            subject (or (message-fetch-field "subject") "none"))

-    (when gnus-list-identifiers
-      (setq subject (message-strip-list-identifiers subject)))
-    (setq subject (concat "Re: " (message-strip-subject-re subject)))
+      (when gnus-list-identifiers
+       (setq subject (message-strip-list-identifiers subject)))
+      (setq subject (concat "Re: " (message-strip-subject-re subject)))

 
 

-    (when (and (setq gnus-warning (message-fetch-field "gnus-warning"))
-              (string-match "<[^>]+>" gnus-warning))
-      (setq message-id (match-string 0 gnus-warning)))
+      (when (and (setq gnus-warning (message-fetch-field "gnus-warning"))
+                (string-match "<[^>]+>" gnus-warning))
+       (setq message-id (match-string 0 gnus-warning)))

 
 

-    (unless follow-to
-      (setq follow-to (message-get-reply-headers wide to-address))))
+      (unless follow-to
+       (setq follow-to (message-get-reply-headers wide to-address))))

 
     (unless (message-mail-user-agent)
       (message-pop-to-buffer
 
     (unless (message-mail-user-agent)
       (message-pop-to-buffer


@@ -4353,7 +4353,7 @@ header line with the old Message-ID."
   (let ((cur (current-buffer))
        (sender (message-fetch-field "sender"))
        (from (message-fetch-field "from")))
   (let ((cur (current-buffer))
        (sender (message-fetch-field "sender"))
        (from (message-fetch-field "from")))

-    ;; Check whether the user owns the article that is to be superseded.
+  ;; Check whether the user owns the article that is to be superseded.

     (unless (or (message-gnksa-enable-p 'cancel-messages)
                (and sender
                     (string-equal
     (unless (or (message-gnksa-enable-p 'cancel-messages)
                (and sender
                     (string-equal


@@ -4445,13 +4445,13 @@ The form is: [Source] Subject, where if the original message was mail,
 Source is the sender, and if the original message was news, Source is
 the list of newsgroups is was posted to."
   (concat "["
 Source is the sender, and if the original message was news, Source is
 the list of newsgroups is was posted to."
   (concat "["

-          (let ((prefix
-                 (or (message-fetch-field
-                      (if (message-news-p) "newsgroups" "from"))
-                     "(nowhere)")))
-            (if message-forward-decoded-p
-                prefix
-              (mail-decode-encoded-word-string prefix)))
+         (let ((prefix
+                (or (message-fetch-field
+                     (if (message-news-p) "newsgroups" "from"))
+                    "(nowhere)")))
+           (if message-forward-decoded-p
+               prefix
+             (mail-decode-encoded-word-string prefix)))

          "] " subject))
 
 (defun message-forward-subject-fwd (subject)
          "] " subject))
 
 (defun message-forward-subject-fwd (subject)


@@ -4499,7 +4499,7 @@ Optional DIGEST will use digest to forward."
   (let* ((cur (current-buffer))
         (message-forward-decoded-p
          (if (local-variable-p 'gnus-article-decoded-p (current-buffer))
   (let* ((cur (current-buffer))
         (message-forward-decoded-p
          (if (local-variable-p 'gnus-article-decoded-p (current-buffer))

-             gnus-article-decoded-p  ;; In an article buffer.
+             gnus-article-decoded-p ;; In an article buffer.

            message-forward-decoded-p))
         (subject (message-make-forward-subject))
         art-beg)
            message-forward-decoded-p))
         (subject (message-make-forward-subject))
         art-beg)


@@ -4509,7 +4509,7 @@ Optional DIGEST will use digest to forward."
     ;; Put point where we want it before inserting the forwarded
     ;; message.
     (if message-forward-before-signature
     ;; Put point where we want it before inserting the forwarded
     ;; message.
     (if message-forward-before-signature

-        (message-goto-body)
+       (message-goto-body)

       (goto-char (point-max)))
     (if message-forward-as-mime
        (if digest
       (goto-char (point-max)))
     (if message-forward-as-mime
        (if digest


@@ -4640,16 +4640,16 @@ you."
       (goto-char (point-min))
       (search-forward "\n\n" nil t)
       (if (or (and (re-search-forward message-unsent-separator nil t)
       (goto-char (point-min))
       (search-forward "\n\n" nil t)
       (if (or (and (re-search-forward message-unsent-separator nil t)

-                   (forward-line 1))
-              (re-search-forward "^Return-Path:.*\n" nil t))
-          ;; We remove everything before the bounced mail.
-          (delete-region
-           (point-min)
-           (if (re-search-forward "^[^ \n\t]+:" nil t)
-               (match-beginning 0)
-             (point)))
-        (when (re-search-backward "^.?From .*\n" nil t)
-          (delete-region (match-beginning 0) (match-end 0)))))
+                  (forward-line 1))
+             (re-search-forward "^Return-Path:.*\n" nil t))
+         ;; We remove everything before the bounced mail.
+         (delete-region
+          (point-min)
+          (if (re-search-forward "^[^ \n\t]+:" nil t)
+              (match-beginning 0)
+            (point)))
+       (when (re-search-backward "^.?From .*\n" nil t)
+         (delete-region (match-beginning 0) (match-end 0)))))

     (mm-enable-multibyte)
     (mime-to-mml)
     (save-restriction
     (mm-enable-multibyte)
     (mime-to-mml)
     (save-restriction


@@ -4956,8 +4956,8 @@ regexp varstr."
        (message-narrow-to-headers-or-head)
        (message-remove-first-header "Content-Type")
        (message-remove-first-header "Content-Transfer-Encoding"))
        (message-narrow-to-headers-or-head)
        (message-remove-first-header "Content-Type")
        (message-remove-first-header "Content-Transfer-Encoding"))

-      ;; We always make sure that the message has a Content-Type header.
-      ;; This is because some broken MTAs and MUAs get awfully confused
+    ;; We always make sure that the message has a Content-Type header.
+     ;; This is because some broken MTAs and MUAs get awfully confused

       ;; when confronted with a message with a MIME-Version header and
       ;; without a Content-Type header.  For instance, Solaris'
       ;; /usr/bin/mail.
       ;; when confronted with a message with a MIME-Version header and
       ;; without a Content-Type header.  For instance, Solaris'
       ;; /usr/bin/mail.


@@ -5016,7 +5016,7 @@ regexp varstr."
                         (mail-strip-quoted-names
                          (message-fetch-field "from")))
     (message-options-set 'message-recipients
                         (mail-strip-quoted-names
                          (message-fetch-field "from")))
     (message-options-set 'message-recipients

-                        (mail-strip-quoted-names
+                        (mail-strip-quoted-names

                          (let ((to (message-fetch-field "to"))
                                (cc (message-fetch-field "cc"))
                                (bcc (message-fetch-field "bcc")))
                          (let ((to (message-fetch-field "to"))
                                (cc (message-fetch-field "cc"))
                                (bcc (message-fetch-field "bcc")))

diff --git a/lisp/messagexmas.el b/lisp/messagexmas.el
index 65baf83..bc02b00 100644 (file)
--- a/lisp/messagexmas.el
+++ b/lisp/messagexmas.el
@@ -118,7 +118,7 @@ If it is non-nil, it must be a toolbar.  The five valid values are
 
 (defun message-xmas-redefine ()
   "Redefine message functions for XEmacs."
 
 (defun message-xmas-redefine ()
   "Redefine message functions for XEmacs."

-  (defalias 'message-exchange-point-and-mark 
+  (defalias 'message-exchange-point-and-mark

     'message-xmas-exchange-point-and-mark)
 
   (when (>= emacs-major-version 20)
     'message-xmas-exchange-point-and-mark)
 
   (when (>= emacs-major-version 20)

diff --git a/lisp/mm-bodies.el b/lisp/mm-bodies.el
index 6ea90c3..c11b202 100644 (file)
--- a/lisp/mm-bodies.el
+++ b/lisp/mm-bodies.el
@@ -70,7 +70,7 @@ If no encoding was done, nil is returned."
            (if (re-search-forward "[^\x0-\x7f]" nil t)
                (or mail-parse-charset
                    (message-options-get 'mm-encody-body-charset)
            (if (re-search-forward "[^\x0-\x7f]" nil t)
                (or mail-parse-charset
                    (message-options-get 'mm-encody-body-charset)

-                   (message-options-set 
+                   (message-options-set

                     'mm-encody-body-charset
                     (mm-read-charset "Charset used in the article: ")))
              ;; The logic in `mml-generate-mime-1' confirms that it's OK
                     'mm-encody-body-charset
                     (mm-read-charset "Charset used in the article: ")))
              ;; The logic in `mml-generate-mime-1' confirms that it's OK


@@ -232,7 +232,7 @@ If no encoding was done, nil is returned."
 The characters in CHARSET should then be decoded."
   (if (stringp charset)
       (setq charset (intern (downcase charset))))
 The characters in CHARSET should then be decoded."
   (if (stringp charset)
       (setq charset (intern (downcase charset))))

-  (if (or (not charset) 
+  (if (or (not charset)

          (eq 'gnus-all mail-parse-ignored-charsets)
          (memq 'gnus-all mail-parse-ignored-charsets)
          (memq charset mail-parse-ignored-charsets))
          (eq 'gnus-all mail-parse-ignored-charsets)
          (memq 'gnus-all mail-parse-ignored-charsets)
          (memq charset mail-parse-ignored-charsets))


@@ -245,7 +245,7 @@ The characters in CHARSET should then be decoded."
        (if (and (not coding-system)
                 (listp mail-parse-ignored-charsets)
                 (memq 'gnus-unknown mail-parse-ignored-charsets))
        (if (and (not coding-system)
                 (listp mail-parse-ignored-charsets)
                 (memq 'gnus-unknown mail-parse-ignored-charsets))

-           (setq coding-system 
+           (setq coding-system

                  (mm-charset-to-coding-system mail-parse-charset)))
        (when (and charset coding-system
                   ;; buffer-file-coding-system
                  (mm-charset-to-coding-system mail-parse-charset)))
        (when (and charset coding-system
                   ;; buffer-file-coding-system


@@ -261,7 +261,7 @@ The characters in CHARSET should then be decoded."
   "Decode STRING with CHARSET."
   (when (stringp charset)
     (setq charset (intern (downcase charset))))
   "Decode STRING with CHARSET."
   (when (stringp charset)
     (setq charset (intern (downcase charset))))

-  (when (or (not charset) 
+  (when (or (not charset)

            (eq 'gnus-all mail-parse-ignored-charsets)
            (memq 'gnus-all mail-parse-ignored-charsets)
            (memq charset mail-parse-ignored-charsets))
            (eq 'gnus-all mail-parse-ignored-charsets)
            (memq 'gnus-all mail-parse-ignored-charsets)
            (memq charset mail-parse-ignored-charsets))


@@ -272,7 +272,7 @@ The characters in CHARSET should then be decoded."
        (if (and (not coding-system)
                (listp mail-parse-ignored-charsets)
                (memq 'gnus-unknown mail-parse-ignored-charsets))
        (if (and (not coding-system)
                (listp mail-parse-ignored-charsets)
                (memq 'gnus-unknown mail-parse-ignored-charsets))

-          (setq coding-system 
+          (setq coding-system

                 (mm-charset-to-coding-system mail-parse-charset)))
        (when (and charset coding-system
                  (mm-multibyte-p)
                 (mm-charset-to-coding-system mail-parse-charset)))
        (when (and charset coding-system
                  (mm-multibyte-p)

diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index 2461859..82d4af0 100644 (file)
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -22,13 +22,13 @@
 
 ;;; Commentary:
 
 
 ;;; Commentary:
 

-;; Jaap-Henk Hoepman (jhh@xs4all.nl): 
+;; Jaap-Henk Hoepman (jhh@xs4all.nl):

 ;;
 ;; Added support for delayed destroy of external MIME viewers. All external
 ;; viewers for mime types in mm-keep-viewer-alive-types will remain active
 ;; after switching articles or groups, and will only be removed when exiting
 ;; gnus.
 ;;
 ;; Added support for delayed destroy of external MIME viewers. All external
 ;; viewers for mime types in mm-keep-viewer-alive-types will remain active
 ;; after switching articles or groups, and will only be removed when exiting
 ;; gnus.

-;; 
+;;

 
 ;;; Code:
 
 
 ;;; Code:
 


@@ -36,7 +36,7 @@
 (require 'mailcap)
 (require 'mm-bodies)
 (eval-when-compile (require 'cl)
 (require 'mailcap)
 (require 'mm-bodies)
 (eval-when-compile (require 'cl)

-                   (require 'term))
+                  (require 'term))

 
 (eval-and-compile
   (autoload 'mm-inline-partial "mm-partial")
 
 (eval-and-compile
   (autoload 'mm-inline-partial "mm-partial")


@@ -206,7 +206,7 @@ type inline."
 when selecting a different article."
   :type '(repeat string)
   :group 'mime-display)
 when selecting a different article."
   :type '(repeat string)
   :group 'mime-display)

- 
+

 (defcustom mm-automatic-display
   '("text/plain" "text/enriched" "text/richtext" "text/html"
     "text/x-vcard" "image/.*" "message/delivery-status" "multipart/.*"
 (defcustom mm-automatic-display
   '("text/plain" "text/enriched" "text/richtext" "text/html"
     "text/x-vcard" "image/.*" "message/delivery-status" "multipart/.*"


@@ -387,14 +387,14 @@ The original alist is not modified.  See also `destructive-alist-to-plist'."
          (throw 'found t))))))
 
 (defun mm-handle-set-external-undisplayer (handle function)
          (throw 'found t))))))
 
 (defun mm-handle-set-external-undisplayer (handle function)

- "Set the undisplayer for this handle; postpone undisplaying of viewers
+  "Set the undisplayer for this handle; postpone undisplaying of viewers

 for types in mm-keep-viewer-alive-types."
 for types in mm-keep-viewer-alive-types."

- (if (mm-keep-viewer-alive-p handle)
-     (let ((new-handle (copy-sequence handle)))
-       (mm-handle-set-undisplayer new-handle function)
-       (mm-handle-set-undisplayer handle nil)
-       (push new-handle mm-postponed-undisplay-list))
-   (mm-handle-set-undisplayer handle function)))
+  (if (mm-keep-viewer-alive-p handle)
+      (let ((new-handle (copy-sequence handle)))
+       (mm-handle-set-undisplayer new-handle function)
+       (mm-handle-set-undisplayer handle nil)
+       (push new-handle mm-postponed-undisplay-list))
+    (mm-handle-set-undisplayer handle function)))

 
 (defun mm-destroy-postponed-undisplay-list ()
   (message "Destroying external MIME viewers")
 
 (defun mm-destroy-postponed-undisplay-list ()
   (message "Destroying external MIME viewers")


@@ -443,20 +443,20 @@ for types in mm-keep-viewer-alive-types."
           (let ((mm-dissect-default-type (if (equal subtype "digest")
                                              "message/rfc822"
                                            "text/plain")))
           (let ((mm-dissect-default-type (if (equal subtype "digest")
                                              "message/rfc822"
                                            "text/plain")))

-             (add-text-properties 0 (length (car ctl))
-                                  (mm-alist-to-plist (cdr ctl)) (car ctl))
+            (add-text-properties 0 (length (car ctl))
+                                 (mm-alist-to-plist (cdr ctl)) (car ctl))

 
             ;; what really needs to be done here is a way to link a
 
             ;; what really needs to be done here is a way to link a

-            ;; MIME handle back to it's parent MIME handle (in a multilevel
+       ;; MIME handle back to it's parent MIME handle (in a multilevel

             ;; MIME article).  That would probably require changing
             ;; MIME article).  That would probably require changing

-            ;; the mm-handle API so we simply store the multipart buffert
-            ;; name as a text property of the "multipart/whatever" string.
-             (add-text-properties 0 (length (car ctl))
+        ;; the mm-handle API so we simply store the multipart buffert
+       ;; name as a text property of the "multipart/whatever" string.
+            (add-text-properties 0 (length (car ctl))

                                  (list 'buffer (mm-copy-to-buffer))
                                  (list 'buffer (mm-copy-to-buffer))

-                                  (car ctl))
-             (add-text-properties 0 (length (car ctl))
+                                 (car ctl))
+            (add-text-properties 0 (length (car ctl))

                                  (list 'from from)
                                  (list 'from from)

-                                  (car ctl))
+                                 (car ctl))

             (cons (car ctl) (mm-dissect-multipart ctl))))
          (t
           (mm-dissect-singlepart
             (cons (car ctl) (mm-dissect-multipart ctl))))
          (t
           (mm-dissect-singlepart


@@ -607,7 +607,7 @@ external if displayed external."
                              (assoc "needsterminal" mime-info)))
               (copiousoutput (assoc "copiousoutput" mime-info))
               file buffer)
                              (assoc "needsterminal" mime-info)))
               (copiousoutput (assoc "copiousoutput" mime-info))
               file buffer)

-         ;; We create a private sub-directory where we store our files.
+       ;; We create a private sub-directory where we store our files.

          (make-directory dir)
          (set-file-modes dir 448)
          (if filename
          (make-directory dir)
          (set-file-modes dir 448)
          (if filename


@@ -619,33 +619,33 @@ external if displayed external."
          (message "Viewing with %s" method)
          (cond (needsterm
                 (unwind-protect
          (message "Viewing with %s" method)
          (cond (needsterm
                 (unwind-protect

-                     (if window-system
-                         (start-process "*display*" nil
-                                        mm-external-terminal-program
-                                        "-e" shell-file-name
-                                        shell-command-switch
-                                        (mm-mailcap-command
-                                         method file (mm-handle-type handle)))
-                       (require 'term)
-                       (require 'gnus-win)
-                       (set-buffer
-                        (setq buffer
-                              (make-term "display"
-                                         shell-file-name
-                                         nil
-                                         shell-command-switch
-                                         (mm-mailcap-command
-                                          method file 
-                                          (mm-handle-type handle)))))
-                       (term-mode)
-                       (term-char-mode)
-                       (set-process-sentinel 
-                        (get-buffer-process buffer)
-                        `(lambda (process state)
-                           (if (eq 'exit (process-status process))
-                               (gnus-configure-windows 
-                                ',gnus-current-window-configuration))))
-                       (gnus-configure-windows 'display-term))
+                    (if window-system
+                        (start-process "*display*" nil
+                                       mm-external-terminal-program
+                                       "-e" shell-file-name
+                                       shell-command-switch
+                                       (mm-mailcap-command
+                                        method file (mm-handle-type handle)))
+                      (require 'term)
+                      (require 'gnus-win)
+                      (set-buffer
+                       (setq buffer
+                             (make-term "display"
+                                        shell-file-name
+                                        nil
+                                        shell-command-switch
+                                        (mm-mailcap-command
+                                         method file
+                                         (mm-handle-type handle)))))
+                      (term-mode)
+                      (term-char-mode)
+                      (set-process-sentinel
+                       (get-buffer-process buffer)
+                       `(lambda (process state)
+                          (if (eq 'exit (process-status process))
+                              (gnus-configure-windows
+                               ',gnus-current-window-configuration))))
+                      (gnus-configure-windows 'display-term))

                   (mm-handle-set-external-undisplayer handle (cons file buffer)))
                 (message "Displaying %s..." (format method file))
                 'external)
                   (mm-handle-set-external-undisplayer handle (cons file buffer)))
                 (message "Displaying %s..." (format method file))
                 'external)


@@ -881,7 +881,7 @@ external if displayed external."
     (save-excursion
       (if (member (mm-handle-media-supertype handle) '("text" "message"))
          (with-temp-buffer
     (save-excursion
       (if (member (mm-handle-media-supertype handle) '("text" "message"))
          (with-temp-buffer

-           (insert-buffer-substring (mm-handle-buffer handle))
+           (insert-buffer-substring (mm-handle-buffer handle))

            (mm-decode-content-transfer-encoding
             (mm-handle-encoding handle)
             (mm-handle-media-type handle))
            (mm-decode-content-transfer-encoding
             (mm-handle-encoding handle)
             (mm-handle-media-type handle))


@@ -1042,12 +1042,12 @@ like underscores."
              (setq spec
                    (ignore-errors
                     ;; Avoid testing `make-glyph' since W3 may define
              (setq spec
                    (ignore-errors
                     ;; Avoid testing `make-glyph' since W3 may define

-                    ;; a bogus version of it.
+                     ;; a bogus version of it.

                      (if (fboundp 'create-image)
                          (create-image (buffer-string) (intern type) 'data-p)
                        (cond
                         ((equal type "xbm")
                      (if (fboundp 'create-image)
                          (create-image (buffer-string) (intern type) 'data-p)
                        (cond
                         ((equal type "xbm")

-                         ;; xbm images require special handling, since
+                        ;; xbm images require special handling, since

                          ;; the only way to create glyphs from these
                          ;; (without a ton of work) is to write them
                          ;; out to a file, and then create a file
                          ;; the only way to create glyphs from these
                          ;; (without a ton of work) is to write them
                          ;; out to a file, and then create a file


@@ -1060,7 +1060,7 @@ like underscores."
                                  (write-region (point-min) (point-max) file)
                                  (make-glyph (list (cons 'x file))))
                              (ignore-errors
                                  (write-region (point-min) (point-max) file)
                                  (make-glyph (list (cons 'x file))))
                              (ignore-errors

-                              (delete-file file)))))
+                               (delete-file file)))))

                         (t
                          (make-glyph
                           (vector (intern type) :data (buffer-string))))))))
                         (t
                          (make-glyph
                           (vector (intern type) :data (buffer-string))))))))


@@ -1242,12 +1242,12 @@ If RECURSIVE, search recursively."
     parts))
 
 (defun mm-multiple-handles (handles)
     parts))
 
 (defun mm-multiple-handles (handles)

-   (and (listp (car handles)) 
-       (> (length handles) 1)))
+  (and (listp (car handles))
+       (> (length handles) 1)))

 
 

-(defun mm-merge-handles (handles1 handles2) 
+(defun mm-merge-handles (handles1 handles2)

   (append
   (append

-   (if (listp (car handles1)) 
+   (if (listp (car handles1))

        handles1
      (list handles1))
    (if (listp (car handles2))
        handles1
      (list handles1))
    (if (listp (car handles2))

diff --git a/lisp/mm-encode.el b/lisp/mm-encode.el
index 43510d4..27d04a5 100644 (file)
--- a/lisp/mm-encode.el
+++ b/lisp/mm-encode.el
@@ -1,4 +1,4 @@
-;;; mm-encode.el --- Functions for encoding MIME things 
+;;; mm-encode.el --- Functions for encoding MIME things

 ;; Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>


@@ -145,7 +145,7 @@ The encoding used is returned."
       (while rules
        (when (string-match (caar rules) type)
          (throw 'found
       (while rules
        (when (string-match (caar rules) type)
          (throw 'found

-                (let ((encoding 
+                (let ((encoding

                        (if (eq (cadr (car rules)) 'qp-or-base64)
                            (mm-qp-or-base64)
                          (cadr (car rules)))))
                        (if (eq (cadr (car rules)) 'qp-or-base64)
                            (mm-qp-or-base64)
                          (cadr (car rules)))))

diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index c526d12..356b6a3 100644 (file)
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -34,7 +34,7 @@
     (iso-8859-3 latin-iso8859-3)
     (iso-8859-4 latin-iso8859-4)
     (iso-8859-5 cyrillic-iso8859-5)
     (iso-8859-3 latin-iso8859-3)
     (iso-8859-4 latin-iso8859-4)
     (iso-8859-5 cyrillic-iso8859-5)

-    ;; Non-mule (X)Emacs uses the last mule-charset for 8bit characters.
+  ;; Non-mule (X)Emacs uses the last mule-charset for 8bit characters.

     ;; The fake mule-charset, gnus-koi8-r, tells Gnus that the default
     ;; charset is koi8-r, not iso-8859-5.
     (koi8-r cyrillic-iso8859-5 gnus-koi8-r)
     ;; The fake mule-charset, gnus-koi8-r, tells Gnus that the default
     ;; charset is koi8-r, not iso-8859-5.
     (koi8-r cyrillic-iso8859-5 gnus-koi8-r)


@@ -112,7 +112,7 @@
      (subst-char-in-string
       . (lambda (from to string) ;; stolen (and renamed) from nnheader.el
          "Replace characters in STRING from FROM to TO."
      (subst-char-in-string
       . (lambda (from to string) ;; stolen (and renamed) from nnheader.el
          "Replace characters in STRING from FROM to TO."

-         (let ((string (substring string 0))   ;Copy string.
+         (let ((string (substring string 0)) ;Copy string.

                (len (length string))
                (idx 0))
            ;; Replace all occurrences of FROM with TO.
                (len (length string))
                (idx 0))
            ;; Replace all occurrences of FROM with TO.


@@ -135,12 +135,12 @@
 (eval-and-compile
   (defalias 'mm-read-coding-system
     (cond
 (eval-and-compile
   (defalias 'mm-read-coding-system
     (cond

-     ((fboundp 'read-coding-system) 
+     ((fboundp 'read-coding-system)

       (if (and (featurep 'xemacs)
       (if (and (featurep 'xemacs)

-               (<= (string-to-number emacs-version) 21.1))
-          (lambda (prompt &optional default-coding-system)
-            (read-coding-system prompt))
-        'read-coding-system))
+              (<= (string-to-number emacs-version) 21.1))
+         (lambda (prompt &optional default-coding-system)
+           (read-coding-system prompt))
+       'read-coding-system))

      (t (lambda (prompt &optional default-coding-system)
          "Prompt the user for a coding system."
          (completing-read
      (t (lambda (prompt &optional default-coding-system)
          "Prompt the user for a coding system."
          (completing-read


@@ -164,7 +164,7 @@
     (cn-gb . cn-gb-2312)
     ;; Windows-1252 is actually a superset of Latin-1.  See also
     ;; `gnus-article-dumbquotes-map'.
     (cn-gb . cn-gb-2312)
     ;; Windows-1252 is actually a superset of Latin-1.  See also
     ;; `gnus-article-dumbquotes-map'.

-    ,(unless (mm-coding-system-p 'windows-1252) ; should be defined eventually
+    ,(unless (mm-coding-system-p 'windows-1252)        ; should be defined eventually

        '(windows-1252 . iso-8859-1))
     (x-ctext . ctext))
   "A mapping from invalid charset names to the real charset names.")
        '(windows-1252 . iso-8859-1))
     (x-ctext . ctext))
   "A mapping from invalid charset names to the real charset names.")


@@ -251,7 +251,7 @@ used as the line break code type of the coding system."
 Only do this if the default value of `enable-multibyte-characters' is
 non-nil.  This is a no-op in XEmacs."
   (when (and (not (featurep 'xemacs))
 Only do this if the default value of `enable-multibyte-characters' is
 non-nil.  This is a no-op in XEmacs."
   (when (and (not (featurep 'xemacs))

-             (boundp 'default-enable-multibyte-characters)
+            (boundp 'default-enable-multibyte-characters)

             default-enable-multibyte-characters
             (fboundp 'set-buffer-multibyte))
     (set-buffer-multibyte t)))
             default-enable-multibyte-characters
             (fboundp 'set-buffer-multibyte))
     (set-buffer-multibyte t)))


@@ -267,7 +267,7 @@ This is a no-op in XEmacs."
   "Enable multibyte in the current buffer.
 Only used in Emacs Mule 4."
   (when (and (not (featurep 'xemacs))
   "Enable multibyte in the current buffer.
 Only used in Emacs Mule 4."
   (when (and (not (featurep 'xemacs))

-             (boundp 'default-enable-multibyte-characters)
+            (boundp 'default-enable-multibyte-characters)

             default-enable-multibyte-characters
             (fboundp 'set-buffer-multibyte)
             (fboundp 'charsetp)
             default-enable-multibyte-characters
             (fboundp 'set-buffer-multibyte)
             (fboundp 'charsetp)


@@ -309,10 +309,10 @@ If the charset is `composition', return the actual one."
           (progn
             (setq mail-parse-mule-charset
                   (and (boundp 'current-language-environment)
           (progn
             (setq mail-parse-mule-charset
                   (and (boundp 'current-language-environment)

-                     (car (last
-                           (assq 'charset
-                                 (assoc current-language-environment
-                                        language-info-alist))))))
+                       (car (last
+                             (assq 'charset
+                                   (assoc current-language-environment
+                                          language-info-alist))))))

             (if (or (not mail-parse-mule-charset)
                     (eq mail-parse-mule-charset 'ascii))
                 (setq mail-parse-mule-charset
             (if (or (not mail-parse-mule-charset)
                     (eq mail-parse-mule-charset 'ascii))
                 (setq mail-parse-mule-charset


@@ -409,13 +409,13 @@ Mule4 only."
              (fboundp 'set-buffer-multibyte)
              (fboundp 'charsetp)
              (not (charsetp 'eight-bit-control))) ;; For Emacs Mule 4 only.
              (fboundp 'set-buffer-multibyte)
              (fboundp 'charsetp)
              (not (charsetp 'eight-bit-control))) ;; For Emacs Mule 4 only.

-       (let ((,buffer (current-buffer)))
-        (unwind-protect
-            (let (default-enable-multibyte-characters)
-              (set-buffer-multibyte nil)
-              ,@forms)
-          (set-buffer ,buffer)
-          (set-buffer-multibyte t)))
+        (let ((,buffer (current-buffer)))
+          (unwind-protect
+              (let (default-enable-multibyte-characters)
+                (set-buffer-multibyte nil)
+                ,@forms)
+            (set-buffer ,buffer)
+            (set-buffer-multibyte t)))

        (let (default-enable-multibyte-characters)
         ,@forms))))
 (put 'mm-with-unibyte-current-buffer-mule4 'lisp-indent-function 0)
        (let (default-enable-multibyte-characters)
         ,@forms))))
 (put 'mm-with-unibyte-current-buffer-mule4 'lisp-indent-function 0)


@@ -432,7 +432,7 @@ Mule4 only."
   "Return a list of Emacs charsets in the region B to E."
   (cond
    ((and (mm-multibyte-p)
   "Return a list of Emacs charsets in the region B to E."
   (cond
    ((and (mm-multibyte-p)

-        (fboundp 'find-charset-region))
+        (fboundp 'find-charset-region))

     ;; Remove composition since the base charsets have been included.
     ;; Remove eight-bit-*, treat them as ascii.
     (let ((css (find-charset-region b e)))
     ;; Remove composition since the base charsets have been included.
     ;; Remove eight-bit-*, treat them as ascii.
     (let ((css (find-charset-region b e)))


@@ -440,7 +440,7 @@ Mule4 only."
              '(composition eight-bit-control eight-bit-graphic))
       css))
    (t
              '(composition eight-bit-control eight-bit-graphic))
       css))
    (t

-    ;; We are in a unibyte buffer or XEmacs non-mule, so we futz around a bit.
+;; We are in a unibyte buffer or XEmacs non-mule, so we futz around a bit.

     (save-excursion
       (save-restriction
        (narrow-to-region b e)
     (save-excursion
       (save-restriction
        (narrow-to-region b e)


@@ -502,7 +502,7 @@ If INHIBIT is non-nil, inhibit mm-inhibit-file-name-handlers.
        (auto-mode-alist (if inhibit nil (mm-auto-mode-alist)))
        (default-major-mode 'fundamental-mode)
        (enable-local-variables nil)
        (auto-mode-alist (if inhibit nil (mm-auto-mode-alist)))
        (default-major-mode 'fundamental-mode)
        (enable-local-variables nil)

-        (after-insert-file-functions nil)
+       (after-insert-file-functions nil)

        (enable-local-eval nil)
        (find-file-hooks nil)
        (inhibit-file-name-operation (if inhibit
        (enable-local-eval nil)
        (find-file-hooks nil)
        (inhibit-file-name-operation (if inhibit

diff --git a/lisp/mm-uu.el b/lisp/mm-uu.el
index c14aa9e..477a678 100644 (file)
--- a/lisp/mm-uu.el
+++ b/lisp/mm-uu.el
@@ -402,7 +402,7 @@ Return that buffer."
            (funcall func))
        (forward-line);; in case of failure
        (when (and (not (mm-uu-configure-p (mm-uu-type entry) 'disabled))
            (funcall func))
        (forward-line);; in case of failure
        (when (and (not (mm-uu-configure-p (mm-uu-type entry) 'disabled))

-                   (let ((end-regexp (mm-uu-end-regexp entry)))
+                  (let ((end-regexp (mm-uu-end-regexp entry)))

                     (if (not end-regexp)
                         (or (setq end-point (point-max)) t)
                       (prog1
                     (if (not end-regexp)
                         (or (setq end-point (point-max)) t)
                       (prog1

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index c5516c1..524b815 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -104,14 +104,14 @@
                    (and (boundp 'w3-meta-charset-content-type-regexp)
                         (re-search-forward
                          w3-meta-charset-content-type-regexp nil t)))
                    (and (boundp 'w3-meta-charset-content-type-regexp)
                         (re-search-forward
                          w3-meta-charset-content-type-regexp nil t)))

-                (setq charset
-                     (or (let ((bsubstr (buffer-substring-no-properties
-                                         (match-beginning 2)
-                                         (match-end 2))))
-                           (if (fboundp 'w3-coding-system-for-mime-charset)
-                               (w3-coding-system-for-mime-charset bsubstr)
-                             (mm-charset-to-coding-system bsubstr)))
-                         charset)))
+               (setq charset
+                     (or (let ((bsubstr (buffer-substring-no-properties
+                                         (match-beginning 2)
+                                         (match-end 2))))
+                           (if (fboundp 'w3-coding-system-for-mime-charset)
+                               (w3-coding-system-for-mime-charset bsubstr)
+                             (mm-charset-to-coding-system bsubstr)))
+                         charset)))

            (delete-region (point-min) (point-max))
            (insert (mm-decode-string text charset))
            (save-window-excursion
            (delete-region (point-min) (point-max))
            (insert (mm-decode-string text charset))
            (save-window-excursion


@@ -124,18 +124,18 @@
                  (condition-case var
                      (w3-region (point-min) (point-max))
                    (error
                  (condition-case var
                      (w3-region (point-min) (point-max))
                    (error

-                     (delete-region (point-min) (point-max))
-                     (let ((b (point))
-                           (charset (mail-content-type-get
-                                     (mm-handle-type handle) 'charset)))
-                       (if (or (eq charset 'gnus-decoded)
-                               (eq mail-parse-charset 'gnus-decoded))
-                           (save-restriction
-                             (narrow-to-region (point) (point))
-                             (mm-insert-part handle)
-                             (goto-char (point-max)))
-                         (insert (mm-decode-string (mm-get-part handle) 
-                                                   charset))))
+                    (delete-region (point-min) (point-max))
+                    (let ((b (point))
+                          (charset (mail-content-type-get
+                                    (mm-handle-type handle) 'charset)))
+                      (if (or (eq charset 'gnus-decoded)
+                              (eq mail-parse-charset 'gnus-decoded))
+                          (save-restriction
+                            (narrow-to-region (point) (point))
+                            (mm-insert-part handle)
+                            (goto-char (point-max)))
+                        (insert (mm-decode-string (mm-get-part handle)
+                                                  charset))))

                     (message
                      "Error while rendering html; showing as text/plain"))))))
            (mm-handle-set-undisplayer
                     (message
                      "Error while rendering html; showing as text/plain"))))))
            (mm-handle-set-undisplayer

diff --git a/lisp/mml-sec.el b/lisp/mml-sec.el
index 9d64d57..fbd92c7 100644 (file)
--- a/lisp/mml-sec.el
+++ b/lisp/mml-sec.el
@@ -78,7 +78,7 @@
                   (when (string-match "[\"'\\~/*;() \t\n]" value)
                     (setq value (prin1-to-string value)))
                   (insert (format " %s=%s" key value))))))
                   (when (string-match "[\"'\\~/*;() \t\n]" value)
                     (setq value (prin1-to-string value)))
                   (insert (format " %s=%s" key value))))))

-           ((or (re-search-backward 
+           ((or (re-search-backward

                  (concat "^" (regexp-quote mail-header-separator) "\n") nil t)
                 (re-search-forward
                  (concat "^" (regexp-quote mail-header-separator) "\n") nil t))
                  (concat "^" (regexp-quote mail-header-separator) "\n") nil t)
                 (re-search-forward
                  (concat "^" (regexp-quote mail-header-separator) "\n") nil t))

diff --git a/lisp/mml.el b/lisp/mml.el
index d8346cc..e52c4af 100644 (file)
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -37,14 +37,14 @@
   (autoload 'message-fetch-field "message")
   (autoload 'message-posting-charset "message"))
 
   (autoload 'message-fetch-field "message")
   (autoload 'message-posting-charset "message"))
 

-(defcustom mml-content-type-parameters 
+(defcustom mml-content-type-parameters

   '(name access-type expiration size permission format)
   "*A list of acceptable parameters in MML tag.
 These parameters are generated in Content-Type header if exists."
   :type '(repeat (symbol :tag "Parameter"))
   :group 'message)
 
   '(name access-type expiration size permission format)
   "*A list of acceptable parameters in MML tag.
 These parameters are generated in Content-Type header if exists."
   :type '(repeat (symbol :tag "Parameter"))
   :group 'message)
 

-(defcustom mml-content-disposition-parameters 
+(defcustom mml-content-disposition-parameters

   '(filename creation-date modification-date read-date)
   "*A list of acceptable parameters in MML tag.
 These parameters are generated in Content-Disposition header if exists."
   '(filename creation-date modification-date read-date)
   "*A list of acceptable parameters in MML tag.
 These parameters are generated in Content-Disposition header if exists."


@@ -136,23 +136,23 @@ one charsets.")
              point (point)
              contents (mml-read-part (eq 'mml (car tag)))
              charsets (cond
              point (point)
              contents (mml-read-part (eq 'mml (car tag)))
              charsets (cond

-                        (raw nil)
-                        ((assq 'charset tag)
-                         (list
-                          (intern (downcase (cdr (assq 'charset tag))))))
-                        (t
-                         (mm-find-mime-charset-region point (point)))))
+                       (raw nil)
+                       ((assq 'charset tag)
+                        (list
+                         (intern (downcase (cdr (assq 'charset tag))))))
+                       (t
+                        (mm-find-mime-charset-region point (point)))))

        (when (and (not raw) (memq nil charsets))
          (if (or (memq 'unknown-encoding mml-confirmation-set)
        (when (and (not raw) (memq nil charsets))
          (if (or (memq 'unknown-encoding mml-confirmation-set)

-                  (message-options-get 'unknown-encoding)
+                 (message-options-get 'unknown-encoding)

                  (and (y-or-n-p "\
 Message contains characters with unknown encoding.  Really send?")
                  (and (y-or-n-p "\
 Message contains characters with unknown encoding.  Really send?")

-                       (message-options-set 'unknown-encoding t)))
+                      (message-options-set 'unknown-encoding t)))

              (if (setq use-ascii
                        (or (memq 'use-ascii mml-confirmation-set)
              (if (setq use-ascii
                        (or (memq 'use-ascii mml-confirmation-set)

-                            (message-options-get 'use-ascii)
+                           (message-options-get 'use-ascii)

                            (and (y-or-n-p "Use ASCII as charset?")
                            (and (y-or-n-p "Use ASCII as charset?")

-                                 (message-options-set 'use-ascii t))))
+                                (message-options-set 'use-ascii t))))

                  (setq charsets (delq nil charsets))
                (setq warn nil))
            (error "Edit your message to remove those characters")))
                  (setq charsets (delq nil charsets))
                (setq warn nil))
            (error "Edit your message to remove those characters")))


@@ -168,11 +168,11 @@ Message contains characters with unknown encoding.  Really send?")
                          tag point (point) use-ascii)))
            (when (and warn
                       (not (memq 'multipart mml-confirmation-set))
                          tag point (point) use-ascii)))
            (when (and warn
                       (not (memq 'multipart mml-confirmation-set))

-                       (not (message-options-get 'multipart))
+                      (not (message-options-get 'multipart))

                       (not (and (y-or-n-p (format "\
 A message part needs to be split into %d charset parts.  Really send? "
                       (not (and (y-or-n-p (format "\
 A message part needs to be split into %d charset parts.  Really send? "

-                                                   (length nstruct)))
-                                 (message-options-set 'multipart t))))
+                                                  (length nstruct)))
+                                (message-options-set 'multipart t))))

              (error "Edit your message to use only one charset"))
            (setq struct (nconc nstruct struct)))))))
     (unless (eobp)
              (error "Edit your message to use only one charset"))
            (setq struct (nconc nstruct struct)))))))
     (unless (eobp)


@@ -266,7 +266,7 @@ A message part needs to be split into %d charset parts.  Really send? "
   "Return the buffer up till the next part, multipart or closing part or multipart.
 If MML is non-nil, return the buffer up till the correspondent mml tag."
   (let ((beg (point)) (count 1))
   "Return the buffer up till the next part, multipart or closing part or multipart.
 If MML is non-nil, return the buffer up till the correspondent mml tag."
   (let ((beg (point)) (count 1))

-    ;; If the tag ended at the end of the line, we go to the next line.
+   ;; If the tag ended at the end of the line, we go to the next line.

     (when (looking-at "[ \t]*\n")
       (forward-line 1))
     (if mml
     (when (looking-at "[ \t]*\n")
       (forward-line 1))
     (if mml


@@ -705,26 +705,26 @@ If HANDLES is non-nil, use it instead reparsing the buffer."
     main))
 
 (easy-menu-define
     main))
 
 (easy-menu-define

- mml-menu mml-mode-map ""
- '("MML"
-   ("Attach"
-    ["File" mml-attach-file t]
-    ["Buffer" mml-attach-buffer t]
-    ["External" mml-attach-external t])
-   ("Insert"
-    ["Multipart" mml-insert-multipart t]
-    ["Part" mml-insert-part t])
-   ("Security"
-    ("Sign"
-     ["PGP/MIME" mml-secure-sign-pgpmime t]
-     ["S/MIME" mml-secure-sign-smime t])
-    ("Encrypt"
-     ["PGP/MIME" mml-secure-encrypt-pgpmime t]
-     ["S/MIME" mml-secure-encrypt-smime t]))
-   ;;["Narrow" mml-narrow-to-part t]
-   ["Quote" mml-quote-region t]
-   ["Validate" mml-validate t]
-   ["Preview" mml-preview t]))
+  mml-menu mml-mode-map ""
+  '("MML"
+    ("Attach"
+     ["File" mml-attach-file t]
+     ["Buffer" mml-attach-buffer t]
+     ["External" mml-attach-external t])
+    ("Insert"
+     ["Multipart" mml-insert-multipart t]
+     ["Part" mml-insert-part t])
+    ("Security"
+     ("Sign"
+      ["PGP/MIME" mml-secure-sign-pgpmime t]
+      ["S/MIME" mml-secure-sign-smime t])
+     ("Encrypt"
+      ["PGP/MIME" mml-secure-encrypt-pgpmime t]
+      ["S/MIME" mml-secure-encrypt-smime t]))
+    ;;["Narrow" mml-narrow-to-part t]
+    ["Quote" mml-quote-region t]
+    ["Validate" mml-validate t]
+    ["Preview" mml-preview t]))

 
 (defvar mml-mode nil
   "Minor mode for editing MML.")
 
 (defvar mml-mode nil
   "Minor mode for editing MML.")


@@ -748,7 +748,7 @@ If HANDLES is non-nil, use it instead reparsing the buffer."
 
 (defun mml-minibuffer-read-file (prompt)
   (let ((file (read-file-name prompt nil nil t)))
 
 (defun mml-minibuffer-read-file (prompt)
   (let ((file (read-file-name prompt nil nil t)))

-    ;; Prevent some common errors.  This is inspired by similar code in
+   ;; Prevent some common errors.  This is inspired by similar code in

     ;; VM.
     (when (file-directory-p file)
       (error "%s is a directory, cannot attach" file))
     ;; VM.
     (when (file-directory-p file)
       (error "%s is a directory, cannot attach" file))


@@ -906,7 +906,7 @@ If RAW, don't highlight the article."
        (run-hooks 'gnus-article-decode-hook)
        (let ((gnus-newsgroup-name "dummy"))
          (gnus-article-prepare-display))))
        (run-hooks 'gnus-article-decode-hook)
        (let ((gnus-newsgroup-name "dummy"))
          (gnus-article-prepare-display))))

-    ;; Disable article-mode-map. 
+    ;; Disable article-mode-map.

     (use-local-map nil)
     (setq buffer-read-only t)
     (local-set-key "q" (lambda () (interactive) (kill-buffer nil)))
     (use-local-map nil)
     (setq buffer-read-only t)
     (local-set-key "q" (lambda () (interactive) (kill-buffer nil)))

diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index 57350b2..53ed8d4 100644 (file)
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -416,8 +416,8 @@
             mm-security-handle 'gnus-info "Failed")
            (throw 'error handle)))
        (mm-set-handle-multipart-parameter
             mm-security-handle 'gnus-info "Failed")
            (throw 'error handle)))
        (mm-set-handle-multipart-parameter

-        mm-security-handle 'gnus-info 
-        (with-current-buffer mml2015-result-buffer 
+        mm-security-handle 'gnus-info
+        (with-current-buffer mml2015-result-buffer

           (mml2015-gpg-extract-from))))
       handle)))
 
           (mml2015-gpg-extract-from))))
       handle)))
 


@@ -438,8 +438,8 @@
          mm-security-handle 'gnus-details "Quit.")
         nil))
       (mm-set-handle-multipart-parameter
          mm-security-handle 'gnus-details "Quit.")
         nil))
       (mm-set-handle-multipart-parameter

-       mm-security-handle 'gnus-info 
-       (with-current-buffer mml2015-result-buffer 
+       mm-security-handle 'gnus-info
+       (with-current-buffer mml2015-result-buffer

         (mml2015-gpg-extract-from)))
     (mm-set-handle-multipart-parameter
      mm-security-handle 'gnus-info "Failed")))
         (mml2015-gpg-extract-from)))
     (mm-set-handle-multipart-parameter
      mm-security-handle 'gnus-info "Failed")))

diff --git a/lisp/nnagent.el b/lisp/nnagent.el
index 50777ac..60c26cc 100644 (file)
--- a/lisp/nnagent.el
+++ b/lisp/nnagent.el
@@ -67,7 +67,7 @@
          (nnagent-active-file ,(gnus-agent-lib-file "active"))
          (nnagent-newsgroups-file ,(gnus-agent-lib-file "newsgroups"))
          (nnagent-get-new-mail nil)))
          (nnagent-active-file ,(gnus-agent-lib-file "active"))
          (nnagent-newsgroups-file ,(gnus-agent-lib-file "newsgroups"))
          (nnagent-get-new-mail nil)))

-  (nnoo-change-server 'nnagent 
+  (nnoo-change-server 'nnagent

                      (nnagent-server server)
                      defs)
   (let ((dir (gnus-agent-directory))
                      (nnagent-server server)
                      defs)
   (let ((dir (gnus-agent-directory))


@@ -121,68 +121,68 @@
 (deffoo nnagent-request-set-mark (group action server)
   (with-temp-buffer
     (insert (format "(%s-request-set-mark \"%s\" '%s \"%s\")\n"
 (deffoo nnagent-request-set-mark (group action server)
   (with-temp-buffer
     (insert (format "(%s-request-set-mark \"%s\" '%s \"%s\")\n"

-                    (nth 0 gnus-command-method) group action
-                    (or server (nth 1 gnus-command-method))))
+                   (nth 0 gnus-command-method) group action
+                   (or server (nth 1 gnus-command-method))))

     (append-to-file (point-min) (point-max) (gnus-agent-lib-file "flags")))
   nil)
 
 (deffoo nnagent-request-group (group &optional server dont-check)
   (nnoo-parent-function 'nnagent 'nnml-request-group
     (append-to-file (point-min) (point-max) (gnus-agent-lib-file "flags")))
   nil)
 
 (deffoo nnagent-request-group (group &optional server dont-check)
   (nnoo-parent-function 'nnagent 'nnml-request-group

-                   (list group (nnagent-server server) dont-check)))
+                       (list group (nnagent-server server) dont-check)))

 
 (deffoo nnagent-close-group (group &optional server)
   (nnoo-parent-function 'nnagent 'nnml-close-group
 
 (deffoo nnagent-close-group (group &optional server)
   (nnoo-parent-function 'nnagent 'nnml-close-group

-                   (list group (nnagent-server server))))
+                       (list group (nnagent-server server))))

 
 (deffoo nnagent-request-accept-article (group &optional server last)
   (nnoo-parent-function 'nnagent 'nnml-request-accept-article
 
 (deffoo nnagent-request-accept-article (group &optional server last)
   (nnoo-parent-function 'nnagent 'nnml-request-accept-article

-                   (list group (nnagent-server server) last)))
+                       (list group (nnagent-server server) last)))

 
 (deffoo nnagent-request-article (id &optional group server buffer)
   (nnoo-parent-function 'nnagent 'nnml-request-article
 
 (deffoo nnagent-request-article (id &optional group server buffer)
   (nnoo-parent-function 'nnagent 'nnml-request-article

-                   (list id group (nnagent-server server) buffer)))
+                       (list id group (nnagent-server server) buffer)))

 
 (deffoo nnagent-request-create-group (group &optional server args)
   (nnoo-parent-function 'nnagent 'nnml-request-create-group
 
 (deffoo nnagent-request-create-group (group &optional server args)
   (nnoo-parent-function 'nnagent 'nnml-request-create-group

-                   (list group (nnagent-server server) args)))
+                       (list group (nnagent-server server) args)))

 
 (deffoo nnagent-request-delete-group (group &optional force server)
   (nnoo-parent-function 'nnagent 'nnml-request-delete-group
 
 (deffoo nnagent-request-delete-group (group &optional force server)
   (nnoo-parent-function 'nnagent 'nnml-request-delete-group

-                   (list group force (nnagent-server server))))
+                       (list group force (nnagent-server server))))

 
 (deffoo nnagent-request-expire-articles (articles group &optional server force)
   (nnoo-parent-function 'nnagent 'nnml-request-expire-articles
 
 (deffoo nnagent-request-expire-articles (articles group &optional server force)
   (nnoo-parent-function 'nnagent 'nnml-request-expire-articles

-                   (list articles group (nnagent-server server) force)))
+                       (list articles group (nnagent-server server) force)))

 
 (deffoo nnagent-request-list (&optional server)
 
 (deffoo nnagent-request-list (&optional server)

-  (nnoo-parent-function 'nnagent 'nnml-request-list 
-                   (list (nnagent-server server))))
+  (nnoo-parent-function 'nnagent 'nnml-request-list
+                       (list (nnagent-server server))))

 
 (deffoo nnagent-request-list-newsgroups (&optional server)
 
 (deffoo nnagent-request-list-newsgroups (&optional server)

-  (nnoo-parent-function 'nnagent 'nnml-request-list-newsgroups 
-                   (list (nnagent-server server))))
+  (nnoo-parent-function 'nnagent 'nnml-request-list-newsgroups
+                       (list (nnagent-server server))))

 
 

-(deffoo nnagent-request-move-article 
+(deffoo nnagent-request-move-article

     (article group server accept-form &optional last)
     (article group server accept-form &optional last)

-  (nnoo-parent-function 'nnagent 'nnml-request-move-article 
-                   (list article group (nnagent-server server) 
-                         accept-form last)))
+  (nnoo-parent-function 'nnagent 'nnml-request-move-article
+                       (list article group (nnagent-server server)
+                             accept-form last)))

 
 (deffoo nnagent-request-rename-group (group new-name &optional server)
 
 (deffoo nnagent-request-rename-group (group new-name &optional server)

-  (nnoo-parent-function 'nnagent 'nnml-request-rename-group 
-                   (list group new-name (nnagent-server server))))
+  (nnoo-parent-function 'nnagent 'nnml-request-rename-group
+                       (list group new-name (nnagent-server server))))

 
 (deffoo nnagent-request-scan (&optional group server)
 
 (deffoo nnagent-request-scan (&optional group server)

-  (nnoo-parent-function 'nnagent 'nnml-request-scan 
-                   (list group (nnagent-server server))))
+  (nnoo-parent-function 'nnagent 'nnml-request-scan
+                       (list group (nnagent-server server))))

 
 (deffoo nnagent-retrieve-headers (sequence &optional group server fetch-old)
 
 (deffoo nnagent-retrieve-headers (sequence &optional group server fetch-old)

-  (nnoo-parent-function 'nnagent 'nnml-retrieve-headers 
-                   (list sequence group (nnagent-server server) fetch-old)))
+  (nnoo-parent-function 'nnagent 'nnml-retrieve-headers
+                       (list sequence group (nnagent-server server) fetch-old)))

 
 (deffoo nnagent-set-status (article name value &optional group server)
 
 (deffoo nnagent-set-status (article name value &optional group server)

-  (nnoo-parent-function 'nnagent 'nnml-set-status 
-                   (list article name value group (nnagent-server server))))
+  (nnoo-parent-function 'nnagent 'nnml-set-status
+                       (list article name value group (nnagent-server server))))

 
 (deffoo nnagent-server-opened (&optional server)
   (nnoo-parent-function 'nnagent 'nnml-server-opened
 
 (deffoo nnagent-server-opened (&optional server)
   (nnoo-parent-function 'nnagent 'nnml-server-opened

diff --git a/lisp/nnbabyl.el b/lisp/nnbabyl.el
index 8389e17..4dd06ea 100644 (file)
--- a/lisp/nnbabyl.el
+++ b/lisp/nnbabyl.el
@@ -282,8 +282,8 @@
              (progn
                (unless (eq nnmail-expiry-target 'delete)
                  (with-temp-buffer
              (progn
                (unless (eq nnmail-expiry-target 'delete)
                  (with-temp-buffer

-                   (nnbabyl-request-article (car articles) 
-                                            newsgroup server 
+                   (nnbabyl-request-article (car articles)
+                                            newsgroup server

                                             (current-buffer))
                    (let ((nnml-current-directory nil))
                      (nnmail-expiry-target-group
                                             (current-buffer))
                    (let ((nnml-current-directory nil))
                      (nnmail-expiry-target-group

diff --git a/lisp/nndb.el b/lisp/nndb.el
index 5c2645c..6cc95c3 100644 (file)
--- a/lisp/nndb.el
+++ b/lisp/nndb.el
@@ -175,7 +175,7 @@ article was posted to nndb")
       (nntp-send-command "^\\([23]\\|^423\\).*\n" "X-DATE" art)
       (setq msg (nndb-status-message))
       (if (string-match "^423" msg)
       (nntp-send-command "^\\([23]\\|^423\\).*\n" "X-DATE" art)
       (setq msg (nndb-status-message))
       (if (string-match "^423" msg)

-          ()
+         ()

        (or (string-match "'\\(.+\\)'" msg)
            (error "Not a valid response for X-DATE command: %s"
                   msg))
        (or (string-match "'\\(.+\\)'" msg)
            (error "Not a valid response for X-DATE command: %s"
                   msg))


@@ -202,12 +202,12 @@ article was posted to nndb")
     (set-buffer nntp-server-buffer)
     (goto-char (point-min))
     (if (looking-at "^[34]")
     (set-buffer nntp-server-buffer)
     (goto-char (point-min))
     (if (looking-at "^[34]")

-       ;; x-expire returned error--presume no articles were expirable)
+       ;; x-expire returned error--presume no articles were expirable)

        (setq list nil)
       ;; otherwise, pull all of the following numbers into the list
       (re-search-forward "follows\r?\n?" nil t)
       (while (re-search-forward "^[0-9]+$" nil t)
        (setq list nil)
       ;; otherwise, pull all of the following numbers into the list
       (re-search-forward "follows\r?\n?" nil t)
       (while (re-search-forward "^[0-9]+$" nil t)

-       (push (string-to-int (match-string 0)) list)))
+      (push (string-to-int (match-string 0)) list)))

     list))
 
 (defun nndb-request-expire-articles-remote
     list))
 
 (defun nndb-request-expire-articles-remote


@@ -219,15 +219,15 @@ article was posted to nndb")
     ;; first calculate the wait period in days
     (setq days (or (and nnmail-expiry-wait-function
                        (funcall nnmail-expiry-wait-function group))
     ;; first calculate the wait period in days
     (setq days (or (and nnmail-expiry-wait-function
                        (funcall nnmail-expiry-wait-function group))

-                  nnmail-expiry-wait))
+    nnmail-expiry-wait))

     ;; now handle the special cases
     (cond (force
     ;; now handle the special cases
     (cond (force

-          (setq days 0))
+    (setq days 0))

          ((eq days 'never)
           ;; This isn't an expirable group.
          ((eq days 'never)
           ;; This isn't an expirable group.

-          (setq days -1))
+         (setq days -1))

          ((eq days 'immediate)
          ((eq days 'immediate)

-          (setq days 0)))
+         (setq days 0)))

 
 
     ;; build article string
 
 
     ;; build article string


@@ -268,19 +268,19 @@ Optional LAST is ignored."
          (cons new-group article))
       ;; else move normally
       (let ((artbuf (get-buffer-create " *nndb move*")))
          (cons new-group article))
       ;; else move normally
       (let ((artbuf (get-buffer-create " *nndb move*")))

-       (and
-        (nndb-request-article article group server artbuf)
-        (save-excursion
-          (set-buffer artbuf)
-          (insert-buffer-substring nntp-server-buffer)
-          (setq result (eval accept-form))
-          (kill-buffer (current-buffer))
-          result)
-        (nndb-request-expire-articles (list article)
-                                      group
-                                      server
-                                      t))
-       result)
+      (and
+       (nndb-request-article article group server artbuf)
+       (save-excursion
+        (set-buffer artbuf)
+        (insert-buffer-substring nntp-server-buffer)
+        (setq result (eval accept-form))
+        (kill-buffer (current-buffer))
+        result)
+       (nndb-request-expire-articles (list article)
+                                    group
+                                    server
+                                    t))
+      result)

       )))
 
 (deffoo nndb-request-accept-article (group server &optional last)
       )))
 
 (deffoo nndb-request-accept-article (group server &optional last)


@@ -307,11 +307,11 @@ Optional LAST is ignored."
     (nntp-send-buffer "^[23.*\n")
     (list (int-to-string article))))
 
     (nntp-send-buffer "^[23.*\n")
     (list (int-to-string article))))
 

-; nndb-request-delete-group does not exist
-; todo -- maybe later
+                           ; nndb-request-delete-group does not exist
+                                       ; todo -- maybe later

 
 

-; nndb-request-rename-group does not exist
-; todo -- maybe later
+                           ; nndb-request-rename-group does not exist
+                                       ; todo -- maybe later

 
 ;; -- standard compatability functions
 
 
 ;; -- standard compatability functions
 

diff --git a/lisp/nndoc.el b/lisp/nndoc.el
index a9824fe..a4b6daf 100644 (file)
--- a/lisp/nndoc.el
+++ b/lisp/nndoc.el
@@ -246,8 +246,8 @@ from the document.")
 
 (deffoo nndoc-request-type (group &optional article)
   (cond ((not article) 'unknown)
 
 (deffoo nndoc-request-type (group &optional article)
   (cond ((not article) 'unknown)

-        (nndoc-post-type nndoc-post-type)
-        (t 'unknown)))
+       (nndoc-post-type nndoc-post-type)
+       (t 'unknown)))

 
 (deffoo nndoc-close-group (group &optional server)
   (nndoc-possibly-change-buffer group server)
 
 (deffoo nndoc-close-group (group &optional server)
   (nndoc-possibly-change-buffer group server)


@@ -436,7 +436,7 @@ from the document.")
     t))
 
 (defun nndoc-forward-type-p ()
     t))
 
 (defun nndoc-forward-type-p ()

-  (when (and (re-search-forward "^-+ \\(Start of \\)?forwarded message.*\n+" 
+  (when (and (re-search-forward "^-+ \\(Start of \\)?forwarded message.*\n+"

                                nil t)
             (not (re-search-forward "^Subject:.*digest" nil t))
             (not (re-search-backward "^From:" nil t 2))
                                nil t)
             (not (re-search-forward "^Subject:.*digest" nil t))
             (not (re-search-backward "^From:" nil t 2))

diff --git a/lisp/nneething.el b/lisp/nneething.el
index 1d83717..0d9d760 100644 (file)
--- a/lisp/nneething.el
+++ b/lisp/nneething.el
@@ -122,11 +122,11 @@ included.")
   (let ((file (unless (stringp id)
                (nneething-file-name id)))
        (nntp-server-buffer (or buffer nntp-server-buffer)))
   (let ((file (unless (stringp id)
                (nneething-file-name id)))
        (nntp-server-buffer (or buffer nntp-server-buffer)))

-    (and (stringp file)                        ; We did not request by Message-ID.
+    (and (stringp file)                   ; We did not request by Message-ID.

         (file-exists-p file)           ; The file exists.
         (not (file-directory-p file))  ; It's not a dir.
         (save-excursion
         (file-exists-p file)           ; The file exists.
         (not (file-directory-p file))  ; It's not a dir.
         (save-excursion

-          (nnmail-find-file file)      ; Insert the file in the nntp buf.
+          (nnmail-find-file file)  ; Insert the file in the nntp buf.

           (unless (nnheader-article-p) ; Either it's a real article...
             (goto-char (point-min))
             (nneething-make-head
           (unless (nnheader-article-p) ; Either it's a real article...
             (goto-char (point-min))
             (nneething-make-head


@@ -234,7 +234,7 @@ included.")
            prev)
        (while map
          (if (and (member (cadr (car map)) files)
            prev)
        (while map
          (if (and (member (cadr (car map)) files)

-                  ;; We also remove files that have changed mod times.
+                 ;; We also remove files that have changed mod times.

                   (equal (nth 5 (file-attributes
                                  (nneething-file-name (cadr (car map)))))
                          (cadr (cdar map))))
                   (equal (nth 5 (file-attributes
                                  (nneething-file-name (cadr (car map)))))
                          (cadr (cdar map))))


@@ -352,7 +352,7 @@ included.")
                 (progn
                   (goto-char (point-min))
                   (or (and (search-forward "\n\n" nil t)
                 (progn
                   (goto-char (point-min))
                   (or (and (search-forward "\n\n" nil t)

-                     (1- (point)))
+                           (1- (point)))

                       (point-max)))
                 (point-max))
              (goto-char (point-min))
                       (point-max)))
                 (point-max))
              (goto-char (point-min))


@@ -365,7 +365,7 @@ included.")
 (defun nneething-file-name (article)
   "Return the file name of ARTICLE."
   (let ((dir (file-name-as-directory nneething-address))
 (defun nneething-file-name (article)
   "Return the file name of ARTICLE."
   (let ((dir (file-name-as-directory nneething-address))

-        fname)
+       fname)

     (if (numberp article)
        (if (setq fname (cadr (assq article nneething-map)))
            (expand-file-name fname dir)
     (if (numberp article)
        (if (setq fname (cadr (assq article nneething-map)))
            (expand-file-name fname dir)

diff --git a/lisp/nnfolder.el b/lisp/nnfolder.el
index 5f52217..85f4b72 100644 (file)
--- a/lisp/nnfolder.el
+++ b/lisp/nnfolder.el
@@ -103,7 +103,7 @@ message, a huge time saver for large mailboxes.")
 (defvoo nnfolder-scantime-alist nil)
 (defvoo nnfolder-active-timestamp nil)
 (defvoo nnfolder-active-file-coding-system mm-text-coding-system)
 (defvoo nnfolder-scantime-alist nil)
 (defvoo nnfolder-active-timestamp nil)
 (defvoo nnfolder-active-file-coding-system mm-text-coding-system)

-(defvoo nnfolder-active-file-coding-system-for-write 
+(defvoo nnfolder-active-file-coding-system-for-write

     nnmail-active-file-coding-system)
 (defvoo nnfolder-file-coding-system mm-text-coding-system)
 (defvoo nnfolder-file-coding-system-for-write nnheader-file-coding-system
     nnmail-active-file-coding-system)
 (defvoo nnfolder-file-coding-system mm-text-coding-system)
 (defvoo nnfolder-file-coding-system-for-write nnheader-file-coding-system


@@ -144,7 +144,7 @@ all.  This may very well take some time.")
            'headers
          (if (nnfolder-retrieve-headers-with-nov articles fetch-old)
              'nov
            'headers
          (if (nnfolder-retrieve-headers-with-nov articles fetch-old)
              'nov

-           (setq articles (gnus-sorted-intersection 
+           (setq articles (gnus-sorted-intersection

                            ;; Is ARTICLES sorted?
                            (sort articles '<)
                            (nnfolder-existing-articles)))
                            ;; Is ARTICLES sorted?
                            (sort articles '<)
                            (nnfolder-existing-articles)))


@@ -220,7 +220,7 @@ all.  This may very well take some time.")
              (cons nnfolder-current-group article)
            (goto-char (point-min))
            (cons nnfolder-current-group
              (cons nnfolder-current-group article)
            (goto-char (point-min))
            (cons nnfolder-current-group

-                 (if (search-forward (concat "\n" nnfolder-article-marker) 
+                 (if (search-forward (concat "\n" nnfolder-article-marker)

                                      nil t)
                      (string-to-int
                       (buffer-substring
                                      nil t)
                      (string-to-int
                       (buffer-substring


@@ -349,7 +349,7 @@ all.  This may very well take some time.")
          (let ((newnum (string-to-number (match-string 0))))
            (if (nnmail-within-headers-p)
                (push newnum numbers))))
          (let ((newnum (string-to-number (match-string 0))))
            (if (nnmail-within-headers-p)
                (push newnum numbers))))

-       ;; The article numbers are increasing, so this result is sorted.
+      ;; The article numbers are increasing, so this result is sorted.

        (nreverse numbers)))))
 
 (deffoo nnfolder-request-expire-articles
        (nreverse numbers)))))
 
 (deffoo nnfolder-request-expire-articles


@@ -383,7 +383,7 @@ all.  This may very well take some time.")
                       force nnfolder-inhibit-expiry))
            (unless (eq nnmail-expiry-target 'delete)
              (with-temp-buffer
                       force nnfolder-inhibit-expiry))
            (unless (eq nnmail-expiry-target 'delete)
              (with-temp-buffer

-               (nnfolder-request-article (car maybe-expirable) 
+               (nnfolder-request-article (car maybe-expirable)

                                          newsgroup server (current-buffer))
                (let ((nnml-current-directory nil))
                  (nnmail-expiry-target-group
                                          newsgroup server (current-buffer))
                (let ((nnml-current-directory nil))
                  (nnmail-expiry-target-group


@@ -417,7 +417,7 @@ all.  This may very well take some time.")
         (goto-char (point-min))
         (while (re-search-forward
                 (concat "^" nnfolder-article-marker)
         (goto-char (point-min))
         (while (re-search-forward
                 (concat "^" nnfolder-article-marker)

-                (save-excursion (and (search-forward "\n\n" nil t) (point))) 
+                (save-excursion (and (search-forward "\n\n" nil t) (point)))

                 t)
           (delete-region (progn (beginning-of-line) (point))
                          (progn (forward-line 1) (point))))
                 t)
           (delete-region (progn (beginning-of-line) (point))
                          (progn (forward-line 1) (point))))


@@ -503,7 +503,7 @@ all.  This may very well take some time.")
       (unless (or gnus-nov-is-evil nnfolder-nov-is-evil)
        (save-excursion
          (set-buffer buffer)
       (unless (or gnus-nov-is-evil nnfolder-nov-is-evil)
        (save-excursion
          (set-buffer buffer)

-         (let ((headers (nnfolder-parse-head article 
+         (let ((headers (nnfolder-parse-head article

                                              (point-min) (point-max))))
            (with-current-buffer (nnfolder-open-nov group)
              (if (nnheader-find-nov-line article)
                                              (point-min) (point-max))))
            (with-current-buffer (nnfolder-open-nov group)
              (if (nnheader-find-nov-line article)


@@ -638,23 +638,23 @@ deleted.  Point is left where the deleted region was."
   ;; Change group.
   (let ((file-name-coding-system nnmail-pathname-coding-system))
     (when (and group
   ;; Change group.
   (let ((file-name-coding-system nnmail-pathname-coding-system))
     (when (and group

-               (not (equal group nnfolder-current-group))
-               (progn
-                 (nnmail-activate 'nnfolder)
-                 (and (assoc group nnfolder-group-alist)
-                      (file-exists-p (nnfolder-group-pathname group)))))
+              (not (equal group nnfolder-current-group))
+              (progn
+                (nnmail-activate 'nnfolder)
+                (and (assoc group nnfolder-group-alist)
+                     (file-exists-p (nnfolder-group-pathname group)))))

       (if dont-check
          (setq nnfolder-current-group group
                nnfolder-current-buffer nil)
        (let (inf file)
       (if dont-check
          (setq nnfolder-current-group group
                nnfolder-current-buffer nil)
        (let (inf file)

-         ;; If we have to change groups, see if we don't already have the
-         ;; folder in memory.  If we do, verify the modtime and destroy
+      ;; If we have to change groups, see if we don't already have the
+       ;; folder in memory.  If we do, verify the modtime and destroy

          ;; the folder if needed so we can rescan it.
          (setq nnfolder-current-buffer
                (nth 1 (assoc group nnfolder-buffer-alist)))
 
          ;; the folder if needed so we can rescan it.
          (setq nnfolder-current-buffer
                (nth 1 (assoc group nnfolder-buffer-alist)))
 

-         ;; If the buffer is not live, make sure it isn't in the alist.  If it
-         ;; is live, verify that nobody else has touched the file since last
+ ;; If the buffer is not live, make sure it isn't in the alist.  If it
+   ;; is live, verify that nobody else has touched the file since last

          ;; time.
          (when (and nnfolder-current-buffer
                     (not (gnus-buffer-live-p nnfolder-current-buffer)))
          ;; time.
          (when (and nnfolder-current-buffer
                     (not (gnus-buffer-live-p nnfolder-current-buffer)))


@@ -671,7 +671,7 @@ deleted.  Point is left where the deleted region was."
              ;; See whether we need to create the new file.
              (unless (file-exists-p file)
                (gnus-make-directory (file-name-directory file))
              ;; See whether we need to create the new file.
              (unless (file-exists-p file)
                (gnus-make-directory (file-name-directory file))

-               (let ((nnmail-file-coding-system 
+               (let ((nnmail-file-coding-system

                       (or nnfolder-file-coding-system-for-write
                           nnfolder-file-coding-system-for-write)))
                  (nnmail-write-region 1 1 file t 'nomesg)))
                       (or nnfolder-file-coding-system-for-write
                           nnfolder-file-coding-system-for-write)))
                  (nnmail-write-region 1 1 file t 'nomesg)))


@@ -792,7 +792,7 @@ deleted.  Point is left where the deleted region was."
   (let* ((file (nnfolder-group-pathname group))
         (nov  (nnfolder-group-nov-pathname group))
         (buffer (set-buffer
   (let* ((file (nnfolder-group-pathname group))
         (nov  (nnfolder-group-nov-pathname group))
         (buffer (set-buffer

-                 (let ((nnheader-file-coding-system 
+                 (let ((nnheader-file-coding-system

                         nnfolder-file-coding-system))
                    (nnheader-find-file-noselect file)))))
     (mm-enable-multibyte) ;; Use multibyte buffer for future copying.
                         nnfolder-file-coding-system))
                    (nnheader-find-file-noselect file)))))
     (mm-enable-multibyte) ;; Use multibyte buffer for future copying.


@@ -839,11 +839,11 @@ deleted.  Point is left where the deleted region was."
              (setq articles (nreverse articles))))
          (goto-char (point-min))
 
              (setq articles (nreverse articles))))
          (goto-char (point-min))
 

-         ;; Anytime the active number is 1 or 0, it is suspect.  In that
-         ;; case, search the file manually to find the active number.  Or,
-         ;; of course, if we're being paranoid.  (This would also be the
-         ;; place to build other lists from the header markers, such as
-         ;; expunge lists, etc., if we ever desired to abandon the active
+       ;; Anytime the active number is 1 or 0, it is suspect.  In that
+     ;; case, search the file manually to find the active number.  Or,
+       ;; of course, if we're being paranoid.  (This would also be the
+       ;; place to build other lists from the header markers, such as
+      ;; expunge lists, etc., if we ever desired to abandon the active

          ;; file entirely for mboxes.)
          (when (or nnfolder-ignore-active-file
                    novbuf
          ;; file entirely for mboxes.)
          (when (or nnfolder-ignore-active-file
                    novbuf


@@ -865,15 +865,15 @@ deleted.  Point is left where the deleted region was."
              (with-current-buffer novbuf
                (dolist (article articles)
                  (when (nnheader-find-nov-line article)
              (with-current-buffer novbuf
                (dolist (article articles)
                  (when (nnheader-find-nov-line article)

-                   (delete-region (point) 
+                   (delete-region (point)

                                   (progn (forward-line 1) (point)))))))
            (setcar active (max 1 (min minid maxid)))
            (setcdr active (max maxid (cdr active)))
            (goto-char (point-min)))
 
                                   (progn (forward-line 1) (point)))))))
            (setcar active (max 1 (min minid maxid)))
            (setcdr active (max maxid (cdr active)))
            (goto-char (point-min)))
 

-         ;; As long as we trust that the user will only insert unmarked mail
-         ;; at the end, go to the end and search backwards for the last
-         ;; marker.  Find the start of that message, and begin to search for
+   ;; As long as we trust that the user will only insert unmarked mail
+       ;; at the end, go to the end and search backwards for the last
+   ;; marker.  Find the start of that message, and begin to search for

          ;; unmarked messages from there.
          (when (not (or nnfolder-distrust-mbox
                         (< maxid 2)))
          ;; unmarked messages from there.
          (when (not (or nnfolder-distrust-mbox
                         (< maxid 2)))


@@ -884,8 +884,8 @@ deleted.  Point is left where the deleted region was."
            ;;  (goto-char (point-min)))
            )
 
            ;;  (goto-char (point-min)))
            )
 

-         ;; Keep track of the active number on our own, and insert it back
-         ;; into the active list when we're done.  Also, prime the pump to
+     ;; Keep track of the active number on our own, and insert it back
+     ;; into the active list when we're done.  Also, prime the pump to

          ;; cut down on the number of searches we do.
          (unless (nnmail-search-unix-mail-delim)
            (goto-char (point-max)))
          ;; cut down on the number of searches we do.
          (unless (nnmail-search-unix-mail-delim)
            (goto-char (point-max)))


@@ -893,7 +893,7 @@ deleted.  Point is left where the deleted region was."
          (while (not (= end (point-max)))
            (setq start (marker-position end))
            (goto-char end)
          (while (not (= end (point-max)))
            (setq start (marker-position end))
            (goto-char end)

-           ;; There may be more than one "From " line, so we skip past
+          ;; There may be more than one "From " line, so we skip past

            ;; them.
            (while (looking-at delim)
              (forward-line 1))
            ;; them.
            (while (looking-at delim)
              (forward-line 1))


@@ -905,19 +905,19 @@ deleted.  Point is left where the deleted region was."
              (narrow-to-region start end)
              (nnmail-insert-lines)
              (nnfolder-insert-newsgroup-line
              (narrow-to-region start end)
              (nnmail-insert-lines)
              (nnfolder-insert-newsgroup-line

-              (cons nil 
+              (cons nil

                     (setq newnum
                           (nnfolder-active-number nnfolder-current-group))))
              (when novbuf
                (let ((headers (nnfolder-parse-head newnum (point-min)
                     (setq newnum
                           (nnfolder-active-number nnfolder-current-group))))
              (when novbuf
                (let ((headers (nnfolder-parse-head newnum (point-min)

-                                                     (point-max))))
+                                                   (point-max))))

                  (with-current-buffer novbuf
                    (goto-char (point-max))
                    (nnheader-insert-nov headers))))
              (widen)))
 
          (set-marker end nil)
                  (with-current-buffer novbuf
                    (goto-char (point-max))
                    (nnheader-insert-nov headers))))
              (widen)))
 
          (set-marker end nil)

-         ;; Make absolutely sure that the active list reflects reality!
+       ;; Make absolutely sure that the active list reflects reality!

          (nnfolder-save-active nnfolder-group-alist nnfolder-active-file)
 
          ;; Set the scantime for this group.
          (nnfolder-save-active nnfolder-group-alist nnfolder-active-file)
 
          ;; Set the scantime for this group.


@@ -938,32 +938,32 @@ This command does not work if you use short group names."
   (interactive)
   (nnmail-activate 'nnfolder)
   (unless (or gnus-nov-is-evil nnfolder-nov-is-evil)
   (interactive)
   (nnmail-activate 'nnfolder)
   (unless (or gnus-nov-is-evil nnfolder-nov-is-evil)

-    (dolist (file (directory-files (or nnfolder-nov-directory 
+    (dolist (file (directory-files (or nnfolder-nov-directory

                                       nnfolder-directory)
                                       nnfolder-directory)

-                                  t 
-                                  (concat 
+                                  t
+                                  (concat

                                    (regexp-quote nnfolder-nov-file-suffix)
                                    "$")))
       (when (not (message-mail-file-mbox-p file))
        (ignore-errors
          (delete-file file)))))
   (let ((files (directory-files nnfolder-directory))
                                    (regexp-quote nnfolder-nov-file-suffix)
                                    "$")))
       (when (not (message-mail-file-mbox-p file))
        (ignore-errors
          (delete-file file)))))
   (let ((files (directory-files nnfolder-directory))

-        file)
+       file)

     (while (setq file (pop files))
       (when (and (not (backup-file-name-p file))
     (while (setq file (pop files))
       (when (and (not (backup-file-name-p file))

-                 (message-mail-file-mbox-p
+                (message-mail-file-mbox-p

                  (nnheader-concat nnfolder-directory file)))
                  (nnheader-concat nnfolder-directory file)))

-        (let ((oldgroup (assoc file nnfolder-group-alist)))
-          (if oldgroup
-              (nnheader-message 5 "Refreshing group %s..." file)
-            (nnheader-message 5 "Adding group %s..." file))
+       (let ((oldgroup (assoc file nnfolder-group-alist)))
+         (if oldgroup
+             (nnheader-message 5 "Refreshing group %s..." file)
+           (nnheader-message 5 "Adding group %s..." file))

          (if oldgroup
              (setq nnfolder-group-alist
                    (delq oldgroup (copy-sequence nnfolder-group-alist))))
          (if oldgroup
              (setq nnfolder-group-alist
                    (delq oldgroup (copy-sequence nnfolder-group-alist))))

-          (push (list file (cons 1 0)) nnfolder-group-alist)
-          (nnfolder-possibly-change-folder file)
-          (nnfolder-possibly-change-group file)
-          (nnfolder-close-group file))))
+         (push (list file (cons 1 0)) nnfolder-group-alist)
+         (nnfolder-possibly-change-folder file)
+         (nnfolder-possibly-change-group file)
+         (nnfolder-close-group file))))

     (nnheader-message 5 "")))
 
 (defun nnfolder-group-pathname (group)
     (nnheader-message 5 "")))
 
 (defun nnfolder-group-pathname (group)


@@ -989,7 +989,7 @@ This command does not work if you use short group names."
   (when (buffer-modified-p)
     (run-hooks 'nnfolder-save-buffer-hook)
     (gnus-make-directory (file-name-directory (buffer-file-name)))
   (when (buffer-modified-p)
     (run-hooks 'nnfolder-save-buffer-hook)
     (gnus-make-directory (file-name-directory (buffer-file-name)))

-    (let ((coding-system-for-write 
+    (let ((coding-system-for-write

           (or nnfolder-file-coding-system-for-write
               nnfolder-file-coding-system)))
       (save-buffer)))
           (or nnfolder-file-coding-system-for-write
               nnfolder-file-coding-system)))
       (save-buffer)))


@@ -1021,7 +1021,7 @@ This command does not work if you use short group names."
       (when (buffer-name (cdar nnfolder-nov-buffer-alist))
        (set-buffer (cdar nnfolder-nov-buffer-alist))
        (when (buffer-modified-p)
       (when (buffer-name (cdar nnfolder-nov-buffer-alist))
        (set-buffer (cdar nnfolder-nov-buffer-alist))
        (when (buffer-modified-p)

-         (gnus-make-directory (file-name-directory 
+         (gnus-make-directory (file-name-directory

                                nnfolder-nov-buffer-file-name))
          (nnmail-write-region 1 (point-max) nnfolder-nov-buffer-file-name
                               nil 'nomesg))
                                nnfolder-nov-buffer-file-name))
          (nnmail-write-region 1 (point-max) nnfolder-nov-buffer-file-name
                               nil 'nomesg))


@@ -1058,29 +1058,29 @@ This command does not work if you use short group names."
   "Parse the head of the current buffer."
   (let ((buf (current-buffer))
        chars)
   "Parse the head of the current buffer."
   (let ((buf (current-buffer))
        chars)

-  (save-excursion
-    (unless b
-      (setq b (if (nnmail-search-unix-mail-delim-backward)
-                 (point) (point-min)))
-      (forward-line 1)
-      (setq e (if (nnmail-search-unix-mail-delim)
-                 (point) (point-max))))
-    (setq chars (- e b))
-    (unless (zerop chars)
-      (goto-char b)
-      (if (search-forward "\n\n" e t) (setq e (1- (point)))))
-    (with-temp-buffer
-      (insert-buffer-substring buf b e)
-      ;; Fold continuation lines.
-      (goto-char (point-min))
-      (while (re-search-forward "\\(\r?\n[ \t]+\\)+" nil t)
-       (replace-match " " t t))
-      ;; Remove any tabs; they are too confusing.
-      (subst-char-in-region (point-min) (point-max) ?\t ? )
-      (let ((headers (nnheader-parse-head t)))
-       (mail-header-set-chars headers chars)
-       (mail-header-set-number headers number)
-       headers)))))
+    (save-excursion
+      (unless b
+       (setq b (if (nnmail-search-unix-mail-delim-backward)
+                   (point) (point-min)))
+       (forward-line 1)
+       (setq e (if (nnmail-search-unix-mail-delim)
+                   (point) (point-max))))
+      (setq chars (- e b))
+      (unless (zerop chars)
+       (goto-char b)
+       (if (search-forward "\n\n" e t) (setq e (1- (point)))))
+      (with-temp-buffer
+       (insert-buffer-substring buf b e)
+       ;; Fold continuation lines.
+       (goto-char (point-min))
+       (while (re-search-forward "\\(\r?\n[ \t]+\\)+" nil t)
+         (replace-match " " t t))
+       ;; Remove any tabs; they are too confusing.
+       (subst-char-in-region (point-min) (point-max) ?\t ? )
+       (let ((headers (nnheader-parse-head t)))
+         (mail-header-set-chars headers chars)
+         (mail-header-set-number headers number)
+         headers)))))

 
 (defun nnfolder-add-nov (group article headers)
   "Add a nov line for the GROUP base."
 
 (defun nnfolder-add-nov (group article headers)
   "Add a nov line for the GROUP base."

diff --git a/lisp/nngateway.el b/lisp/nngateway.el
index 21b5a4b..b1d3b92 100644 (file)
--- a/lisp/nngateway.el
+++ b/lisp/nngateway.el
@@ -66,7 +66,7 @@ parameter -- the gateway address.")
        (widen)
        (let (message-required-mail-headers)
          (funcall (or message-send-mail-real-function
        (widen)
        (let (message-required-mail-headers)
          (funcall (or message-send-mail-real-function

-                       message-send-mail-function)))
+                      message-send-mail-function)))

        t))))
 
 ;;; Internal functions
        t))))
 
 ;;; Internal functions

diff --git a/lisp/nnheader.el b/lisp/nnheader.el
index cc5a0e2..80718b8 100644 (file)
--- a/lisp/nnheader.el
+++ b/lisp/nnheader.el
@@ -33,7 +33,7 @@
 
 ;; Requiring `gnus-util' at compile time creates a circular
 ;; dependency between nnheader.el and gnus-util.el.
 
 ;; Requiring `gnus-util' at compile time creates a circular
 ;; dependency between nnheader.el and gnus-util.el.

-;(eval-when-compile (require 'gnus-util))
+                            ;(eval-when-compile (require 'gnus-util))

 
 (require 'mail-utils)
 (require 'mm-util)
 
 (require 'mail-utils)
 (require 'mm-util)


@@ -183,7 +183,7 @@ on your system, you could say something like:
   (concat "fake+none+" (int-to-string (incf nnheader-fake-message-id))))
 
 (defsubst nnheader-fake-message-id-p (id)
   (concat "fake+none+" (int-to-string (incf nnheader-fake-message-id))))
 
 (defsubst nnheader-fake-message-id-p (id)

-  (save-match-data                     ; regular message-id's are <.*>
+  (save-match-data                    ; regular message-id's are <.*>

     (string-match "\\`fake\\+none\\+[0-9]+\\'" id)))
 
 ;; Parsing headers and NOV lines.
     (string-match "\\`fake\\+none\\+[0-9]+\\'" id)))
 
 ;; Parsing headers and NOV lines.


@@ -255,7 +255,7 @@ on your system, you could say something like:
             (goto-char p)
             (if (search-forward "\nreferences:" nil t)
                 (nnheader-header-value)
             (goto-char p)
             (if (search-forward "\nreferences:" nil t)
                 (nnheader-header-value)

-              ;; Get the references from the in-reply-to header if there
+           ;; Get the references from the in-reply-to header if there

               ;; were no references and the in-reply-to header looks
               ;; promising.
               (if (and (search-forward "\nin-reply-to:" nil t)
               ;; were no references and the in-reply-to header looks
               ;; promising.
               (if (and (search-forward "\nin-reply-to:" nil t)


@@ -270,7 +270,7 @@ on your system, you could say something like:
                                             (match-end 0)))
                       (when (> (length ref2) (length ref))
                         (setq ref ref2)))
                                             (match-end 0)))
                       (when (> (length ref2) (length ref))
                         (setq ref ref2)))

-                     ref)
+                    ref)

                 nil)))
           ;; Chars.
           0
                 nil)))
           ;; Chars.
           0


@@ -623,7 +623,7 @@ an alarming frequency on NFS mounted file systems. If it is nil,
 (defun nnheader-directory-articles (dir)
   "Return a list of all article files in directory DIR."
   (mapcar 'nnheader-file-to-number
 (defun nnheader-directory-articles (dir)
   "Return a list of all article files in directory DIR."
   (mapcar 'nnheader-file-to-number

-         (if nnheader-directory-files-is-safe 
+         (if nnheader-directory-files-is-safe

              (directory-files
               dir nil nnheader-numerical-short-files t)
            (nnheader-directory-files-safe
              (directory-files
               dir nil nnheader-numerical-short-files t)
            (nnheader-directory-files-safe


@@ -632,7 +632,7 @@ an alarming frequency on NFS mounted file systems. If it is nil,
 (defun nnheader-article-to-file-alist (dir)
   "Return an alist of article/file pairs in DIR."
   (mapcar (lambda (file) (cons (nnheader-file-to-number file) file))
 (defun nnheader-article-to-file-alist (dir)
   "Return an alist of article/file pairs in DIR."
   (mapcar (lambda (file) (cons (nnheader-file-to-number file) file))

-         (if nnheader-directory-files-is-safe 
+         (if nnheader-directory-files-is-safe

              (directory-files
               dir nil nnheader-numerical-short-files t)
            (nnheader-directory-files-safe
              (directory-files
               dir nil nnheader-numerical-short-files t)
            (nnheader-directory-files-safe


@@ -656,7 +656,7 @@ If FULL, translate everything."
                path ""
                i (if (and (< 1 (length leaf)) (eq ?: (aref leaf 1)))
                      2 0))
                path ""
                i (if (and (< 1 (length leaf)) (eq ?: (aref leaf 1)))
                      2 0))

-       ;; We translate -- but only the file name.  We leave the directory
+    ;; We translate -- but only the file name.  We leave the directory

        ;; alone.
        (if (and (featurep 'xemacs)
                 (memq system-type '(win32 w32 mswindows windows-nt)))
        ;; alone.
        (if (and (featurep 'xemacs)
                 (memq system-type '(win32 w32 mswindows windows-nt)))


@@ -664,7 +664,7 @@ If FULL, translate everything."
            ;; file-name-nondirectory is not enough to split
            ;; file names, containing ':', e.g.
            ;; "d:\\Work\\News\\nntp+news.fido7.ru:fido7.ru.gnu.SCORE"
            ;; file-name-nondirectory is not enough to split
            ;; file names, containing ':', e.g.
            ;; "d:\\Work\\News\\nntp+news.fido7.ru:fido7.ru.gnu.SCORE"

-           ;; 
+           ;;

            ;; we are trying to correctly split such names:
            ;; "d:file.name" -> "a:" "file.name"
            ;; "aaa:bbb.ccc" -> "" "aaa:bbb.ccc"
            ;; we are trying to correctly split such names:
            ;; "d:file.name" -> "a:" "file.name"
            ;; "aaa:bbb.ccc" -> "" "aaa:bbb.ccc"


@@ -773,7 +773,7 @@ without formatting."
        ;; If not, we translate dots into slashes.
        (expand-file-name (mm-encode-coding-string
                           (nnheader-replace-chars-in-string group ?. ?/)
        ;; If not, we translate dots into slashes.
        (expand-file-name (mm-encode-coding-string
                           (nnheader-replace-chars-in-string group ?. ?/)

-                         nnheader-pathname-coding-system)
+                          nnheader-pathname-coding-system)

                          dir))))
    (cond ((null file) "")
         ((numberp file) (int-to-string file))
                          dir))))
    (cond ((null file) "")
         ((numberp file) (int-to-string file))


@@ -849,7 +849,7 @@ find-file-hooks, etc.
        (auto-mode-alist (mm-auto-mode-alist))
        (default-major-mode 'fundamental-mode)
        (enable-local-variables nil)
        (auto-mode-alist (mm-auto-mode-alist))
        (default-major-mode 'fundamental-mode)
        (enable-local-variables nil)

-        (after-insert-file-functions nil)
+       (after-insert-file-functions nil)

        (enable-local-eval nil)
        (find-file-hooks nil)
        (coding-system-for-read nnheader-file-coding-system))
        (enable-local-eval nil)
        (find-file-hooks nil)
        (coding-system-for-read nnheader-file-coding-system))

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 74d8e4e..b6d90ca 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -129,10 +129,10 @@ the syntax of this variable have been extended along the lines of:
 
 (setq nnimap-split-rule
       '((\"my1server\"    (\".*\"    ((\"ding\"    \"ding@gnus.org\")
 
 (setq nnimap-split-rule
       '((\"my1server\"    (\".*\"    ((\"ding\"    \"ding@gnus.org\")

-                                  (\"junk\"    \"From:.*Simon\")))
-        (\"my2server\"    (\"INBOX\" nnimap-split-fancy))
-        (\"my[34]server\" (\".*\"    ((\"private\" \"To:.*Simon\")
-                                  (\"junk\"    my-junk-func)))))
+                                 (\"junk\"    \"From:.*Simon\")))
+       (\"my2server\"    (\"INBOX\" nnimap-split-fancy))
+       (\"my[34]server\" (\".*\"    ((\"private\" \"To:.*Simon\")
+                                 (\"junk\"    my-junk-func)))))

 
 The virtual server name is in fact a regexp, so that the same rules
 may apply to several servers.  In the example, the servers
 
 The virtual server name is in fact a regexp, so that the same rules
 may apply to several servers.  In the example, the servers


@@ -315,8 +315,8 @@ For example: (setq nnimap-debug \"*nnimap-debug*\")")
 (defvar nnimap-callback-buffer nil
   "Which buffer the asynchronous article prefetch callback should work in.")
 (defvar nnimap-server-buffer-alist nil)        ;; Map server name to buffers.
 (defvar nnimap-callback-buffer nil
   "Which buffer the asynchronous article prefetch callback should work in.")
 (defvar nnimap-server-buffer-alist nil)        ;; Map server name to buffers.

-(defvar nnimap-current-server nil)     ;; Current server
-(defvar nnimap-server-buffer nil)      ;; Current servers' buffer
+(defvar nnimap-current-server nil) ;; Current server
+(defvar nnimap-server-buffer nil) ;; Current servers' buffer

 
 \f
 
 
 \f
 


@@ -342,13 +342,13 @@ If SERVER is nil, uses the current server."
         (new-uidvalidity (imap-mailbox-get 'uidvalidity))
         (old-uidvalidity (gnus-group-get-parameter gnusgroup 'uidvalidity))
         (dir (file-name-as-directory (expand-file-name nnimap-directory)))
         (new-uidvalidity (imap-mailbox-get 'uidvalidity))
         (old-uidvalidity (gnus-group-get-parameter gnusgroup 'uidvalidity))
         (dir (file-name-as-directory (expand-file-name nnimap-directory)))

-         (nameuid (nnheader-translate-file-chars
-                   (concat nnimap-nov-file-name
-                           (if (equal server "")
-                               "unnamed"
-                             server) "." group "." old-uidvalidity
-                             nnimap-nov-file-name-suffix) t))
-         (file (if (or nnmail-use-long-file-names
+        (nameuid (nnheader-translate-file-chars
+                  (concat nnimap-nov-file-name
+                          (if (equal server "")
+                              "unnamed"
+                            server) "." group "." old-uidvalidity
+                          nnimap-nov-file-name-suffix) t))
+        (file (if (or nnmail-use-long-file-names

                       (file-exists-p (expand-file-name nameuid dir)))
                   (expand-file-name nameuid dir)
                 (expand-file-name
                       (file-exists-p (expand-file-name nameuid dir)))
                   (expand-file-name nameuid dir)
                 (expand-file-name


@@ -386,7 +386,7 @@ If EXAMINE is non-nil the group is selected read-only."
                                    maxuid (if maxuid (max maxuid uid) uid)))
                            'UID))
        (list (imap-mailbox-get 'exists) minuid maxuid)))))
                                    maxuid (if maxuid (max maxuid uid) uid)))
                            'UID))
        (list (imap-mailbox-get 'exists) minuid maxuid)))))

-  
+

 (defun nnimap-possibly-change-group (group &optional server)
   "Make GROUP the current group, and SERVER the current server."
   (when (nnimap-possibly-change-server server)
 (defun nnimap-possibly-change-group (group &optional server)
   "Make GROUP the current group, and SERVER the current server."
   (when (nnimap-possibly-change-server server)


@@ -398,7 +398,7 @@ If EXAMINE is non-nil the group is selected read-only."
                     group (or server nnimap-current-server))
                    (zerop (imap-mailbox-get 'exists group))
                    t ;; for OGnus to see if ignoring uidvalidity
                     group (or server nnimap-current-server))
                    (zerop (imap-mailbox-get 'exists group))
                    t ;; for OGnus to see if ignoring uidvalidity

-                     ;; changes has any bad effects.
+                   ;; changes has any bad effects.

                    (yes-or-no-p
                     (format
                      "nnimap: Group %s is not uidvalid.  Continue? " group)))
                    (yes-or-no-p
                     (format
                      "nnimap: Group %s is not uidvalid.  Continue? " group)))


@@ -434,7 +434,7 @@ If EXAMINE is non-nil the group is selected read-only."
              mbx imap-current-mailbox
              headers (nnimap-demule
                       (if (imap-capability 'IMAP4rev1)
              mbx imap-current-mailbox
              headers (nnimap-demule
                       (if (imap-capability 'IMAP4rev1)

-                          ;; xxx don't just use car? alist doesn't contain
+                     ;; xxx don't just use car? alist doesn't contain

                           ;; anything else now, but it might...
                           (nth 2 (car (imap-message-get uid 'BODYDETAIL)))
                         (imap-message-get uid 'RFC822.HEADER)))
                           ;; anything else now, but it might...
                           (nth 2 (car (imap-message-get uid 'BODYDETAIL)))
                         (imap-message-get uid 'RFC822.HEADER)))


@@ -478,38 +478,38 @@ If EXAMINE is non-nil the group is selected read-only."
 (defun nnimap-group-overview-filename (group server)
   "Make pathname for GROUP on SERVER."
   (let* ((dir (file-name-as-directory (expand-file-name nnimap-directory)))
 (defun nnimap-group-overview-filename (group server)
   "Make pathname for GROUP on SERVER."
   (let* ((dir (file-name-as-directory (expand-file-name nnimap-directory)))

-         (uidvalidity (gnus-group-get-parameter
-                       (gnus-group-prefixed-name
-                        group (gnus-server-to-method
-                               (format "nnimap:%s" server)))
-                       'uidvalidity))
-         (name (nnheader-translate-file-chars
-                (concat nnimap-nov-file-name
-                        (if (equal server "")
-                            "unnamed"
-                          server) "." group nnimap-nov-file-name-suffix) t))
-         (nameuid (nnheader-translate-file-chars
-                   (concat nnimap-nov-file-name
-                           (if (equal server "")
-                               "unnamed"
-                             server) "." group "." uidvalidity
-                             nnimap-nov-file-name-suffix) t))
-         (oldfile (if (or nnmail-use-long-file-names
-                          (file-exists-p (expand-file-name name dir)))
-                      (expand-file-name name dir)
-                    (expand-file-name
-                     (mm-encode-coding-string
-                      (nnheader-replace-chars-in-string name ?. ?/)
-                      nnmail-pathname-coding-system)
-                     dir)))
-         (newfile (if (or nnmail-use-long-file-names
-                          (file-exists-p (expand-file-name nameuid dir)))
-                      (expand-file-name nameuid dir)
-                    (expand-file-name
-                     (mm-encode-coding-string
-                      (nnheader-replace-chars-in-string nameuid ?. ?/)
-                      nnmail-pathname-coding-system)
-                     dir))))
+        (uidvalidity (gnus-group-get-parameter
+                      (gnus-group-prefixed-name
+                       group (gnus-server-to-method
+                              (format "nnimap:%s" server)))
+                      'uidvalidity))
+        (name (nnheader-translate-file-chars
+               (concat nnimap-nov-file-name
+                       (if (equal server "")
+                           "unnamed"
+                         server) "." group nnimap-nov-file-name-suffix) t))
+        (nameuid (nnheader-translate-file-chars
+                  (concat nnimap-nov-file-name
+                          (if (equal server "")
+                              "unnamed"
+                            server) "." group "." uidvalidity
+                          nnimap-nov-file-name-suffix) t))
+        (oldfile (if (or nnmail-use-long-file-names
+                         (file-exists-p (expand-file-name name dir)))
+                     (expand-file-name name dir)
+                   (expand-file-name
+                    (mm-encode-coding-string
+                     (nnheader-replace-chars-in-string name ?. ?/)
+                     nnmail-pathname-coding-system)
+                    dir)))
+        (newfile (if (or nnmail-use-long-file-names
+                         (file-exists-p (expand-file-name nameuid dir)))
+                     (expand-file-name nameuid dir)
+                   (expand-file-name
+                    (mm-encode-coding-string
+                     (nnheader-replace-chars-in-string nameuid ?. ?/)
+                     nnmail-pathname-coding-system)
+                    dir))))

     (when (and (file-exists-p oldfile) (not (file-exists-p newfile)))
       (message "nnimap: Upgrading novcache filename...")
       (sit-for 1)
     (when (and (file-exists-p oldfile) (not (file-exists-p newfile)))
       (message "nnimap: Upgrading novcache filename...")
       (sit-for 1)


@@ -590,11 +590,11 @@ If EXAMINE is non-nil the group is selected read-only."
                    (nnimap-retrieve-headers-from-server
                     (cons (1+ (cdr cached)) high) group server))
                  (when nnimap-prune-cache
                    (nnimap-retrieve-headers-from-server
                     (cons (1+ (cdr cached)) high) group server))
                  (when nnimap-prune-cache

-                   ;; remove nov's for articles which has expired on server
+             ;; remove nov's for articles which has expired on server

                    (goto-char (point-min))
                    (dolist (uid (gnus-set-difference articles uids))
                    (goto-char (point-min))
                    (dolist (uid (gnus-set-difference articles uids))

-                      (when (re-search-forward (format "^%d\t" uid) nil t)
-                        (gnus-delete-line)))))
+                     (when (re-search-forward (format "^%d\t" uid) nil t)
+                       (gnus-delete-line)))))

              ;; nothing cached, fetch whole range from server
              (nnimap-retrieve-headers-from-server
               (cons low high) group server))
              ;; nothing cached, fetch whole range from server
              (nnimap-retrieve-headers-from-server
               (cons low high) group server))


@@ -617,9 +617,9 @@ If EXAMINE is non-nil the group is selected read-only."
           (port (if nnimap-server-port
                     (int-to-string nnimap-server-port)
                   "imap"))
           (port (if nnimap-server-port
                     (int-to-string nnimap-server-port)
                   "imap"))

-          (alist (gnus-netrc-machine list (or nnimap-server-address 
-                                               nnimap-address server)
-                                      port "imap"))
+          (alist (gnus-netrc-machine list (or nnimap-server-address
+                                              nnimap-address server)
+                                     port "imap"))

           (user (gnus-netrc-get alist "login"))
           (passwd (gnus-netrc-get alist "password")))
       (if (imap-authenticate user passwd nnimap-server-buffer)
           (user (gnus-netrc-get alist "login"))
           (passwd (gnus-netrc-get alist "password")))
       (if (imap-authenticate user passwd nnimap-server-buffer)


@@ -702,16 +702,16 @@ function is generally only called when Gnus is shutting down."
     (insert
      (with-current-buffer nnimap-server-buffer
        (nnimap-demule
     (insert
      (with-current-buffer nnimap-server-buffer
        (nnimap-demule

-        (if (imap-capability 'IMAP4rev1) 
-            ;; xxx don't just use car? alist doesn't contain
-            ;; anything else now, but it might...
-            (nth 2 (car (imap-message-get (imap-current-message) 'BODYDETAIL)))
-          (imap-message-get (imap-current-message) 'RFC822)))))
+       (if (imap-capability 'IMAP4rev1)
+           ;; xxx don't just use car? alist doesn't contain
+           ;; anything else now, but it might...
+           (nth 2 (car (imap-message-get (imap-current-message) 'BODYDETAIL)))
+         (imap-message-get (imap-current-message) 'RFC822)))))

     (nnheader-ms-strip-cr)
     (funcall nnimap-callback-callback-function t)))
 
 (defun nnimap-request-article-part (article part prop &optional
     (nnheader-ms-strip-cr)
     (funcall nnimap-callback-callback-function t)))
 
 (defun nnimap-request-article-part (article part prop &optional

-                                            group server to-buffer detail)
+                                           group server to-buffer detail)

   (when (nnimap-possibly-change-group group server)
     (let ((article (if (stringp article)
                       (car-safe (imap-search
   (when (nnimap-possibly-change-group group server)
     (let ((article (if (stringp article)
                       (car-safe (imap-search


@@ -723,12 +723,12 @@ function is generally only called when Gnus is shutting down."
        (if (not nnheader-callback-function)
            (with-current-buffer (or to-buffer nntp-server-buffer)
              (erase-buffer)
        (if (not nnheader-callback-function)
            (with-current-buffer (or to-buffer nntp-server-buffer)
              (erase-buffer)

-              (let ((data (imap-fetch article part prop nil
-                                      nnimap-server-buffer)))
-                (insert (nnimap-demule (if detail
-                                           (nth 2 (car data))
-                                         data))))
-              (nnheader-ms-strip-cr)
+             (let ((data (imap-fetch article part prop nil
+                                     nnimap-server-buffer)))
+               (insert (nnimap-demule (if detail
+                                          (nth 2 (car data))
+                                        data))))
+             (nnheader-ms-strip-cr)

              (gnus-message 10 "nnimap: Fetching (part of) article %d...done"
                            article)
              (if (bobp)
              (gnus-message 10 "nnimap: Fetching (part of) article %d...done"
                            article)
              (if (bobp)


@@ -825,9 +825,9 @@ function is generally only called when Gnus is shutting down."
              (let ((info (nnimap-find-minmax-uid mbx 'examine)))
                (when info
                  (with-current-buffer nntp-server-buffer
              (let ((info (nnimap-find-minmax-uid mbx 'examine)))
                (when info
                  (with-current-buffer nntp-server-buffer

-                   (insert (format "\"%s\" %d %d y\n"
-                                   mbx (or (nth 2 info) 0)
-                                   (max 1 (or (nth 1 info) 1)))))))))))
+                   (insert (format "\"%s\" %d %d y\n"
+                                   mbx (or (nth 2 info) 0)
+                                   (max 1 (or (nth 1 info) 1)))))))))))

     (gnus-message 5 "nnimap: Generating active list%s...done"
                  (if (> (length server) 0) (concat " for " server) ""))
     t))
     (gnus-message 5 "nnimap: Generating active list%s...done"
                  (if (> (length server) 0) (concat " for " server) ""))
     t))


@@ -835,8 +835,8 @@ function is generally only called when Gnus is shutting down."
 (deffoo nnimap-request-post (&optional server)
   (let ((success t))
     (dolist (mbx (message-unquote-tokens
 (deffoo nnimap-request-post (&optional server)
   (let ((success t))
     (dolist (mbx (message-unquote-tokens

-                  (message-tokenize-header
-                   (message-fetch-field "Newsgroups") ", ")) success)
+                 (message-tokenize-header
+                  (message-fetch-field "Newsgroups") ", ")) success)

       (let ((to-newsgroup (gnus-group-prefixed-name mbx gnus-command-method)))
        (or (gnus-active to-newsgroup)
            (gnus-activate-group to-newsgroup)
       (let ((to-newsgroup (gnus-group-prefixed-name mbx gnus-command-method)))
        (or (gnus-active to-newsgroup)
            (gnus-activate-group to-newsgroup)


@@ -872,11 +872,11 @@ function is generally only called when Gnus is shutting down."
 
 (deffoo nnimap-request-update-info-internal (group info &optional server)
   (when (nnimap-possibly-change-group group server)
 
 (deffoo nnimap-request-update-info-internal (group info &optional server)
   (when (nnimap-possibly-change-group group server)

-    (when info;; xxx what does this mean? should we create a info?
+    (when info ;; xxx what does this mean? should we create a info?

       (with-current-buffer nnimap-server-buffer
        (gnus-message 5 "nnimap: Updating info for %s..."
                      (gnus-info-group info))
       (with-current-buffer nnimap-server-buffer
        (gnus-message 5 "nnimap: Updating info for %s..."
                      (gnus-info-group info))

-       
+

        (when (nnimap-mark-permanent-p 'read)
          (let (seen unseen)
            ;; read info could contain articles marked unread by other
        (when (nnimap-mark-permanent-p 'read)
          (let (seen unseen)
            ;; read info could contain articles marked unread by other


@@ -890,8 +890,8 @@ function is generally only called when Gnus is shutting down."
                  ;; remove dupes
                  seen (sort seen '<)
                  seen (gnus-compress-sequence seen t)
                  ;; remove dupes
                  seen (sort seen '<)
                  seen (gnus-compress-sequence seen t)

-                 ;; we can't return '(1) since this isn't a "list of ranges",
-                 ;; and we can't return '((1)) since g-list-of-unread-articles
+         ;; we can't return '(1) since this isn't a "list of ranges",
+        ;; and we can't return '((1)) since g-list-of-unread-articles

                  ;; is buggy so we return '((1 . 1)).
                  seen (if (and (integerp (car seen))
                                (null (cdr seen)))
                  ;; is buggy so we return '((1 . 1)).
                  seen (if (and (integerp (car seen))
                                (null (cdr seen)))


@@ -914,10 +914,10 @@ function is generally only called when Gnus is shutting down."
                gnus-article-mark-lists)
 
        (when nnimap-importantize-dormant
                gnus-article-mark-lists)
 
        (when nnimap-importantize-dormant

-         ;; nnimap mark dormant article as ticked too (for other clients)
+      ;; nnimap mark dormant article as ticked too (for other clients)

          ;; so we remove that mark for gnus since we support dormant
          (gnus-info-set-marks
          ;; so we remove that mark for gnus since we support dormant
          (gnus-info-set-marks

-          info 
+          info

           (nnimap-update-alist-soft
            'tick
            (gnus-remove-from-range
           (nnimap-update-alist-soft
            'tick
            (gnus-remove-from-range


@@ -925,7 +925,7 @@ function is generally only called when Gnus is shutting down."
             (cdr-safe (assoc 'dormant (gnus-info-marks info))))
            (gnus-info-marks info))
           t))
             (cdr-safe (assoc 'dormant (gnus-info-marks info))))
            (gnus-info-marks info))
           t))

-       
+

        (gnus-message 5 "nnimap: Updating info for %s...done"
                      (gnus-info-group info))
 
        (gnus-message 5 "nnimap: Updating info for %s...done"
                      (gnus-info-group info))
 


@@ -1000,7 +1000,7 @@ function is generally only called when Gnus is shutting down."
                               (setq regrepp (string-match "\\\\[0-9&]" group))
                               (re-search-forward regexp nil t))
                           (funcall regexp group))
                               (setq regrepp (string-match "\\\\[0-9&]" group))
                               (re-search-forward regexp nil t))
                           (funcall regexp group))

-                        ;; Don't enter the article into the same group twice.
+                ;; Don't enter the article into the same group twice.

                         (not (assoc group to-groups)))
                (push (if regrepp
                          (nnmail-expand-newtext group)
                         (not (assoc group to-groups)))
                (push (if regrepp
                          (nnmail-expand-newtext group)


@@ -1008,7 +1008,7 @@ function is generally only called when Gnus is shutting down."
                      to-groups)
                (or nnimap-split-crosspost
                    (throw 'split-done to-groups))))))))))
                      to-groups)
                (or nnimap-split-crosspost
                    (throw 'split-done to-groups))))))))))

-  
+

 (defun nnimap-assoc-match (key alist)
   (let (element)
     (while (and alist (not element))
 (defun nnimap-assoc-match (key alist)
   (let (element)
     (while (and alist (not element))


@@ -1019,9 +1019,9 @@ function is generally only called when Gnus is shutting down."
 
 (defun nnimap-split-find-rule (server inbox)
   (if (and (listp nnimap-split-rule) (listp (car nnimap-split-rule))
 
 (defun nnimap-split-find-rule (server inbox)
   (if (and (listp nnimap-split-rule) (listp (car nnimap-split-rule))

-           (list (cdar nnimap-split-rule)) (listp (cadar nnimap-split-rule)))
+          (list (cdar nnimap-split-rule)) (listp (cadar nnimap-split-rule)))

       ;; extended format
       ;; extended format

-      (cadr (nnimap-assoc-match inbox (cdr (nnimap-assoc-match 
+      (cadr (nnimap-assoc-match inbox (cdr (nnimap-assoc-match

                                            server nnimap-split-rule))))
     nnimap-split-rule))
 
                                            server nnimap-split-rule))))
     nnimap-split-rule))
 


@@ -1036,7 +1036,7 @@ function is generally only called when Gnus is shutting down."
       (let (rule inbox removeorig (inboxes (nnimap-split-find-inbox server)))
        ;; iterate over inboxes
        (while (and (setq inbox (pop inboxes))
       (let (rule inbox removeorig (inboxes (nnimap-split-find-inbox server)))
        ;; iterate over inboxes
        (while (and (setq inbox (pop inboxes))

-                   (nnimap-possibly-change-group inbox));; SELECT
+                   (nnimap-possibly-change-group inbox)) ;; SELECT

          ;; find split rule for this server / inbox
          (when (setq rule (nnimap-split-find-rule server inbox))
            ;; iterate over articles
          ;; find split rule for this server / inbox
          (when (setq rule (nnimap-split-find-rule server inbox))
            ;; iterate over articles


@@ -1054,17 +1054,17 @@ function is generally only called when Gnus is shutting down."
                         (message "IMAP split moved %s:%s:%d to %s" server
                                  inbox article to-group)
                         (setq removeorig t)
                         (message "IMAP split moved %s:%s:%d to %s" server
                                  inbox article to-group)
                         (setq removeorig t)

-                        ;; Add the group-art list to the history list.
+                       ;; Add the group-art list to the history list.

                         (push (list (cons to-group 0)) nnmail-split-history))
                        (t
                         (message "IMAP split failed to move %s:%s:%d to %s"
                                  server inbox article to-group))))
                         (push (list (cons to-group 0)) nnmail-split-history))
                        (t
                         (message "IMAP split failed to move %s:%s:%d to %s"
                                  server inbox article to-group))))

-               ;; remove article if it was successfully copied somewhere
+            ;; remove article if it was successfully copied somewhere

                (and removeorig
                     (imap-message-flags-add (format "%d" article)
                                             "\\Seen \\Deleted")))))
                (and removeorig
                     (imap-message-flags-add (format "%d" article)
                                             "\\Seen \\Deleted")))))

-         (when (imap-mailbox-select inbox);; just in case
-           ;; todo: UID EXPUNGE (if available) to remove splitted articles
+         (when (imap-mailbox-select inbox) ;; just in case
+       ;; todo: UID EXPUNGE (if available) to remove splitted articles

            (imap-mailbox-expunge)
            (imap-mailbox-close)))
        t))))
            (imap-mailbox-expunge)
            (imap-mailbox-close)))
        t))))


@@ -1081,7 +1081,7 @@ function is generally only called when Gnus is shutting down."
       (nnimap-before-find-minmax-bugworkaround)
       (dolist (pattern (nnimap-pattern-to-list-arguments
                        nnimap-list-pattern))
       (nnimap-before-find-minmax-bugworkaround)
       (dolist (pattern (nnimap-pattern-to-list-arguments
                        nnimap-list-pattern))

-       (dolist (mbx (imap-mailbox-lsub "*" (car pattern) nil 
+       (dolist (mbx (imap-mailbox-lsub "*" (car pattern) nil

                                        nnimap-server-buffer))
          (or (catch 'found
                (dolist (mailbox (imap-mailbox-get 'list-flags mbx
                                        nnimap-server-buffer))
          (or (catch 'found
                (dolist (mailbox (imap-mailbox-get 'list-flags mbx


@@ -1091,13 +1091,13 @@ function is generally only called when Gnus is shutting down."
                nil)
              (let ((info (nnimap-find-minmax-uid mbx 'examine)))
                (when info
                nil)
              (let ((info (nnimap-find-minmax-uid mbx 'examine)))
                (when info

-                 (insert (format "\"%s\" %d %d y\n"
-                                 mbx (or (nth 2 info) 0)
-                                (max 1 (or (nth 1 info) 1)))))))))
+                 (insert (format "\"%s\" %d %d y\n"
+                                 mbx (or (nth 2 info) 0)
+                                 (max 1 (or (nth 1 info) 1)))))))))

       (gnus-message 5 "nnimap: Listing subscribed mailboxes%s%s...done"
                    (if (> (length server) 0) " on " "") server))
     t))
       (gnus-message 5 "nnimap: Listing subscribed mailboxes%s%s...done"
                    (if (> (length server) 0) " on " "") server))
     t))

-      
+

 (deffoo nnimap-request-create-group (group &optional server args)
   (when (nnimap-possibly-change-server server)
     (or (imap-mailbox-status group 'uidvalidity nnimap-server-buffer)
 (deffoo nnimap-request-create-group (group &optional server args)
   (when (nnimap-possibly-change-server server)
     (or (imap-mailbox-status group 'uidvalidity nnimap-server-buffer)


@@ -1195,13 +1195,13 @@ function is generally only called when Gnus is shutting down."
               result)
             (nnimap-request-expire-articles (list article) group server t))
        result))))
               result)
             (nnimap-request-expire-articles (list article) group server t))
        result))))

-  
+

 (deffoo nnimap-request-accept-article (group &optional server last)
   (when (nnimap-possibly-change-server server)
     (let (uid)
       (if (setq uid
                (if (string= nnimap-current-server nnimap-current-move-server)
 (deffoo nnimap-request-accept-article (group &optional server last)
   (when (nnimap-possibly-change-server server)
     (let (uid)
       (if (setq uid
                (if (string= nnimap-current-server nnimap-current-move-server)

-                   ;; moving article within same server, speed it up...
+                 ;; moving article within same server, speed it up...

                    (and (nnimap-possibly-change-group
                          nnimap-current-move-group)
                         (imap-message-copy (number-to-string
                    (and (nnimap-possibly-change-group
                          nnimap-current-move-group)
                         (imap-message-copy (number-to-string


@@ -1210,16 +1210,16 @@ function is generally only called when Gnus is shutting down."
                                            nnimap-server-buffer))
                  (with-current-buffer (current-buffer)
                    (goto-char (point-min))
                                            nnimap-server-buffer))
                  (with-current-buffer (current-buffer)
                    (goto-char (point-min))

-                   ;; remove any 'From blabla' lines, some IMAP servers
+                 ;; remove any 'From blabla' lines, some IMAP servers

                    ;; reject the entire message otherwise.
                    (when (looking-at "^From[^:]")
                      (kill-region (point) (progn (forward-line) (point))))
                    ;; turn into rfc822 format (\r\n eol's)
                    (while (search-forward "\n" nil t)
                      (replace-match "\r\n")))
                    ;; reject the entire message otherwise.
                    (when (looking-at "^From[^:]")
                      (kill-region (point) (progn (forward-line) (point))))
                    ;; turn into rfc822 format (\r\n eol's)
                    (while (search-forward "\n" nil t)
                      (replace-match "\r\n")))

-                  ;; this 'or' is for Cyrus server bug
-                  (or (null (imap-current-mailbox nnimap-server-buffer))
-                      (imap-mailbox-unselect nnimap-server-buffer))
+                 ;; this 'or' is for Cyrus server bug
+                 (or (null (imap-current-mailbox nnimap-server-buffer))
+                     (imap-mailbox-unselect nnimap-server-buffer))

                  (imap-message-append group (current-buffer) nil nil
                                       nnimap-server-buffer)))
          (cons group (nth 1 uid))
                  (imap-message-append group (current-buffer) nil nil
                                       nnimap-server-buffer)))
          (cons group (nth 1 uid))


@@ -1288,12 +1288,12 @@ function is generally only called when Gnus is shutting down."
   (mapcar
    (lambda (pair)                      ; cdr is the mark
      (or (assoc (cdr pair)
   (mapcar
    (lambda (pair)                      ; cdr is the mark
      (or (assoc (cdr pair)

-                '((read . "SEEN")
-                  (tick . "FLAGGED")
-                  (draft . "DRAFT")
-                  (reply . "ANSWERED")))
-         (cons (cdr pair)
-               (format "KEYWORD gnus-%s" (symbol-name (cdr pair))))))
+               '((read . "SEEN")
+                 (tick . "FLAGGED")
+                 (draft . "DRAFT")
+                 (reply . "ANSWERED")))
+        (cons (cdr pair)
+              (format "KEYWORD gnus-%s" (symbol-name (cdr pair))))))

    (cons '(read . read) gnus-article-mark-lists)))
 
 (defun nnimap-mark-to-predicate (pred)
    (cons '(read . read) gnus-article-mark-lists)))
 
 (defun nnimap-mark-to-predicate (pred)


@@ -1306,12 +1306,12 @@ to be used within a IMAP SEARCH query."
   (mapcar
    (lambda (pair)
      (or (assoc (cdr pair)
   (mapcar
    (lambda (pair)
      (or (assoc (cdr pair)

-                '((read . "\\Seen")
-                  (tick . "\\Flagged")
-                  (draft . "\\Draft")
-                  (reply . "\\Answered")))
-         (cons (cdr pair)
-               (format "gnus-%s" (symbol-name (cdr pair))))))
+               '((read . "\\Seen")
+                 (tick . "\\Flagged")
+                 (draft . "\\Draft")
+                 (reply . "\\Answered")))
+        (cons (cdr pair)
+              (format "gnus-%s" (symbol-name (cdr pair))))))

    (cons '(read . read) gnus-article-mark-lists)))
 
 (defun nnimap-mark-to-flag-1 (preds)
    (cons '(read . read) gnus-article-mark-lists)))
 
 (defun nnimap-mark-to-flag-1 (preds)


@@ -1352,7 +1352,7 @@ sure of changing the value of `foo'."
        (cdr alist)
       (setcdr alist (nnimap-remassoc key (cdr alist)))
       alist)))
        (cdr alist)
       (setcdr alist (nnimap-remassoc key (cdr alist)))
       alist)))

-  
+

 (defun nnimap-update-alist-soft (key value alist)
   (if value
       (cons (cons key value) (nnimap-remassoc key alist))
 (defun nnimap-update-alist-soft (key value alist)
   (if value
       (cons (cons key value) (nnimap-remassoc key alist))


@@ -1362,65 +1362,65 @@ sure of changing the value of `foo'."
   (require 'trace)
   (buffer-disable-undo (get-buffer-create nnimap-debug))
   (mapcar (lambda (f) (trace-function-background f nnimap-debug))
   (require 'trace)
   (buffer-disable-undo (get-buffer-create nnimap-debug))
   (mapcar (lambda (f) (trace-function-background f nnimap-debug))

-        '(
-         nnimap-possibly-change-server
-         nnimap-verify-uidvalidity
-         nnimap-find-minmax-uid
-         nnimap-before-find-minmax-bugworkaround
-         nnimap-possibly-change-group
-         ;;nnimap-replace-whitespace
-         nnimap-retrieve-headers-progress
-         nnimap-retrieve-which-headers
-         nnimap-group-overview-filename
-         nnimap-retrieve-headers-from-file
-         nnimap-retrieve-headers-from-server
-         nnimap-retrieve-headers
-         nnimap-open-connection
-         nnimap-open-server
-         nnimap-server-opened
-         nnimap-close-server
-         nnimap-request-close
-         nnimap-status-message
-         ;;nnimap-demule
-         nnimap-request-article-part
-         nnimap-request-article
-         nnimap-request-head
-         nnimap-request-body
-         nnimap-request-group
-         nnimap-close-group
-         nnimap-pattern-to-list-arguments
-         nnimap-request-list
-         nnimap-request-post
-         nnimap-retrieve-groups
-         nnimap-request-update-info-internal
-         nnimap-request-type
-         nnimap-request-set-mark
-         nnimap-split-to-groups
-         nnimap-split-find-rule
-         nnimap-split-find-inbox
-         nnimap-split-articles
-         nnimap-request-scan
-         nnimap-request-newgroups
-         nnimap-request-create-group
-         nnimap-time-substract
-         nnimap-date-days-ago
-         nnimap-request-expire-articles-progress
-         nnimap-request-expire-articles
-         nnimap-request-move-article
-         nnimap-request-accept-article
-         nnimap-request-delete-group
-         nnimap-request-rename-group
-         gnus-group-nnimap-expunge
-         gnus-group-nnimap-edit-acl
-         gnus-group-nnimap-edit-acl-done
-         nnimap-group-mode-hook
-         nnimap-mark-to-predicate
-         nnimap-mark-to-flag-1
-         nnimap-mark-to-flag
-         nnimap-mark-permanent-p
-         nnimap-remassoc
-         nnimap-update-alist-soft
-          )))
+         '(
+           nnimap-possibly-change-server
+           nnimap-verify-uidvalidity
+           nnimap-find-minmax-uid
+           nnimap-before-find-minmax-bugworkaround
+           nnimap-possibly-change-group
+           ;;nnimap-replace-whitespace
+           nnimap-retrieve-headers-progress
+           nnimap-retrieve-which-headers
+           nnimap-group-overview-filename
+           nnimap-retrieve-headers-from-file
+           nnimap-retrieve-headers-from-server
+           nnimap-retrieve-headers
+           nnimap-open-connection
+           nnimap-open-server
+           nnimap-server-opened
+           nnimap-close-server
+           nnimap-request-close
+           nnimap-status-message
+           ;;nnimap-demule
+           nnimap-request-article-part
+           nnimap-request-article
+           nnimap-request-head
+           nnimap-request-body
+           nnimap-request-group
+           nnimap-close-group
+           nnimap-pattern-to-list-arguments
+           nnimap-request-list
+           nnimap-request-post
+           nnimap-retrieve-groups
+           nnimap-request-update-info-internal
+           nnimap-request-type
+           nnimap-request-set-mark
+           nnimap-split-to-groups
+           nnimap-split-find-rule
+           nnimap-split-find-inbox
+           nnimap-split-articles
+           nnimap-request-scan
+           nnimap-request-newgroups
+           nnimap-request-create-group
+           nnimap-time-substract
+           nnimap-date-days-ago
+           nnimap-request-expire-articles-progress
+           nnimap-request-expire-articles
+           nnimap-request-move-article
+           nnimap-request-accept-article
+           nnimap-request-delete-group
+           nnimap-request-rename-group
+           gnus-group-nnimap-expunge
+           gnus-group-nnimap-edit-acl
+           gnus-group-nnimap-edit-acl-done
+           nnimap-group-mode-hook
+           nnimap-mark-to-predicate
+           nnimap-mark-to-flag-1
+           nnimap-mark-to-flag
+           nnimap-mark-permanent-p
+           nnimap-remassoc
+           nnimap-update-alist-soft
+           )))

 
 (provide 'nnimap)
 
 
 (provide 'nnimap)
 

diff --git a/lisp/nnkiboze.el b/lisp/nnkiboze.el
index 1ad6f8c..0da7857 100644 (file)
--- a/lisp/nnkiboze.el
+++ b/lisp/nnkiboze.el
@@ -149,7 +149,7 @@
             nnkiboze-remove-read-articles)
     (let ((coding-system-for-write nnkiboze-file-coding-system))
       (with-temp-file (nnkiboze-nov-file-name)
             nnkiboze-remove-read-articles)
     (let ((coding-system-for-write nnkiboze-file-coding-system))
       (with-temp-file (nnkiboze-nov-file-name)

-       (let ((cur (current-buffer)) 
+       (let ((cur (current-buffer))

              (nnheader-file-coding-system nnkiboze-file-coding-system))
          (nnheader-insert-file-contents (nnkiboze-nov-file-name))
          (goto-char (point-min))
              (nnheader-file-coding-system nnkiboze-file-coding-system))
          (nnheader-insert-file-contents (nnkiboze-nov-file-name))
          (goto-char (point-min))


@@ -227,11 +227,11 @@ Finds out what articles are to be part of the nnkiboze groups."
 (defun nnkiboze-generate-group (group &optional inhibit-list-groups)
   (let* ((info (nth 2 (gnus-gethash group gnus-newsrc-hashtb)))
         (newsrc-file (concat nnkiboze-directory
 (defun nnkiboze-generate-group (group &optional inhibit-list-groups)
   (let* ((info (nth 2 (gnus-gethash group gnus-newsrc-hashtb)))
         (newsrc-file (concat nnkiboze-directory

-                              (nnheader-translate-file-chars
-                               (concat group ".newsrc"))))
+                             (nnheader-translate-file-chars
+                              (concat group ".newsrc"))))

         (nov-file (concat nnkiboze-directory
         (nov-file (concat nnkiboze-directory

-                           (nnheader-translate-file-chars
-                            (concat group ".nov"))))
+                          (nnheader-translate-file-chars
+                           (concat group ".nov"))))

         method nnkiboze-newsrc gname newsrc active
         ginfo lowest glevel orig-info nov-buffer
         ;; Bind various things to nil to make group entry faster.
         method nnkiboze-newsrc gname newsrc active
         ginfo lowest glevel orig-info nov-buffer
         ;; Bind various things to nil to make group entry faster.


@@ -242,7 +242,7 @@ Finds out what articles are to be part of the nnkiboze groups."
         (gnus-score-use-all-scores nil)
         (gnus-use-scoring t)
         (gnus-verbose (min gnus-verbose 3))
         (gnus-score-use-all-scores nil)
         (gnus-use-scoring t)
         (gnus-verbose (min gnus-verbose 3))

-        gnus-select-group-hook gnus-summary-prepare-hook
+        gnus-select-group-hook gnus-summary-prepare-hook

         gnus-thread-sort-functions gnus-show-threads
         gnus-visual gnus-suppress-duplicates num-unread)
     (unless info
         gnus-thread-sort-functions gnus-show-threads
         gnus-visual gnus-suppress-duplicates num-unread)
     (unless info


@@ -255,31 +255,31 @@ Finds out what articles are to be part of the nnkiboze groups."
        (when (file-exists-p nov-file)
          (insert-file-contents nov-file))
        (setq nov-buffer (current-buffer))
        (when (file-exists-p nov-file)
          (insert-file-contents nov-file))
        (setq nov-buffer (current-buffer))

-       ;; Go through the active hashtb and add new all groups that match the
+ ;; Go through the active hashtb and add new all groups that match the

        ;; kiboze regexp.
        (mapatoms
         (lambda (group)
           (and (string-match nnkiboze-regexp
        ;; kiboze regexp.
        (mapatoms
         (lambda (group)
           (and (string-match nnkiboze-regexp

-                             (setq gname (symbol-name group))) ; Match
+                             (setq gname (symbol-name group))) ; Match

                (not (assoc gname nnkiboze-newsrc)) ; It isn't registered
                (numberp (car (symbol-value group))) ; It is active
                (or (> nnkiboze-level 7)
                    (and (setq glevel (nth 1 (nth 2 (gnus-gethash
                                                     gname gnus-newsrc-hashtb))))
                         (>= nnkiboze-level glevel)))
                (not (assoc gname nnkiboze-newsrc)) ; It isn't registered
                (numberp (car (symbol-value group))) ; It is active
                (or (> nnkiboze-level 7)
                    (and (setq glevel (nth 1 (nth 2 (gnus-gethash
                                                     gname gnus-newsrc-hashtb))))
                         (>= nnkiboze-level glevel)))

-               (not (string-match "^nnkiboze:" gname)) ; Exclude kibozes
+               (not (string-match "^nnkiboze:" gname)) ; Exclude kibozes

                (push (cons gname (1- (car (symbol-value group))))
                      nnkiboze-newsrc)))
         gnus-active-hashtb)
        ;; `newsrc' is set to the list of groups that possibly are
                (push (cons gname (1- (car (symbol-value group))))
                      nnkiboze-newsrc)))
         gnus-active-hashtb)
        ;; `newsrc' is set to the list of groups that possibly are

-       ;; component groups to this kiboze group.  This list has elements
+     ;; component groups to this kiboze group.  This list has elements

        ;; on the form `(GROUP . NUMBER)', where NUMBER is the highest
        ;; number that has been kibozed in GROUP in this kiboze group.
        (setq newsrc nnkiboze-newsrc)
        (while newsrc
          (if (not (setq active (gnus-gethash
                                 (caar newsrc) gnus-active-hashtb)))
        ;; on the form `(GROUP . NUMBER)', where NUMBER is the highest
        ;; number that has been kibozed in GROUP in this kiboze group.
        (setq newsrc nnkiboze-newsrc)
        (while newsrc
          (if (not (setq active (gnus-gethash
                                 (caar newsrc) gnus-active-hashtb)))

-             ;; This group isn't active after all, so we remove it from
+           ;; This group isn't active after all, so we remove it from

              ;; the list of component groups.
              (setq nnkiboze-newsrc (delq (car newsrc) nnkiboze-newsrc))
            (setq lowest (cdar newsrc))
              ;; the list of component groups.
              (setq nnkiboze-newsrc (delq (car newsrc) nnkiboze-newsrc))
            (setq lowest (cdar newsrc))


@@ -293,13 +293,13 @@ Finds out what articles are to be part of the nnkiboze groups."
                                                gnus-newsrc-hashtb)))
            (unwind-protect
                (progn
                                                gnus-newsrc-hashtb)))
            (unwind-protect
                (progn

-                 ;; We set all list of article marks to nil.  Since we operate
-                 ;; on copies of the real lists, we can destroy anything we
+        ;; We set all list of article marks to nil.  Since we operate
+           ;; on copies of the real lists, we can destroy anything we

                  ;; want here.
                  (when (nth 3 ginfo)
                    (setcar (nthcdr 3 ginfo) nil))
                  ;; want here.
                  (when (nth 3 ginfo)
                    (setcar (nthcdr 3 ginfo) nil))

-                 ;; We set the list of read articles to be what we expect for
-                 ;; this kiboze group -- either nil or `(1 . LOWEST)'.
+         ;; We set the list of read articles to be what we expect for
+                ;; this kiboze group -- either nil or `(1 . LOWEST)'.

                  (when ginfo
                    (setcar (nthcdr 2 ginfo)
                            (and (not (= lowest 1)) (cons 1 lowest))))
                  (when ginfo
                    (setcar (nthcdr 2 ginfo)
                            (and (not (= lowest 1)) (cons 1 lowest))))


@@ -319,7 +319,7 @@ Finds out what articles are to be part of the nnkiboze groups."
                    ;; We go through the list of scored articles.
                    (while gnus-newsgroup-scored
                      (when (> (caar gnus-newsgroup-scored) lowest)
                    ;; We go through the list of scored articles.
                    (while gnus-newsgroup-scored
                      (when (> (caar gnus-newsgroup-scored) lowest)

-                       ;; If it has a good score, then we enter this article
+                ;; If it has a good score, then we enter this article

                        ;; into the kiboze group.
                        (nnkiboze-enter-nov
                         nov-buffer
                        ;; into the kiboze group.
                        (nnkiboze-enter-nov
                         nov-buffer

diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index f9458e3..0bc2be6 100644 (file)
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -86,8 +86,8 @@ else, you could do something like this:
 
  (setq nnmail-split-methods
        '((\"mail.4ad\" \"From:.*4ad\")
 
  (setq nnmail-split-methods
        '((\"mail.4ad\" \"From:.*4ad\")

-         (\"mail.junk\" \"From:.*Lars\\\\|Subject:.*buy\")
-         (\"mail.misc\" \"\")))
+        (\"mail.junk\" \"From:.*Lars\\\\|Subject:.*buy\")
+        (\"mail.misc\" \"\")))

 
 As you can see, this variable is a list of lists, where the first
 element in each \"rule\" is the name of the group (which, by the way,
 
 As you can see, this variable is a list of lists, where the first
 element in each \"rule\" is the name of the group (which, by the way,


@@ -159,8 +159,8 @@ Eg.:
 
 \(setq nnmail-expiry-wait-function
       (lambda (newsgroup)
 
 \(setq nnmail-expiry-wait-function
       (lambda (newsgroup)

-        (cond ((string-match \"private\" newsgroup) 31)
-              ((string-match \"junk\" newsgroup) 1)
+       (cond ((string-match \"private\" newsgroup) 31)
+             ((string-match \"junk\" newsgroup) 1)

              ((string-match \"important\" newsgroup) 'never)
              (t 7))))"
   :group 'nnmail-expire
              ((string-match \"important\" newsgroup) 'never)
              (t 7))))"
   :group 'nnmail-expire


@@ -176,10 +176,10 @@ called in a buffer narrowed to the message in question.  The function
 receives one argument, the name of the group the message comes from.
 The return value should be `delete' or a group name (a string)."
   :version "21.1"
 receives one argument, the name of the group the message comes from.
 The return value should be `delete' or a group name (a string)."
   :version "21.1"

-    :group 'nnmail-expire
-    :type '(choice (const delete)
-                  (function :format "%v" nnmail-)
-                  string))
+  :group 'nnmail-expire
+  :type '(choice (const delete)
+                (function :format "%v" nnmail-)
+                string))

 
 (defcustom nnmail-cache-accepted-message-ids nil
   "If non-nil, put Message-IDs of Gcc'd articles into the duplicate cache.
 
 (defcustom nnmail-cache-accepted-message-ids nil
   "If non-nil, put Message-IDs of Gcc'd articles into the duplicate cache.


@@ -238,9 +238,9 @@ running (\"xwatch\", etc.)
 Eg.
 
 \(add-hook 'nnmail-read-incoming-hook
 Eg.
 
 \(add-hook 'nnmail-read-incoming-hook

-          (lambda ()
-            (call-process \"/local/bin/mailsend\" nil nil nil
-                          \"read\" nnmail-spool-file)))
+         (lambda ()
+           (call-process \"/local/bin/mailsend\" nil nil nil
+                         \"read\" nnmail-spool-file)))

 
 If you have xwatch running, this will alert it that mail has been
 read.
 
 If you have xwatch running, this will alert it that mail has been
 read.


@@ -364,13 +364,13 @@ Example:
             ;; Other mailing lists...
             (any \"procmail@informatik\\\\.rwth-aachen\\\\.de\" \"procmail.list\")
             (any \"SmartList@informatik\\\\.rwth-aachen\\\\.de\" \"SmartList.list\")
             ;; Other mailing lists...
             (any \"procmail@informatik\\\\.rwth-aachen\\\\.de\" \"procmail.list\")
             (any \"SmartList@informatik\\\\.rwth-aachen\\\\.de\" \"SmartList.list\")

-             ;; Both lists below have the same suffix, so prevent
-             ;; cross-posting to mkpkg.list of messages posted only to
-             ;; the bugs- list, but allow cross-posting when the
-             ;; message was really cross-posted.
-             (any \"bugs-mypackage@somewhere\" \"mypkg.bugs\")
-             (any \"mypackage@somewhere\" - \"bugs-mypackage\" \"mypkg.list\")
-             ;;
+            ;; Both lists below have the same suffix, so prevent
+            ;; cross-posting to mkpkg.list of messages posted only to
+            ;; the bugs- list, but allow cross-posting when the
+            ;; message was really cross-posted.
+            (any \"bugs-mypackage@somewhere\" \"mypkg.bugs\")
+            (any \"mypackage@somewhere\" - \"bugs-mypackage\" \"mypkg.list\")
+            ;;

             ;; People...
             (any \"larsi@ifi\\\\.uio\\\\.no\" \"people.Lars Magne Ingebrigtsen\"))
          ;; Unmatched mail goes to the catch all group.
             ;; People...
             (any \"larsi@ifi\\\\.uio\\\\.no\" \"people.Lars Magne Ingebrigtsen\"))
          ;; Unmatched mail goes to the catch all group.


@@ -478,7 +478,7 @@ parameter.  It should return nil, `warn' or `delete'."
   (set-buffer nntp-server-buffer)
   (delete-region (point-min) (point-max))
   (let ((format-alist nil)
   (set-buffer nntp-server-buffer)
   (delete-region (point-min) (point-max))
   (let ((format-alist nil)

-        (after-insert-file-functions nil))
+       (after-insert-file-functions nil))

     (condition-case ()
        (let ((coding-system-for-read nnmail-file-coding-system)
              (auto-mode-alist (mm-auto-mode-alist))
     (condition-case ()
        (let ((coding-system-for-read nnmail-file-coding-system)
              (auto-mode-alist (mm-auto-mode-alist))


@@ -729,8 +729,8 @@ If SOURCE is a directory spec, try to return the group name component."
         start
         (if (search-forward "\n\n" nil t)
             (1- (point))
         start
         (if (search-forward "\n\n" nil t)
             (1- (point))

-          ;; This will never happen, but just to be on the safe side --
-          ;; if there is no head-body delimiter, we search a bit manually.
+        ;; This will never happen, but just to be on the safe side --
+      ;; if there is no head-body delimiter, we search a bit manually.

           (while (and (looking-at "From \\|[^ \t]+:")
                       (not (eobp)))
             (forward-line 1))
           (while (and (looking-at "From \\|[^ \t]+:")
                       (not (eobp)))
             (forward-line 1))


@@ -762,12 +762,12 @@ If SOURCE is a directory spec, try to return the group name component."
        (goto-char (point-max))
        (widen)
        (setq head-end (point))
        (goto-char (point-max))
        (widen)
        (setq head-end (point))

-       ;; We try the Content-Length value.  The idea: skip over the header
-       ;; separator, then check what happens content-length bytes into the
-       ;; message body.  This should be either the end ot the buffer, the
-       ;; message separator or a blank line followed by the separator.
-       ;; The blank line should probably be deleted.  If neither of the
-       ;; three is met, the content-length header is probably invalid.
+   ;; We try the Content-Length value.  The idea: skip over the header
+   ;; separator, then check what happens content-length bytes into the
+    ;; message body.  This should be either the end ot the buffer, the
+       ;; message separator or a blank line followed by the separator.
+      ;; The blank line should probably be deleted.  If neither of the
+       ;; three is met, the content-length header is probably invalid.

        (when content-length
          (forward-line 1)
          (setq skip (+ (point) content-length))
        (when content-length
          (forward-line 1)
          (setq skip (+ (point) content-length))


@@ -816,8 +816,8 @@ If SOURCE is a directory spec, try to return the group name component."
         start
         (if (search-forward "\n\n" nil t)
             (1- (point))
         start
         (if (search-forward "\n\n" nil t)
             (1- (point))

-          ;; This will never happen, but just to be on the safe side --
-          ;; if there is no head-body delimiter, we search a bit manually.
+        ;; This will never happen, but just to be on the safe side --
+      ;; if there is no head-body delimiter, we search a bit manually.

           (while (and (looking-at "From \\|[^ \t]+:")
                       (not (eobp)))
             (forward-line 1))
           (while (and (looking-at "From \\|[^ \t]+:")
                       (not (eobp)))
             (forward-line 1))


@@ -863,7 +863,7 @@ If SOURCE is a directory spec, try to return the group name component."
      (if (search-forward "\n\n" nil t)
         (1- (point))
        ;; This will never happen, but just to be on the safe side --
      (if (search-forward "\n\n" nil t)
         (1- (point))
        ;; This will never happen, but just to be on the safe side --

-       ;; if there is no head-body delimiter, we search a bit manually.
+      ;; if there is no head-body delimiter, we search a bit manually.

        (while (and (looking-at "From \\|[^ \t]+:")
                   (not (eobp)))
         (forward-line 1))
        (while (and (looking-at "From \\|[^ \t]+:")
                   (not (eobp)))
         (forward-line 1))


@@ -891,7 +891,7 @@ If SOURCE is a directory spec, try to return the group name component."
                                       group artnum-func)
   "Go through the entire INCOMING file and pick out each individual mail.
 FUNC will be called with the buffer narrowed to each mail."
                                       group artnum-func)
   "Go through the entire INCOMING file and pick out each individual mail.
 FUNC will be called with the buffer narrowed to each mail."

-  (let (;; If this is a group-specific split, we bind the split
+  (let ( ;; If this is a group-specific split, we bind the split

        ;; methods to just this group.
        (nnmail-split-methods (if (and group
                                       (not nnmail-resplit-incoming))
        ;; methods to just this group.
        (nnmail-split-methods (if (and group
                                       (not nnmail-resplit-incoming))


@@ -1095,19 +1095,19 @@ Return the number of characters in the body."
 
 (defun nnmail-remove-list-identifiers ()
   "Remove list identifiers from Subject headers."
 
 (defun nnmail-remove-list-identifiers ()
   "Remove list identifiers from Subject headers."

-  (let ((regexp 
-        (if (consp nnmail-list-identifiers) 
+  (let ((regexp
+        (if (consp nnmail-list-identifiers)

             (mapconcat 'identity nnmail-list-identifiers " *\\|")
           nnmail-list-identifiers)))
     (when regexp
       (goto-char (point-min))
       (while (re-search-forward
             (mapconcat 'identity nnmail-list-identifiers " *\\|")
           nnmail-list-identifiers)))
     (when regexp
       (goto-char (point-min))
       (while (re-search-forward

-              (concat "^Subject: +\\(R[Ee]: +\\)*\\(" regexp " *\\)")
-              nil t)
-        (delete-region (match-beginning 2) (match-end 0))
-        (beginning-of-line))
+             (concat "^Subject: +\\(R[Ee]: +\\)*\\(" regexp " *\\)")
+             nil t)
+       (delete-region (match-beginning 2) (match-end 0))
+       (beginning-of-line))

       (when (re-search-forward "^Subject: +\\(\\(R[Ee]: +\\)+\\)R[Ee]: +" nil t)
       (when (re-search-forward "^Subject: +\\(\\(R[Ee]: +\\)+\\)R[Ee]: +" nil t)

-        (delete-region (match-beginning 1) (match-end 1))
+       (delete-region (match-beginning 1) (match-end 1))

        (beginning-of-line)))))
 
 (defun nnmail-remove-tabs ()
        (beginning-of-line)))))
 
 (defun nnmail-remove-tabs ()


@@ -1137,8 +1137,8 @@ Calls ACCEPT-FUNC (which should be `nnchoke-request-accept-article')
 to actually put the message in the right group."
   (let ((success t))
     (dolist (mbx (message-unquote-tokens
 to actually put the message in the right group."
   (let ((success t))
     (dolist (mbx (message-unquote-tokens

-                  (message-tokenize-header
-                   (message-fetch-field "Newsgroups") ", ")) success)
+                 (message-tokenize-header
+                  (message-fetch-field "Newsgroups") ", ")) success)

       (let ((to-newsgroup (gnus-group-prefixed-name mbx gnus-command-method)))
        (or (gnus-active to-newsgroup)
            (gnus-activate-group to-newsgroup)
       (let ((to-newsgroup (gnus-group-prefixed-name mbx gnus-command-method)))
        (or (gnus-active to-newsgroup)
            (gnus-activate-group to-newsgroup)


@@ -1219,9 +1219,9 @@ See the documentation for the variable `nnmail-split-fancy' for documentation."
            (push (cdr cached-pair) nnmail-split-trace))
          (let ((split-rest (cddr split))
                (end (match-end 0))
            (push (cdr cached-pair) nnmail-split-trace))
          (let ((split-rest (cddr split))
                (end (match-end 0))

-               ;; The searched regexp is \(\(FIELD\).*\)\(VALUE\).  So,
+             ;; The searched regexp is \(\(FIELD\).*\)\(VALUE\).  So,

                ;; start-of-value is the the point just before the
                ;; start-of-value is the the point just before the

-               ;; beginning of the value, whereas after-header-name is
+              ;; beginning of the value, whereas after-header-name is

                ;; the point just after the field name.
                (start-of-value (match-end 1))
                (after-header-name (match-end 2)))
                ;; the point just after the field name.
                (start-of-value (match-end 1))
                (after-header-name (match-end 2)))


@@ -1246,7 +1246,7 @@ See the documentation for the variable `nnmail-split-fancy' for documentation."
              (let ((value (nth 1 split)))
                (if (symbolp value)
                    (setq value (cdr (assq value nnmail-split-abbrev-alist))))
              (let ((value (nth 1 split)))
                (if (symbolp value)
                    (setq value (cdr (assq value nnmail-split-abbrev-alist))))

-               ;; Someone might want to do a \N sub on this match, so get the
+       ;; Someone might want to do a \N sub on this match, so get the

                ;; correct match positions.
                (re-search-backward value start-of-value))
              (dolist (sp (nnmail-split-it (car split-rest)))
                ;; correct match positions.
                (re-search-backward value start-of-value))
              (dolist (sp (nnmail-split-it (car split-rest)))


@@ -1283,7 +1283,7 @@ See the documentation for the variable `nnmail-split-fancy' for documentation."
                             (or partial-rear "\\>")))
        (push (cons split regexp) nnmail-split-cache)
        ;; Now that it's in the cache, just call nnmail-split-it again
                             (or partial-rear "\\>")))
        (push (cons split regexp) nnmail-split-cache)
        ;; Now that it's in the cache, just call nnmail-split-it again

-       ;; on the same split, which will find it immediately in the cache.
+    ;; on the same split, which will find it immediately in the cache.

        (nnmail-split-it split))))))
 
 (defun nnmail-expand-newtext (newtext)
        (nnmail-split-it split))))))
 
 (defun nnmail-expand-newtext (newtext)


@@ -1412,34 +1412,34 @@ See the documentation for the variable `nnmail-split-fancy' for documentation."
     ;; length of the list is equal to 1? -- kai
     (let ((g nil))
       (cond ((and (boundp 'group) group)
     ;; length of the list is equal to 1? -- kai
     (let ((g nil))
       (cond ((and (boundp 'group) group)

-             (setq g group))
-            ((and (boundp 'group-art-list) group-art-list
-                  (listp group-art-list))
-             (setq g (caar group-art-list)))
-            ((and (boundp 'group-art) group-art (listp group-art))
-             (setq g (caar group-art)))
-            (t (setq g "")))
+            (setq g group))
+           ((and (boundp 'group-art-list) group-art-list
+                 (listp group-art-list))
+            (setq g (caar group-art-list)))
+           ((and (boundp 'group-art) group-art (listp group-art))
+            (setq g (caar group-art)))
+           (t (setq g "")))

       (unless (gnus-buffer-live-p nnmail-cache-buffer)
       (unless (gnus-buffer-live-p nnmail-cache-buffer)

-        (nnmail-cache-open))
+       (nnmail-cache-open))

       (save-excursion
       (save-excursion

-        (set-buffer nnmail-cache-buffer)
-        (goto-char (point-max))
-        (if (and g (not (string= "" g))
-                 (gnus-methods-equal-p gnus-command-method
-                                       (nnmail-cache-primary-mail-backend)))
-            (insert id "\t" g "\n")
-          (insert id "\n"))))))
+       (set-buffer nnmail-cache-buffer)
+       (goto-char (point-max))
+       (if (and g (not (string= "" g))
+                (gnus-methods-equal-p gnus-command-method
+                                      (nnmail-cache-primary-mail-backend)))
+           (insert id "\t" g "\n")
+         (insert id "\n"))))))

 
 (defun nnmail-cache-primary-mail-backend ()
   (let ((be-list (cons gnus-select-method gnus-secondary-select-methods))
 
 (defun nnmail-cache-primary-mail-backend ()
   (let ((be-list (cons gnus-select-method gnus-secondary-select-methods))

-        (be nil)
-        (res nil))
+       (be nil)
+       (res nil))

     (while (and (null res) be-list)
       (setq be (car be-list))
       (setq be-list (cdr be-list))
       (when (and (gnus-method-option-p be 'respool)
     (while (and (null res) be-list)
       (setq be (car be-list))
       (setq be-list (cdr be-list))
       (when (and (gnus-method-option-p be 'respool)

-                 (eval (intern (format "%s-get-new-mail" (car be)))))
-        (setq res be)))
+                (eval (intern (format "%s-get-new-mail" (car be)))))
+       (setq res be)))

     res))
 
 ;; Fetch the group name corresponding to the message id stored in the
     res))
 
 ;; Fetch the group name corresponding to the message id stored in the


@@ -1450,12 +1450,12 @@ See the documentation for the variable `nnmail-split-fancy' for documentation."
       (set-buffer nnmail-cache-buffer)
       (goto-char (point-max))
       (when (search-backward id nil t)
       (set-buffer nnmail-cache-buffer)
       (goto-char (point-max))
       (when (search-backward id nil t)

-        (beginning-of-line)
-        (skip-chars-forward "^\n\r\t")
-        (unless (eolp)
-          (forward-char 1)
-          (buffer-substring (point)
-                            (progn (end-of-line) (point))))))))
+       (beginning-of-line)
+       (skip-chars-forward "^\n\r\t")
+       (unless (eolp)
+         (forward-char 1)
+         (buffer-substring (point)
+                           (progn (end-of-line) (point))))))))

 
 ;; Function for nnmail-split-fancy: look up all references in the
 ;; cache and if a match is found, return that group.
 
 ;; Function for nnmail-split-fancy: look up all references in the
 ;; cache and if a match is found, return that group.


@@ -1470,18 +1470,18 @@ see which group that message was put in.  This group is returned.
 
 See the Info node `(gnus)Fancy Mail Splitting' for more details."
   (let* ((refstr (or (message-fetch-field "references")
 
 See the Info node `(gnus)Fancy Mail Splitting' for more details."
   (let* ((refstr (or (message-fetch-field "references")

-                     (message-fetch-field "in-reply-to")))
-         (references nil)
-         (res nil))
+                    (message-fetch-field "in-reply-to")))
+        (references nil)
+        (res nil))

     (when refstr
       (setq references (nreverse (gnus-split-references refstr)))
       (unless (gnus-buffer-live-p nnmail-cache-buffer)
     (when refstr
       (setq references (nreverse (gnus-split-references refstr)))
       (unless (gnus-buffer-live-p nnmail-cache-buffer)

-        (nnmail-cache-open))
+       (nnmail-cache-open))

       (mapcar (lambda (x)
       (mapcar (lambda (x)

-                (setq res (or (nnmail-cache-fetch-group x) res))
-                (when (string= "drafts" res)
-                  (setq res nil)))
-              references)
+               (setq res (or (nnmail-cache-fetch-group x) res))
+               (when (string= "drafts" res)
+                 (setq res nil)))
+             references)

       res)))
 
 (defun nnmail-cache-id-exists-p (id)
       res)))
 
 (defun nnmail-cache-id-exists-p (id)


@@ -1582,7 +1582,7 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
         ((eq source 'procmail)
          (message "Invalid value for nnmail-spool-file: `procmail'")
          nil))
         ((eq source 'procmail)
          (message "Invalid value for nnmail-spool-file: `procmail'")
          nil))

-       ;; Hack to only fetch the contents of a single group's spool file.
+    ;; Hack to only fetch the contents of a single group's spool file.

        (when (and (eq (car source) 'directory)
                   (null nnmail-scan-directory-mail-source-once)
                   group)
        (when (and (eq (car source) 'directory)
                   (null nnmail-scan-directory-mail-source-once)
                   group)


@@ -1657,7 +1657,7 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
             ;; We expire all articles on sight.
             t)
            ((equal time '(0 0))
             ;; We expire all articles on sight.
             t)
            ((equal time '(0 0))

-            ;; This is an ange-ftp group, and we don't have any dates.
+           ;; This is an ange-ftp group, and we don't have any dates.

             nil)
            ((numberp days)
             (setq days (days-to-time days))
             nil)
            ((numberp days)
             (setq days (days-to-time days))

diff --git a/lisp/nnmbox.el b/lisp/nnmbox.el
index 983dcc3..ec98abe 100644 (file)
--- a/lisp/nnmbox.el
+++ b/lisp/nnmbox.el
@@ -188,7 +188,7 @@
                       (car active) (cdr active) group)))))
 
 (defun nnmbox-save-buffer ()
                       (car active) (cdr active) group)))))
 
 (defun nnmbox-save-buffer ()

-  (let ((coding-system-for-write 
+  (let ((coding-system-for-write

         (or nnmbox-file-coding-system-for-write
             nnmbox-file-coding-system)))
     (save-buffer)))
         (or nnmbox-file-coding-system-for-write
             nnmbox-file-coding-system)))
     (save-buffer)))


@@ -262,8 +262,8 @@
              (progn
                (unless (eq nnmail-expiry-target 'delete)
                  (with-temp-buffer
              (progn
                (unless (eq nnmail-expiry-target 'delete)
                  (with-temp-buffer

-                   (nnmbox-request-article (car articles) 
-                                            newsgroup server 
+                   (nnmbox-request-article (car articles)
+                                            newsgroup server

                                             (current-buffer))
                    (let ((nnml-current-directory nil))
                      (nnmail-expiry-target-group
                                             (current-buffer))
                    (let ((nnml-current-directory nil))
                      (nnmail-expiry-target-group

diff --git a/lisp/nnmh.el b/lisp/nnmh.el
index cafd590..32359c2 100644 (file)
--- a/lisp/nnmh.el
+++ b/lisp/nnmh.el
@@ -239,12 +239,12 @@ as unread by Gnus.")
                (file-truename (file-name-as-directory
                                (expand-file-name nnmh-toplev))))
               dir)
                (file-truename (file-name-as-directory
                                (expand-file-name nnmh-toplev))))
               dir)

-              (mm-string-as-multibyte
-              (mm-encode-coding-string 
-                (nnheader-replace-chars-in-string
-                 (substring dir (match-end 0))
-                 ?/ ?.)
-                nnmail-pathname-coding-system)))
+             (mm-string-as-multibyte
+              (mm-encode-coding-string
+               (nnheader-replace-chars-in-string
+                (substring dir (match-end 0))
+                ?/ ?.)
+               nnmail-pathname-coding-system)))

            (apply 'max files)
            (apply 'min files)))))))
   t)
            (apply 'max files)
            (apply 'min files)))))))
   t)

diff --git a/lisp/nnml.el b/lisp/nnml.el
index 080dd76..b1caf88 100644 (file)
--- a/lisp/nnml.el
+++ b/lisp/nnml.el
@@ -104,15 +104,15 @@ check twice.")
       (set-buffer nntp-server-buffer)
       (erase-buffer)
       (let* ((file nil)
       (set-buffer nntp-server-buffer)
       (erase-buffer)
       (let* ((file nil)

-             (number (length sequence))
-             (count 0)
-             (file-name-coding-system nnmail-pathname-coding-system)
-             beg article
-             (nnml-check-directory-twice 
-              (and nnml-check-directory-twice 
-                   ;; To speed up, disable it in some case.
-                   (or (not (numberp nnmail-large-newsgroup))
-                       (<= number nnmail-large-newsgroup)))))
+            (number (length sequence))
+            (count 0)
+            (file-name-coding-system nnmail-pathname-coding-system)
+            beg article
+            (nnml-check-directory-twice
+             (and nnml-check-directory-twice
+                  ;; To speed up, disable it in some case.
+                  (or (not (numberp nnmail-large-newsgroup))
+                      (<= number nnmail-large-newsgroup)))))

        (if (stringp (car sequence))
            'headers
          (if (nnml-retrieve-headers-with-nov sequence fetch-old)
        (if (stringp (car sequence))
            'headers
          (if (nnml-retrieve-headers-with-nov sequence fetch-old)


@@ -329,8 +329,8 @@ check twice.")
     (and
      (nnml-deletable-article-p group article)
      (nnml-request-article article group server)
     (and
      (nnml-deletable-article-p group article)
      (nnml-request-article article group server)

-     (let (nnml-current-directory 
-          nnml-current-group 
+     (let (nnml-current-directory
+          nnml-current-group

           nnml-article-file-alist)
        (save-excursion
         (set-buffer buf)
           nnml-article-file-alist)
        (save-excursion
         (set-buffer buf)


@@ -499,13 +499,13 @@ check twice.")
     (if (setq file (cdr (assq article nnml-article-file-alist)))
        (expand-file-name file nnml-current-directory)
       (if nnml-check-directory-twice
     (if (setq file (cdr (assq article nnml-article-file-alist)))
        (expand-file-name file nnml-current-directory)
       (if nnml-check-directory-twice

-          ;; Just to make sure nothing went wrong when reading over NFS --
-          ;; check once more.
-          (when (file-exists-p
-                 (setq file (expand-file-name (number-to-string article)
-                                              nnml-current-directory)))
-            (nnml-update-file-alist t)
-            file)))))
+      ;; Just to make sure nothing went wrong when reading over NFS --
+         ;; check once more.
+         (when (file-exists-p
+                (setq file (expand-file-name (number-to-string article)
+                                             nnml-current-directory)))
+           (nnml-update-file-alist t)
+           file)))))

 
 (defun nnml-deletable-article-p (group article)
   "Say whether ARTICLE in GROUP can be deleted."
 
 (defun nnml-deletable-article-p (group article)
   "Say whether ARTICLE in GROUP can be deleted."


@@ -527,7 +527,7 @@ check twice.")
       ;; likely that the article we are looking for is in that group.
       (if (setq number (nnml-find-id nnml-current-group id))
          (cons nnml-current-group number)
       ;; likely that the article we are looking for is in that group.
       (if (setq number (nnml-find-id nnml-current-group id))
          (cons nnml-current-group number)

-       ;; It wasn't there, so we look through the other groups as well.
+      ;; It wasn't there, so we look through the other groups as well.

        (while (and (not number)
                    alist)
          (or (string= (caar alist) nnml-current-group)
        (while (and (not number)
                    alist)
          (or (string= (caar alist) nnml-current-group)

diff --git a/lisp/nnrss.el b/lisp/nnrss.el
index 636c2f1..e34ff09 100644 (file)
--- a/lisp/nnrss.el
+++ b/lisp/nnrss.el
@@ -109,60 +109,60 @@
     ("Reuters.Health.rdf"
      "http://www.reutershealth.com/eline.rdf"
      "Consumer-oriented health-related news stories.")
     ("Reuters.Health.rdf"
      "http://www.reutershealth.com/eline.rdf"
      "Consumer-oriented health-related news stories.")

-    ;;("4xt" "http://4xt.org/news/general.rss10" "Resources for XT users.")
+;;("4xt" "http://4xt.org/news/general.rss10" "Resources for XT users.")

     ("Aaronland" "http://aaronland.net/xml/abhb.rdf" "A boy and his basement.")
     ("Art of the Mix" "http://www.artofthemix.org/xml/rss.asp" "A website devoted to the art of making mixed tapes and cds.")
     ("Dave Beckett's RDF Resource Guide" "http://www.ilrt.bristol.ac.uk/discovery/rdf/resources/rss.rdf" "A comprehensive guide to resources about RDF.")
     ("David Chess" "http://www.davidchess.com/words/log.rss" "Mostly-daily musings on philosophy, children, culture, technology, the emergence of life from matter, chocolate, Nomic, and all that sort of thing.")
     ("Aaronland" "http://aaronland.net/xml/abhb.rdf" "A boy and his basement.")
     ("Art of the Mix" "http://www.artofthemix.org/xml/rss.asp" "A website devoted to the art of making mixed tapes and cds.")
     ("Dave Beckett's RDF Resource Guide" "http://www.ilrt.bristol.ac.uk/discovery/rdf/resources/rss.rdf" "A comprehensive guide to resources about RDF.")
     ("David Chess" "http://www.davidchess.com/words/log.rss" "Mostly-daily musings on philosophy, children, culture, technology, the emergence of life from matter, chocolate, Nomic, and all that sort of thing.")

-    ;;("Dublin Core Metadata Intitiative" "http://www.dublincore.org/news.rss" "Latest news from DCMI.")
+;;("Dublin Core Metadata Intitiative" "http://www.dublincore.org/news.rss" "Latest news from DCMI.")

     ("Figby Articles" "http://www.figby.com/index-rss.php" "A weblog with daily stories about technology, books and publishing, privacy, science, and occasional humor.")
     ("Figby Articles" "http://www.figby.com/index-rss.php" "A weblog with daily stories about technology, books and publishing, privacy, science, and occasional humor.")

-    ;;("Figby News" "http://www.figby.com/news.php" "Categorized RSS feeds from various sources.")
+;;("Figby News" "http://www.figby.com/news.php" "Categorized RSS feeds from various sources.")

     ("Figby Quickies" "http://www.figby.com/quickies-rss.php" "Quick commented links to other sites from Figby.com.")
     ("Flutterby!" "http://www.flutterby.com/main.rdf" "News and views from Dan Lyke.")
     ("Groovelog" "http://groovelog.agora.co.uk/groove+log/groovelog.nsf/today.rss.xml" "The open-access groove users' weblog.")
     ("Figby Quickies" "http://www.figby.com/quickies-rss.php" "Quick commented links to other sites from Figby.com.")
     ("Flutterby!" "http://www.flutterby.com/main.rdf" "News and views from Dan Lyke.")
     ("Groovelog" "http://groovelog.agora.co.uk/groove+log/groovelog.nsf/today.rss.xml" "The open-access groove users' weblog.")

-    ;;("Groovelog.rss10" "http://groovelog.agora.co.uk/groove+log/groovelog.nsf/today.rss10.xml" "The open-access groove users' weblog.")
+;;("Groovelog.rss10" "http://groovelog.agora.co.uk/groove+log/groovelog.nsf/today.rss10.xml" "The open-access groove users' weblog.")

     ("Hit or Miss" "http://hit-or-miss.org/rss/" "Daily weblog and journal.")
     ("Hit or Miss" "http://hit-or-miss.org/rss/" "Daily weblog and journal.")

-    ;;("Internet.com Feeds" "http://www.webreference.com/services/news/" "News from ")
+;;("Internet.com Feeds" "http://www.webreference.com/services/news/" "News from ")

     ("Larkfarm News" "http://www.larkfarm.com/Larkfarm.rdf" "Mike Gunderloy's web site.")
     ("Latest RFCs" "http://x42.com/rss/rfc.rss")
     ("Linux Today" "http://linuxtoday.com/backend/biglt.rss")
     ("Linux Today.rdf" "http://linuxtoday.com/backend/my-netscape10.rdf")
     ("More Like This WebLog" "http://www.whump.com/moreLikeThis/RSS" "Because the more you know, the more jokes you get.")
     ("Motivational Quotes of the Day" "http://www.quotationspage.com/data/mqotd.rss" "Four motivational quotations each day from the Quotations Page.")
     ("Larkfarm News" "http://www.larkfarm.com/Larkfarm.rdf" "Mike Gunderloy's web site.")
     ("Latest RFCs" "http://x42.com/rss/rfc.rss")
     ("Linux Today" "http://linuxtoday.com/backend/biglt.rss")
     ("Linux Today.rdf" "http://linuxtoday.com/backend/my-netscape10.rdf")
     ("More Like This WebLog" "http://www.whump.com/moreLikeThis/RSS" "Because the more you know, the more jokes you get.")
     ("Motivational Quotes of the Day" "http://www.quotationspage.com/data/mqotd.rss" "Four motivational quotations each day from the Quotations Page.")

-    ;;("My Netscape Network" "http://www.dmoz.org/Netscape/My_Netscape_Network/")
+;;("My Netscape Network" "http://www.dmoz.org/Netscape/My_Netscape_Network/")

     ;;("My UserLand" "http://my.userland.com/choose")
     ("Network World Fusion NetFlash" "http://www.nwfusion.com/netflash.rss" "Daily breaking news about networking products, technologies and services.")
     ;;("My UserLand" "http://my.userland.com/choose")
     ("Network World Fusion NetFlash" "http://www.nwfusion.com/netflash.rss" "Daily breaking news about networking products, technologies and services.")

-    ;;("News Feeds" "http://newsfeeds.manilasites.com/" "Jeff Barr highlights high quality RSS feeds.")
+;;("News Feeds" "http://newsfeeds.manilasites.com/" "Jeff Barr highlights high quality RSS feeds.")

     ;;("News Is Free Export" "http://www.newsisfree.com/export.php3")
     ("News Is Free" "http://www.newsisfree.com/news.rdf.php3")
     ;;("News Is Free Export" "http://www.newsisfree.com/export.php3")
     ("News Is Free" "http://www.newsisfree.com/news.rdf.php3")

-    ;;("News is Free XML Export" "http://www.newsisfree.com/ocs/directory.xml")
+;;("News is Free XML Export" "http://www.newsisfree.com/ocs/directory.xml")

     ("O'Reilly Network Articles" "http://www.oreillynet.com/cs/rss/query/q/260?x-ver=1.0")
     ("Quotes of the Day" "http://www.quotationspage.com/data/qotd.rss" "Four humorous quotations each day from the Quotations Page.")
     ("RDF Interest Group" "http://ilrt.org/discovery/rdf-dev/roads/cgi-bin/desire/ig2rss?list=www-rdf-interest" "An experimental channel scraped from the RDF Interest Group mail archives.")
     ("RDF Logic List" "http://ilrt.org/discovery/rdf-dev/roads/cgi-bin/desire/ig2rss?list=www-rdf-logic" "An experimental channel scraped from the RDF Logic mail archives.")
     ("RSS Info" "http://www.blogspace.com/rss/rss10" "News and information on the RSS format")
     ("O'Reilly Network Articles" "http://www.oreillynet.com/cs/rss/query/q/260?x-ver=1.0")
     ("Quotes of the Day" "http://www.quotationspage.com/data/qotd.rss" "Four humorous quotations each day from the Quotations Page.")
     ("RDF Interest Group" "http://ilrt.org/discovery/rdf-dev/roads/cgi-bin/desire/ig2rss?list=www-rdf-interest" "An experimental channel scraped from the RDF Interest Group mail archives.")
     ("RDF Logic List" "http://ilrt.org/discovery/rdf-dev/roads/cgi-bin/desire/ig2rss?list=www-rdf-logic" "An experimental channel scraped from the RDF Logic mail archives.")
     ("RSS Info" "http://www.blogspace.com/rss/rss10" "News and information on the RSS format")

-    ;;("RSS-DEV listing" "http://www.egroups.com/links/rss-dev/Feeds_000966335046/" "A listing of RSS files from the RSS-DEV list.")
+;;("RSS-DEV listing" "http://www.egroups.com/links/rss-dev/Feeds_000966335046/" "A listing of RSS files from the RSS-DEV list.")

     ("Semantic Web List" "http://ilrt.org/discovery/rdf-dev/roads/cgi-bin/desire/ig2rss?list=semantic-web" "An experimental channel scraped from the W3C's Semantic Web mail archives.")
     ("Semantic Web List" "http://ilrt.org/discovery/rdf-dev/roads/cgi-bin/desire/ig2rss?list=semantic-web" "An experimental channel scraped from the W3C's Semantic Web mail archives.")

-    ;;("Sherch!" "http://www.sherch.com/~pldms/cgi-bin/sherch.pl" "Sherlock for the rest of us.")
-    ;;("Street Fusion Archived Financial Webcasts" "http://partners.streetfusion.com/rdf/archive.rdf")
-    ;;("Street Fusion Upcoming Financial Webcasts" "http://partners.streetfusion.com/rdf/live.rdf")
-    ;;("TNL.net newsletter" "http://www.tnl.net/newsletter/channel100.asp" "A newsletter about Internet technology and issues.")
+;;("Sherch!" "http://www.sherch.com/~pldms/cgi-bin/sherch.pl" "Sherlock for the rest of us.")
+;;("Street Fusion Archived Financial Webcasts" "http://partners.streetfusion.com/rdf/archive.rdf")
+;;("Street Fusion Upcoming Financial Webcasts" "http://partners.streetfusion.com/rdf/live.rdf")
+;;("TNL.net newsletter" "http://www.tnl.net/newsletter/channel100.asp" "A newsletter about Internet technology and issues.")

     ("W3C" "http://www.w3.org/2000/08/w3c-synd/home.rss" "The latest news at the World Wide Web Consortium.")
     ("W3C" "http://www.w3.org/2000/08/w3c-synd/home.rss" "The latest news at the World Wide Web Consortium.")

-    ;;("XML News: RSS Live Content" "http://www.xmlnews.org/RSS/content.html" "A listing of well-known RSS feeds.")
-    ("|fr| XMLfr" "http://xmlfr.org/actualites/general.rss10" 
+;;("XML News: RSS Live Content" "http://www.xmlnews.org/RSS/content.html" "A listing of well-known RSS feeds.")
+    ("|fr| XMLfr" "http://xmlfr.org/actualites/general.rss10"

      "French speaking portal site dedicated to XML.")
      "French speaking portal site dedicated to XML.")

-    ("XMLhack" "http://xmlhack.com/rss10.php" 
+    ("XMLhack" "http://xmlhack.com/rss10.php"

      "Developer news from the XML community.")
      "Developer news from the XML community.")

-    ("The Register" 
-     "http://www.theregister.co.uk/tonys/slashdot.rdf" 
+    ("The Register"
+     "http://www.theregister.co.uk/tonys/slashdot.rdf"

      "The Register -- Biting the hand that feeds IT.")
      "The Register -- Biting the hand that feeds IT.")

-    ("|de| Heise-Ticker" 
-     "http://www.heise.de/newsticker/heise.rdf" 
+    ("|de| Heise-Ticker"
+     "http://www.heise.de/newsticker/heise.rdf"

      "German news ticker about technology.")
      "German news ticker about technology.")

-    ("|de| Telepolis News" 
-     "http://www.heise.de/tp/news.rdf" 
+    ("|de| Telepolis News"
+     "http://www.heise.de/tp/news.rdf"

      "German background news about technology.")
      "German background news about technology.")

-    ("Kuro5hin" 
+    ("Kuro5hin"

      "http://www.kuro5hin.org/backend.rdf"
      "Technology and culture, from the trenches.")
     ("JabberCentral"
      "http://www.kuro5hin.org/backend.rdf"
      "Technology and culture, from the trenches.")
     ("JabberCentral"


@@ -208,20 +208,20 @@ To use the description in headers, put this name into `nnmail-extra-headers'.")
                    "0" "\t" ;; lines
                    "" "\t" ;; Xref
                    (if (and (nth 6 e)
                    "0" "\t" ;; lines
                    "" "\t" ;; Xref
                    (if (and (nth 6 e)

-                             (memq nnrss-description-field 
-                                   nnmail-extra-headers))
+                            (memq nnrss-description-field
+                                  nnmail-extra-headers))

                        (concat (symbol-name nnrss-description-field)
                                ": "
                        (concat (symbol-name nnrss-description-field)
                                ": "

-                                (nnrss-format-string (nth 6 e))
-                                "\t")
+                               (nnrss-format-string (nth 6 e))
+                               "\t")

                      "")
                      "")

-                    (if (and (nth 2 e)
-                             (memq nnrss-url-field 
-                                   nnmail-extra-headers))
+                   (if (and (nth 2 e)
+                            (memq nnrss-url-field
+                                  nnmail-extra-headers))

                        (concat (symbol-name nnrss-url-field)
                                ": "
                        (concat (symbol-name nnrss-url-field)
                                ": "

-                                (nnrss-format-string (nth 2 e))
-                                "\t")
+                               (nnrss-format-string (nth 2 e))
+                               "\t")

                      "")
                    "\n")))))
   'nov)
                      "")
                    "\n")))))
   'nov)


@@ -250,8 +250,8 @@ To use the description in headers, put this name into `nnmail-extra-headers'.")
        (with-current-buffer nntp-server-buffer
          (erase-buffer)
          (goto-char (point-min))
        (with-current-buffer nntp-server-buffer
          (erase-buffer)
          (goto-char (point-min))

-          (if group
-              (insert "Newsgroups: " group "\n"))
+         (if group
+             (insert "Newsgroups: " group "\n"))

          (if (nth 3 e)
              (insert "Subject: " (nnrss-format-string (nth 3 e)) "\n"))
          (if (nth 4 e)
          (if (nth 3 e)
              (insert "Subject: " (nnrss-format-string (nth 3 e)) "\n"))
          (if (nth 4 e)


@@ -294,7 +294,7 @@ To use the description in headers, put this name into `nnmail-extra-headers'.")
       (if (and (setq e (assq art nnrss-group-data))
               (nnmail-expired-article-p
                group
       (if (and (setq e (assq art nnrss-group-data))
               (nnmail-expired-article-p
                group

-               (if (listp (setq days (nth 1 e))) days 
+               (if (listp (setq days (nth 1 e))) days

                  (days-to-time (- days (time-to-days '(0 0)))))
                force))
          (setq nnrss-group-data (delq e nnrss-group-data)
                  (days-to-time (- days (time-to-days '(0 0)))))
                force))
          (setq nnrss-group-data (delq e nnrss-group-data)


@@ -309,7 +309,7 @@ To use the description in headers, put this name into `nnmail-extra-headers'.")
   (setq nnrss-server-data
        (delq (assoc group nnrss-server-data) nnrss-server-data))
   (nnrss-save-server-data server)
   (setq nnrss-server-data
        (delq (assoc group nnrss-server-data) nnrss-server-data))
   (nnrss-save-server-data server)

-  (let ((file (expand-file-name 
+  (let ((file (expand-file-name

               (nnrss-translate-file-chars
                (concat group (and server
                                   (not (equal server ""))
               (nnrss-translate-file-chars
                (concat group (and server
                                   (not (equal server ""))


@@ -360,7 +360,7 @@ To use the description in headers, put this name into `nnmail-extra-headers'.")
 
 (defun nnrss-read-server-data (server)
   (setq nnrss-server-data nil)
 
 (defun nnrss-read-server-data (server)
   (setq nnrss-server-data nil)

-  (let ((file (expand-file-name 
+  (let ((file (expand-file-name

               (nnrss-translate-file-chars
                (concat "nnrss" (and server
                                     (not (equal server ""))
               (nnrss-translate-file-chars
                (concat "nnrss" (and server
                                     (not (equal server ""))


@@ -371,15 +371,15 @@ To use the description in headers, put this name into `nnmail-extra-headers'.")
     (when (file-exists-p file)
       (with-temp-buffer
        (let ((coding-system-for-read 'binary)
     (when (file-exists-p file)
       (with-temp-buffer
        (let ((coding-system-for-read 'binary)

-              emacs-lisp-mode-hook)
+             emacs-lisp-mode-hook)

          (insert-file-contents file)
          (insert-file-contents file)

-          (emacs-lisp-mode)
-          (goto-char (point-min))
-          (eval-buffer))))))
+         (emacs-lisp-mode)
+         (goto-char (point-min))
+         (eval-buffer))))))

 
 (defun nnrss-save-server-data (server)
   (gnus-make-directory nnrss-directory)
 
 (defun nnrss-save-server-data (server)
   (gnus-make-directory nnrss-directory)

-  (let ((file (expand-file-name 
+  (let ((file (expand-file-name

               (nnrss-translate-file-chars
                (concat "nnrss" (and server
                                     (not (equal server ""))
               (nnrss-translate-file-chars
                (concat "nnrss" (and server
                                     (not (equal server ""))


@@ -387,7 +387,7 @@ To use the description in headers, put this name into `nnmail-extra-headers'.")
                        server ".el"))
               nnrss-directory)))
     (let ((coding-system-for-write 'binary)
                        server ".el"))
               nnrss-directory)))
     (let ((coding-system-for-write 'binary)

-          print-level print-length)
+         print-level print-length)

       (with-temp-file file
        (insert "(setq nnrss-server-data '"
                (prin1-to-string nnrss-server-data)
       (with-temp-file file
        (insert "(setq nnrss-server-data '"
                (prin1-to-string nnrss-server-data)


@@ -399,7 +399,7 @@ To use the description in headers, put this name into `nnmail-extra-headers'.")
   (let ((pair (assoc group nnrss-server-data)))
     (setq nnrss-group-max (or (cadr pair) 0))
     (setq nnrss-group-min (+ nnrss-group-max 1)))
   (let ((pair (assoc group nnrss-server-data)))
     (setq nnrss-group-max (or (cadr pair) 0))
     (setq nnrss-group-min (+ nnrss-group-max 1)))

-  (let ((file (expand-file-name 
+  (let ((file (expand-file-name

               (nnrss-translate-file-chars
                (concat group (and server
                                   (not (equal server ""))
               (nnrss-translate-file-chars
                (concat group (and server
                                   (not (equal server ""))


@@ -409,11 +409,11 @@ To use the description in headers, put this name into `nnmail-extra-headers'.")
     (when (file-exists-p file)
       (with-temp-buffer
        (let ((coding-system-for-read 'binary)
     (when (file-exists-p file)
       (with-temp-buffer
        (let ((coding-system-for-read 'binary)

-              emacs-lisp-mode-hook)
+             emacs-lisp-mode-hook)

          (insert-file-contents file)
          (insert-file-contents file)

-          (emacs-lisp-mode)
-          (goto-char (point-min))
-          (eval-buffer)))
+         (emacs-lisp-mode)
+         (goto-char (point-min))
+         (eval-buffer)))

       (dolist (e nnrss-group-data)
        (gnus-sethash (nth 2 e) e nnrss-group-hashtb)
        (if (and (car e) (> nnrss-group-min (car e)))
       (dolist (e nnrss-group-data)
        (gnus-sethash (nth 2 e) e nnrss-group-hashtb)
        (if (and (car e) (> nnrss-group-min (car e)))


@@ -423,7 +423,7 @@ To use the description in headers, put this name into `nnmail-extra-headers'.")
 
 (defun nnrss-save-group-data (group server)
   (gnus-make-directory nnrss-directory)
 
 (defun nnrss-save-group-data (group server)
   (gnus-make-directory nnrss-directory)

-  (let ((file (expand-file-name 
+  (let ((file (expand-file-name

               (nnrss-translate-file-chars
                (concat group (and server
                                   (not (equal server ""))
               (nnrss-translate-file-chars
                (concat group (and server
                                   (not (equal server ""))


@@ -431,7 +431,7 @@ To use the description in headers, put this name into `nnmail-extra-headers'.")
                        server ".el"))
               nnrss-directory)))
     (let ((coding-system-for-write 'binary)
                        server ".el"))
               nnrss-directory)))
     (let ((coding-system-for-write 'binary)

-          print-level print-length)
+         print-level print-length)

       (with-temp-file file
        (insert "(setq nnrss-group-data '"
                (prin1-to-string nnrss-group-data)
       (with-temp-file file
        (insert "(setq nnrss-group-data '"
                (prin1-to-string nnrss-group-data)


@@ -476,15 +476,15 @@ To use the description in headers, put this name into `nnmail-extra-headers'.")
        (mm-with-unibyte-buffer
          (if (and nnrss-use-local
                   (file-exists-p (setq file (expand-file-name
        (mm-with-unibyte-buffer
          (if (and nnrss-use-local
                   (file-exists-p (setq file (expand-file-name

-                                         (nnrss-translate-file-chars
-                                          (concat group ".xml"))
-                                         nnrss-directory))))
+                                             (nnrss-translate-file-chars
+                                              (concat group ".xml"))
+                                             nnrss-directory))))

              (insert-file-contents file)
            (setq url (or (nth 2 (assoc group nnrss-server-data))
                          (second (assoc group nnrss-group-alist))))
            (unless url
              (setq url
              (insert-file-contents file)
            (setq url (or (nth 2 (assoc group nnrss-server-data))
                          (second (assoc group nnrss-group-alist))))
            (unless url
              (setq url

-               (read-string (format "RSS url of %s: " group "http://")))
+                   (read-string (format "RSS url of %s: " group "http://")))

              (let ((pair (assoc group nnrss-server-data)))
                (if pair
                    (setcdr (cdr pair) (list url))
              (let ((pair (assoc group nnrss-server-data)))
                (if pair
                    (setcdr (cdr pair) (list url))


@@ -498,35 +498,35 @@ To use the description in headers, put this name into `nnmail-extra-headers'.")
          (if (re-search-forward "<rdf\\|<rss" nil t)
              (goto-char (match-beginning 0)))
          (setq xml (xml-parse-region (point) (point-max))))
          (if (re-search-forward "<rdf\\|<rss" nil t)
              (goto-char (match-beginning 0)))
          (setq xml (xml-parse-region (point) (point-max))))

-      (error 
+      (error

        (nnheader-message 1 "Error in group %s: %s" group (cadr err))))
     (while (and xml (not (assq 'item xml)))
       (unless (listp (car (setq xml (cddar xml))))
        (setq xml nil)))
     (dolist (item (nreverse xml))
        (nnheader-message 1 "Error in group %s: %s" group (cadr err))))
     (while (and xml (not (assq 'item xml)))
       (unless (listp (car (setq xml (cddar xml))))
        (setq xml nil)))
     (dolist (item (nreverse xml))

-       (when (and (listp item)
-                 (eq 'item (car item))
-                 (setq url (nnrss-node-text (assq 'link (cddr item))))
-                 (setq url (nnrss-decode-entities-unibyte-string url))
-                 (not (gnus-gethash url nnrss-group-hashtb)))
-        (setq subject (nnrss-node-text (assq 'title (cddr item))))
-        (setq extra (or (nnrss-node-text (assq 'description (cddr item)))
-                        (nnrss-node-text (assq 'dc:description (cddr item)))))
-        (setq author (nnrss-node-text (assq 'dc:creator (cddr item))))
-        (setq date (or (nnrss-node-text (assq 'dc:date (cddr item)))
-                       (message-make-date)))
-        (push
-         (list
-          (incf nnrss-group-max)
-          (current-time)
-          url
-          (and subject (nnrss-decode-entities-unibyte-string subject))
-          (and author (nnrss-decode-entities-unibyte-string author))
-          date
-          (and extra (nnrss-decode-entities-unibyte-string extra)))
-         nnrss-group-data)
-        (gnus-sethash url (car nnrss-group-data) nnrss-group-hashtb)
-        (setq changed t)))
+      (when (and (listp item)
+                (eq 'item (car item))
+                (setq url (nnrss-node-text (assq 'link (cddr item))))
+                (setq url (nnrss-decode-entities-unibyte-string url))
+                (not (gnus-gethash url nnrss-group-hashtb)))
+       (setq subject (nnrss-node-text (assq 'title (cddr item))))
+       (setq extra (or (nnrss-node-text (assq 'description (cddr item)))
+                       (nnrss-node-text (assq 'dc:description (cddr item)))))
+       (setq author (nnrss-node-text (assq 'dc:creator (cddr item))))
+       (setq date (or (nnrss-node-text (assq 'dc:date (cddr item)))
+                      (message-make-date)))
+       (push
+        (list
+         (incf nnrss-group-max)
+         (current-time)
+         url
+         (and subject (nnrss-decode-entities-unibyte-string subject))
+         (and author (nnrss-decode-entities-unibyte-string author))
+         date
+         (and extra (nnrss-decode-entities-unibyte-string extra)))
+        nnrss-group-data)
+       (gnus-sethash url (car nnrss-group-data) nnrss-group-hashtb)
+       (setq changed t)))

     (when changed
       (nnrss-save-group-data group server)
       (let ((pair (assoc group nnrss-server-data)))
     (when changed
       (nnrss-save-group-data group server)
       (let ((pair (assoc group nnrss-server-data)))


@@ -545,16 +545,16 @@ It is useful when `(setq nnrss-use-local t)'."
   (dolist (elem nnrss-server-data)
     (let ((url (or (nth 2 elem)
                   (second (assoc (car elem) nnrss-group-alist)))))
   (dolist (elem nnrss-server-data)
     (let ((url (or (nth 2 elem)
                   (second (assoc (car elem) nnrss-group-alist)))))

-    (insert "$WGET -q -O \"$RSSDIR\"/'" 
-           (nnrss-translate-file-chars (concat (car elem) ".xml"))
-           "' '" url "'\n"))))
+      (insert "$WGET -q -O \"$RSSDIR\"/'"
+             (nnrss-translate-file-chars (concat (car elem) ".xml"))
+             "' '" url "'\n"))))

 
 (defun nnrss-translate-file-chars (name)
   (let ((nnheader-file-name-translation-alist
         (append nnheader-file-name-translation-alist '((?' . ?_)))))
     (nnheader-translate-file-chars name)))
 
 
 (defun nnrss-translate-file-chars (name)
   (let ((nnheader-file-name-translation-alist
         (append nnheader-file-name-translation-alist '((?' . ?_)))))
     (nnheader-translate-file-chars name)))
 

-(defvar nnrss-moreover-url 
+(defvar nnrss-moreover-url

   "http://w.moreover.com/categories/category_list_rss.html"
   "The url of moreover.com categories.")
 
   "http://w.moreover.com/categories/category_list_rss.html"
   "The url of moreover.com categories.")
 


@@ -565,13 +565,13 @@ It is useful when `(setq nnrss-use-local t)'."
     (with-temp-buffer
       (nnrss-insert nnrss-moreover-url)
       (goto-char (point-min))
     (with-temp-buffer
       (nnrss-insert nnrss-moreover-url)
       (goto-char (point-min))

-      (while (re-search-forward 
+      (while (re-search-forward

              "<A NAME=\"\\([^\"]+\\)\">\\|<A HREF=\"\\(http://[^\"]*moreover\\.com[^\"]+page\\?c=\\([^\"&]+\\)&o=rss\\)" nil t)
        (if (match-string 1)
            (setq category (match-string 1))
          (setq url (match-string 2)
                name (nnweb-decode-entities-string
              "<A NAME=\"\\([^\"]+\\)\">\\|<A HREF=\"\\(http://[^\"]*moreover\\.com[^\"]+page\\?c=\\([^\"&]+\\)&o=rss\\)" nil t)
        (if (match-string 1)
            (setq category (match-string 1))
          (setq url (match-string 2)
                name (nnweb-decode-entities-string

-                     (rfc2231-decode-encoded-string 
+                     (rfc2231-decode-encoded-string

                       (match-string 3))))
          (if category
              (setq name (concat category "." name)))
                       (match-string 3))))
          (if category
              (setq name (concat category "." name)))

diff --git a/lisp/nnslashdot.el b/lisp/nnslashdot.el
index 7fe58cb..641c3b9 100644 (file)
--- a/lisp/nnslashdot.el
+++ b/lisp/nnslashdot.el
@@ -89,9 +89,9 @@
   (nnslashdot-possibly-change-server group server)
   (condition-case why
       (unless gnus-nov-is-evil
   (nnslashdot-possibly-change-server group server)
   (condition-case why
       (unless gnus-nov-is-evil

-        (if nnslashdot-threaded
-            (nnslashdot-threaded-retrieve-headers articles group)
-          (nnslashdot-sane-retrieve-headers articles group)))
+       (if nnslashdot-threaded
+           (nnslashdot-threaded-retrieve-headers articles group)
+         (nnslashdot-sane-retrieve-headers articles group)))

     (search-failed (nnslashdot-lose why))))
 
 (deffoo nnslashdot-threaded-retrieve-headers (articles group)
     (search-failed (nnslashdot-lose why))))
 
 (deffoo nnslashdot-threaded-retrieve-headers (articles group)


@@ -152,7 +152,7 @@
                  score (match-string 5))
            (when (string-match "^Re: *" subject)
              (setq subject (concat "Re: " (substring subject (match-end 0)))))
                  score (match-string 5))
            (when (string-match "^Re: *" subject)
              (setq subject (concat "Re: " (substring subject (match-end 0)))))

-            (setq subject (nnweb-decode-entities-string subject))
+           (setq subject (nnweb-decode-entities-string subject))

            (forward-line 1)
            (if (looking-at
                 "by <a[^>]+>\\([^<]+\\)</a>[ \t\n]*.*(\\([^)]+\\))")
            (forward-line 1)
            (if (looking-at
                 "by <a[^>]+>\\([^<]+\\)</a>[ \t\n]*.*(\\([^)]+\\))")


@@ -254,7 +254,7 @@
                score (match-string 5))
          (when (string-match "^Re: *" subject)
            (setq subject (concat "Re: " (substring subject (match-end 0)))))
                score (match-string 5))
          (when (string-match "^Re: *" subject)
            (setq subject (concat "Re: " (substring subject (match-end 0)))))

-          (setq subject (nnweb-decode-entities-string subject))
+         (setq subject (nnweb-decode-entities-string subject))

          (forward-line 1)
          (if (looking-at
               "by <a[^>]+>\\([^<]+\\)</a>[ \t\n]*.*(\\([^)]+\\))")
          (forward-line 1)
          (if (looking-at
               "by <a[^>]+>\\([^<]+\\)</a>[ \t\n]*.*(\\([^)]+\\))")


@@ -387,7 +387,7 @@
   (let ((number 0)
        sid elem description articles gname)
     (condition-case why
   (let ((number 0)
        sid elem description articles gname)
     (condition-case why

-        ;; First we do the Ultramode to get info on all the latest groups.
+       ;; First we do the Ultramode to get info on all the latest groups.

        (progn
          (mm-with-unibyte-buffer
            (nnweb-insert nnslashdot-backslash-url t)
        (progn
          (mm-with-unibyte-buffer
            (nnweb-insert nnslashdot-backslash-url t)


@@ -407,7 +407,7 @@
              (setq gname (concat description " (" sid ")"))
              (if (setq elem (assoc gname nnslashdot-groups))
                  (setcar (cdr elem) articles)
              (setq gname (concat description " (" sid ")"))
              (if (setq elem (assoc gname nnslashdot-groups))
                  (setcar (cdr elem) articles)

-               (push (list gname articles sid (current-time)) 
+               (push (list gname articles sid (current-time))

                      nnslashdot-groups))
              (goto-char (point-max))
              (widen)))
                      nnslashdot-groups))
              (goto-char (point-max))
              (widen)))


@@ -429,7 +429,7 @@
                  (setq gname (concat description " (" sid ")"))
                  (if (setq elem (assoc gname nnslashdot-groups))
                      (setcar (cdr elem) articles)
                  (setq gname (concat description " (" sid ")"))
                  (if (setq elem (assoc gname nnslashdot-groups))
                      (setcar (cdr elem) articles)

-                   (push (list gname articles sid (current-time)) 
+                   (push (list gname articles sid (current-time))

                          nnslashdot-groups)))))
            (incf number 30)))
       (search-failed (nnslashdot-lose why)))
                          nnslashdot-groups)))))
            (incf number 30)))
       (search-failed (nnslashdot-lose why)))


@@ -508,9 +508,9 @@
     (when item
       (if (fourth item)
          (when (and (>= (length articles) (cadr item)) ;; All are expirable.
     (when item
       (if (fourth item)
          (when (and (>= (length articles) (cadr item)) ;; All are expirable.

-                    (nnmail-expired-article-p 
+                    (nnmail-expired-article-p

                      group
                      group

-                     (fourth item) 
+                     (fourth item)

                      force))
            (setq nnslashdot-groups (delq item nnslashdot-groups))
            (nnslashdot-write-groups)
                      force))
            (setq nnslashdot-groups (delq item nnslashdot-groups))
            (nnslashdot-write-groups)


@@ -575,11 +575,6 @@
 (defun nnslashdot-lose (why)
   (error "Slashdot HTML has changed; please get a new version of nnslashdot"))
 
 (defun nnslashdot-lose (why)
   (error "Slashdot HTML has changed; please get a new version of nnslashdot"))
 

-;(defun nnslashdot-sid-strip (sid)
-;  (if (string-match "^00/" sid)
-;      (substring sid (match-end 0))
-;    sid))
-

 (defalias 'nnslashdot-sid-strip 'identity)
 
 (provide 'nnslashdot)
 (defalias 'nnslashdot-sid-strip 'identity)
 
 (provide 'nnslashdot)

diff --git a/lisp/nnsoup.el b/lisp/nnsoup.el
index 4f25bf7..478dd39 100644 (file)
--- a/lisp/nnsoup.el
+++ b/lisp/nnsoup.el
@@ -257,7 +257,7 @@ backend for the messages.")
                  (nth 1 (nnsoup-article-to-area
                          article nnsoup-current-group))))))
       (cond ((= kind ?m) 'mail)
                  (nth 1 (nnsoup-article-to-area
                          article nnsoup-current-group))))))
       (cond ((= kind ?m) 'mail)

-           ((= kind ?n) 'news) 
+           ((= kind ?n) 'news)

            (t 'unknown)))))
 
 (deffoo nnsoup-close-group (group &optional server)
            (t 'unknown)))))
 
 (deffoo nnsoup-close-group (group &optional server)

diff --git a/lisp/nnspool.el b/lisp/nnspool.el
index 5815036..a3e0c3b 100644 (file)
--- a/lisp/nnspool.el
+++ b/lisp/nnspool.el
@@ -49,7 +49,7 @@ If you are using Cnews, you probably should set this variable to nil.")
 (defvoo nnspool-nov-directory (concat nnspool-spool-directory "over.view/")
   "Local news nov directory.")
 
 (defvoo nnspool-nov-directory (concat nnspool-spool-directory "over.view/")
   "Local news nov directory.")
 

-(defvoo nnspool-lib-dir 
+(defvoo nnspool-lib-dir

     (if (file-exists-p "/usr/lib/news/active")
        "/usr/lib/news/"
       "/var/lib/news/")
     (if (file-exists-p "/usr/lib/news/active")
        "/usr/lib/news/"
       "/var/lib/news/")

diff --git a/lisp/nntp.el b/lisp/nntp.el
index 1cf3aee..6da83d9 100644 (file)
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -492,7 +492,7 @@ noticing asynchronous data.")
             (not nntp-nov-is-evil)
             (nntp-retrieve-headers-with-xover articles fetch-old))
        ;; We successfully retrieved the headers via XOVER.
             (not nntp-nov-is-evil)
             (nntp-retrieve-headers-with-xover articles fetch-old))
        ;; We successfully retrieved the headers via XOVER.

-        'nov
+       'nov

       ;; XOVER didn't work, so we do it the hard, slow and inefficient
       ;; way.
       (let ((number (length articles))
       ;; XOVER didn't work, so we do it the hard, slow and inefficient
       ;; way.
       (let ((number (length articles))


@@ -951,7 +951,7 @@ password contained in '~/.nntp-authinfo'."
         (process
          (condition-case ()
              (let ((coding-system-for-read nntp-coding-system-for-read)
         (process
          (condition-case ()
              (let ((coding-system-for-read nntp-coding-system-for-read)

-                    (coding-system-for-write nntp-coding-system-for-write))
+                   (coding-system-for-write nntp-coding-system-for-write))

                (funcall nntp-open-connection-function pbuffer))
            (error nil)
            (quit
                (funcall nntp-open-connection-function pbuffer))
            (error nil)
            (quit

diff --git a/lisp/nnultimate.el b/lisp/nnultimate.el
index 7cef4eb..5ce8446 100644 (file)
--- a/lisp/nnultimate.el
+++ b/lisp/nnultimate.el
@@ -56,7 +56,7 @@
 (defvoo nnultimate-groups nil)
 (defvoo nnultimate-headers nil)
 (defvoo nnultimate-articles nil)
 (defvoo nnultimate-groups nil)
 (defvoo nnultimate-headers nil)
 (defvoo nnultimate-articles nil)

-(defvar nnultimate-table-regexp 
+(defvar nnultimate-table-regexp

   "postings.*editpost\\|forumdisplay\\|Forum[0-9]+/HTML\\|getbio")
 
 ;;; Interface functions
   "postings.*editpost\\|forumdisplay\\|Forum[0-9]+/HTML\\|getbio")
 
 ;;; Interface functions


@@ -107,7 +107,7 @@
                    fetchers))
            (pop articles)
            (setq article (car articles)))))
                    fetchers))
            (pop articles)
            (setq article (car articles)))))

-      ;; Now we have the mapping from/to Gnus/nnultimate article numbers,
+   ;; Now we have the mapping from/to Gnus/nnultimate article numbers,

       ;; so we start fetching the topics that we need to satisfy the
       ;; request.
       (if (not fetchers)
       ;; so we start fetching the topics that we need to satisfy the
       ;; request.
       (if (not fetchers)


@@ -172,26 +172,26 @@
              (setq date (substring (car datel) (match-end 0))
                    datel nil))
            (pop datel))
              (setq date (substring (car datel) (match-end 0))
                    datel nil))
            (pop datel))

-          (when date
-            (setq date (delete "" (split-string
-                                   date "[-, \n\t\r    ]")))
-            (if (or (member "AM" date)
-                    (member "PM" date))
-                (setq date (format
-                            "%s %s %s %s"
-                            (nth 1 date)
-                            (if (and (>= (length (nth 0 date)) 3)
-                                     (assoc (downcase
-                                             (substring (nth 0 date) 0 3))
-                                            parse-time-months))
-                                (substring (nth 0 date) 0 3)
-                              (car (rassq (string-to-number (nth 0 date))
-                                          parse-time-months)))
-                            (nth 2 date) (nth 3 date)))
-              (setq date (format "%s %s %s %s"
-                                 (car (rassq (string-to-number (nth 1 date))
-                                             parse-time-months))
-                                 (nth 0 date) (nth 2 date) (nth 3 date)))))
+         (when date
+           (setq date (delete "" (split-string
+                                  date "[-, \n\t\r    ]")))
+           (if (or (member "AM" date)
+                   (member "PM" date))
+               (setq date (format
+                           "%s %s %s %s"
+                           (nth 1 date)
+                           (if (and (>= (length (nth 0 date)) 3)
+                                    (assoc (downcase
+                                            (substring (nth 0 date) 0 3))
+                                           parse-time-months))
+                               (substring (nth 0 date) 0 3)
+                             (car (rassq (string-to-number (nth 0 date))
+                                         parse-time-months)))
+                           (nth 2 date) (nth 3 date)))
+             (setq date (format "%s %s %s %s"
+                                (car (rassq (string-to-number (nth 1 date))
+                                            parse-time-months))
+                                (nth 0 date) (nth 2 date) (nth 3 date)))))

          (push
           (cons
            article
          (push
           (cons
            article


@@ -433,7 +433,7 @@
        nnultimate-groups-alist)
   (with-temp-file (expand-file-name "groups" nnultimate-directory)
     (prin1 nnultimate-groups-alist (current-buffer))))
        nnultimate-groups-alist)
   (with-temp-file (expand-file-name "groups" nnultimate-directory)
     (prin1 nnultimate-groups-alist (current-buffer))))

-    
+

 (defun nnultimate-init (server)
   "Initialize buffers and such."
   (unless (file-exists-p nnultimate-directory)
 (defun nnultimate-init (server)
   "Initialize buffers and such."
   (unless (file-exists-p nnultimate-directory)

diff --git a/lisp/nnwarchive.el b/lisp/nnwarchive.el
index 1a34dde..1abc4dd 100644 (file)
--- a/lisp/nnwarchive.el
+++ b/lisp/nnwarchive.el
@@ -26,7 +26,7 @@
 ;; Note: You need to have `url' (w3 0.46) or greater version
 ;; installed for this backend to work.
 
 ;; Note: You need to have `url' (w3 0.46) or greater version
 ;; installed for this backend to work.
 

-;; Todo: 
+;; Todo:

 ;; 1. To support more web archives.
 ;; 2. Generalize webmail to other MHonArc archive.
 
 ;; 1. To support more web archives.
 ;; 2. Generalize webmail to other MHonArc archive.
 


@@ -60,20 +60,20 @@
 (defvar nnwarchive-type-definition
   '((egroups
      (address . "www.egroups.com")
 (defvar nnwarchive-type-definition
   '((egroups
      (address . "www.egroups.com")

-     (open-url 
-      "http://www.egroups.com/login.cgi?&login_email=%s&login_password=%s" 
+     (open-url
+      "http://www.egroups.com/login.cgi?&login_email=%s&login_password=%s"

       nnwarchive-login nnwarchive-passwd)
       nnwarchive-login nnwarchive-passwd)

-     (list-url 
+     (list-url

       "http://www.egroups.com/mygroups")
      (list-dissect . nnwarchive-egroups-list)
      (list-groups . nnwarchive-egroups-list-groups)
       "http://www.egroups.com/mygroups")
      (list-dissect . nnwarchive-egroups-list)
      (list-groups . nnwarchive-egroups-list-groups)

-     (xover-url 
+     (xover-url

       "http://www.egroups.com/messages/%s/%d" group aux)
       "http://www.egroups.com/messages/%s/%d" group aux)

-     (xover-last-url 
+     (xover-last-url

       "http://www.egroups.com/messages/%s/" group)
      (xover-page-size . 13)
      (xover-dissect . nnwarchive-egroups-xover)
       "http://www.egroups.com/messages/%s/" group)
      (xover-page-size . 13)
      (xover-dissect . nnwarchive-egroups-xover)

-     (article-url 
+     (article-url

       "http://www.egroups.com/message/%s/%d?source=1" group article)
      (article-dissect . nnwarchive-egroups-article)
      (authentication . t)
       "http://www.egroups.com/message/%s/%d?source=1" group article)
      (article-dissect . nnwarchive-egroups-article)
      (authentication . t)


@@ -82,17 +82,17 @@
     (mail-archive
      (address . "www.mail-archive.com")
      (open-url)
     (mail-archive
      (address . "www.mail-archive.com")
      (open-url)

-     (list-url 
+     (list-url

       "http://www.mail-archive.com/lists.html")
      (list-dissect . nnwarchive-mail-archive-list)
      (list-groups . nnwarchive-mail-archive-list-groups)
       "http://www.mail-archive.com/lists.html")
      (list-dissect . nnwarchive-mail-archive-list)
      (list-groups . nnwarchive-mail-archive-list-groups)

-     (xover-url 
+     (xover-url

       "http://www.mail-archive.com/%s/mail%d.html" group aux)
       "http://www.mail-archive.com/%s/mail%d.html" group aux)

-     (xover-last-url 
+     (xover-last-url

       "http://www.mail-archive.com/%s/maillist.html" group)
      (xover-page-size)
      (xover-dissect . nnwarchive-mail-archive-xover)
       "http://www.mail-archive.com/%s/maillist.html" group)
      (xover-page-size)
      (xover-dissect . nnwarchive-mail-archive-xover)

-     (article-url 
+     (article-url

       "http://www.mail-archive.com/%s/msg%05d.html" group article1)
      (article-dissect . nnwarchive-mail-archive-article)
      (xover-files . nnwarchive-mail-archive-xover-files)
       "http://www.mail-archive.com/%s/msg%05d.html" group article1)
      (article-dissect . nnwarchive-mail-archive-article)
      (xover-files . nnwarchive-mail-archive-xover-files)


@@ -163,12 +163,12 @@
   (let ((defs (cdr (assq type nnwarchive-type-definition)))
        def)
     (dolist (def defs)
   (let ((defs (cdr (assq type nnwarchive-type-definition)))
        def)
     (dolist (def defs)

-      (set (intern (concat "nnwarchive-" (symbol-name (car def)))) 
+      (set (intern (concat "nnwarchive-" (symbol-name (car def))))

           (cdr def)))))
 
 (defmacro nnwarchive-backlog (&rest form)
   `(let ((gnus-keep-backlog nnwarchive-keep-backlog)
           (cdr def)))))
 
 (defmacro nnwarchive-backlog (&rest form)
   `(let ((gnus-keep-backlog nnwarchive-keep-backlog)

-        (gnus-backlog-buffer 
+        (gnus-backlog-buffer

          (format " *nnwarchive backlog %s*" nnwarchive-address))
         (gnus-backlog-articles nnwarchive-backlog-articles)
         (gnus-backlog-hashtb nnwarchive-backlog-hashtb))
          (format " *nnwarchive backlog %s*" nnwarchive-address))
         (gnus-backlog-articles nnwarchive-backlog-articles)
         (gnus-backlog-hashtb nnwarchive-backlog-hashtb))


@@ -183,10 +183,10 @@
   (nnwarchive-backlog
     (gnus-backlog-enter-article group number buffer)))
 
   (nnwarchive-backlog
     (gnus-backlog-enter-article group number buffer)))
 

-(defun nnwarchive-get-article (article &optional group server buffer) 
+(defun nnwarchive-get-article (article &optional group server buffer)

   (if (numberp article)
       (if (nnwarchive-backlog
   (if (numberp article)
       (if (nnwarchive-backlog

-           (gnus-backlog-request-article group article 
+           (gnus-backlog-request-article group article

                                          (or buffer nntp-server-buffer)))
          (cons group article)
        (let (contents)
                                          (or buffer nntp-server-buffer)))
          (cons group article)
        (let (contents)


@@ -298,7 +298,7 @@
     (setq nnwarchive-passwd
          (or nnwarchive-passwd
              (mail-source-read-passwd
     (setq nnwarchive-passwd
          (or nnwarchive-passwd
              (mail-source-read-passwd

-              (format "Password for %s at %s: " 
+              (format "Password for %s at %s: "

                       nnwarchive-login server)))))
   (unless nnwarchive-groups
     (nnwarchive-read-groups))
                       nnwarchive-login server)))))
   (unless nnwarchive-groups
     (nnwarchive-read-groups))


@@ -322,7 +322,7 @@
     (nnwarchive-open-server server)))
 
 (defun nnwarchive-read-groups ()
     (nnwarchive-open-server server)))
 
 (defun nnwarchive-read-groups ()

-  (let ((file (expand-file-name (concat "groups-" nnwarchive-address) 
+  (let ((file (expand-file-name (concat "groups-" nnwarchive-address)

                                nnwarchive-directory)))
     (when (file-exists-p file)
       (with-temp-buffer
                                nnwarchive-directory)))
     (when (file-exists-p file)
       (with-temp-buffer


@@ -331,14 +331,14 @@
        (setq nnwarchive-groups (read (current-buffer)))))))
 
 (defun nnwarchive-write-groups ()
        (setq nnwarchive-groups (read (current-buffer)))))))
 
 (defun nnwarchive-write-groups ()

-  (with-temp-file (expand-file-name (concat "groups-" nnwarchive-address) 
+  (with-temp-file (expand-file-name (concat "groups-" nnwarchive-address)

                                    nnwarchive-directory)
     (prin1 nnwarchive-groups (current-buffer))))
 
 (defun nnwarchive-init (server)
   "Initialize buffers and such."
   (let ((type (intern server)) (defs nnwarchive-type-definition) def)
                                    nnwarchive-directory)
     (prin1 nnwarchive-groups (current-buffer))))
 
 (defun nnwarchive-init (server)
   "Initialize buffers and such."
   (let ((type (intern server)) (defs nnwarchive-type-definition) def)

-    (cond 
+    (cond

      ((equal server "")
       (setq type nnwarchive-default-type))
      ((assq type nnwarchive-type-definition) t)
      ((equal server "")
       (setq type nnwarchive-default-type))
      ((assq type nnwarchive-type-definition) t)


@@ -390,13 +390,13 @@
   (mm-with-unibyte-current-buffer
     (let ((url-confirmation-func 'identity)
          (url-cookie-multiple-line nil))
   (mm-with-unibyte-current-buffer
     (let ((url-confirmation-func 'identity)
          (url-cookie-multiple-line nil))

-      (cond 
+      (cond

        ((eq (car xurl) 'post)
        (pop xurl)
        (nnwarchive-fetch-form (car xurl) (nnwarchive-eval (cdr xurl))))
        (t
        (nnweb-insert (apply 'format (nnwarchive-eval xurl))))))))
        ((eq (car xurl) 'post)
        (pop xurl)
        (nnwarchive-fetch-form (car xurl) (nnwarchive-eval (cdr xurl))))
        (t
        (nnweb-insert (apply 'format (nnwarchive-eval xurl))))))))

-  
+

 (defun nnwarchive-generate-active ()
   (save-excursion
     (set-buffer nntp-server-buffer)
 (defun nnwarchive-generate-active ()
   (save-excursion
     (set-buffer nntp-server-buffer)


@@ -420,12 +420,12 @@
   (save-excursion
     (let (articles)
       (set-buffer nnwarchive-buffer)
   (save-excursion
     (let (articles)
       (set-buffer nnwarchive-buffer)

-      (dolist (group groups) 
+      (dolist (group groups)

        (erase-buffer)
        (nnwarchive-url nnwarchive-xover-last-url)
        (goto-char (point-min))
        (when (re-search-forward "of \\([0-9]+\\)[ \t\n\r]*</title>" nil t)
        (erase-buffer)
        (nnwarchive-url nnwarchive-xover-last-url)
        (goto-char (point-min))
        (when (re-search-forward "of \\([0-9]+\\)[ \t\n\r]*</title>" nil t)

-         (setq articles (string-to-number (match-string 1)))) 
+         (setq articles (string-to-number (match-string 1))))

        (let ((elem (assoc group nnwarchive-groups)))
          (if elem
              (setcar (cdr elem) articles)
        (let ((elem (assoc group nnwarchive-groups)))
          (if elem
              (setcar (cdr elem) articles)


@@ -441,7 +441,7 @@
   (let ((case-fold-search t)
        group description elem articles)
     (goto-char (point-min))
   (let ((case-fold-search t)
        group description elem articles)
     (goto-char (point-min))

-    (while 
+    (while

        (re-search-forward "href=\"/group/\\([^/\"\> ]+\\)" nil t)
       (setq group (match-string 1)
            description (match-string 2))
        (re-search-forward "href=\"/group/\\([^/\"\> ]+\\)" nil t)
       (setq group (match-string 1)
            description (match-string 2))


@@ -469,12 +469,12 @@
        (push (cons
               article
               (make-full-mail-header
        (push (cons
               article
               (make-full-mail-header

-               article 
+               article

                (nnweb-decode-entities-string subject)
                (nnweb-decode-entities-string from)
                date
                (concat "<" group "%"
                (nnweb-decode-entities-string subject)
                (nnweb-decode-entities-string from)
                date
                (concat "<" group "%"

-                       (number-to-string article) 
+                       (number-to-string article)

                        "@egroup.com>")
                ""
                0 0 "")) nnwarchive-headers))))
                        "@egroup.com>")
                ""
                0 0 "")) nnwarchive-headers))))


@@ -523,7 +523,7 @@
        (let ((elem (assoc group nnwarchive-headers-cache)))
          (if elem
              (setcdr elem nnwarchive-headers)
        (let ((elem (assoc group nnwarchive-headers-cache)))
          (if elem
              (setcdr elem nnwarchive-headers)

-           (push (cons group nnwarchive-headers) 
+           (push (cons group nnwarchive-headers)

                  nnwarchive-headers-cache)))))))
 
 (defun nnwarchive-mail-archive-list ()
                  nnwarchive-headers-cache)))))))
 
 (defun nnwarchive-mail-archive-list ()


@@ -558,7 +558,7 @@
        (push (cons
               article
               (make-full-mail-header
        (push (cons
               article
               (make-full-mail-header

-               article 
+               article

                (nnweb-decode-entities-string subject)
                (nnweb-decode-entities-string from)
                date
                (nnweb-decode-entities-string subject)
                (nnweb-decode-entities-string from)
                date


@@ -608,14 +608,14 @@
       (insert from-r13)
       (let ((message-caesar-translation-table
             (or nnwarchive-caesar-translation-table
       (insert from-r13)
       (let ((message-caesar-translation-table
             (or nnwarchive-caesar-translation-table

-                (setq nnwarchive-caesar-translation-table 
+                (setq nnwarchive-caesar-translation-table

                       (nnwarchive-make-caesar-translation-table)))))
        (message-caesar-region (point-min) (point-max))
        (buffer-string)))))
 
 (defun nnwarchive-mail-archive-article (group article)
                       (nnwarchive-make-caesar-translation-table)))))
        (message-caesar-region (point-min) (point-max))
        (buffer-string)))))
 
 (defun nnwarchive-mail-archive-article (group article)

-  (let (p refs url mime e 
-         from subject date id 
+  (let (p refs url mime e
+         from subject date id

          done
          (case-fold-serch t))
     (save-restriction
          done
          (case-fold-serch t))
     (save-restriction


@@ -630,9 +630,9 @@
        (goto-char (point-min))
        (while (search-forward " -->" nil t)
          (replace-match ""))
        (goto-char (point-min))
        (while (search-forward " -->" nil t)
          (replace-match ""))

-       (setq from 
+       (setq from

              (or (mail-fetch-field "from")
              (or (mail-fetch-field "from")

-                 (nnwarchive-from-r13 
+                 (nnwarchive-from-r13

                   (mail-fetch-field "from-r13"))))
        (setq date (mail-fetch-field "date"))
        (setq id (mail-fetch-field "message-id"))
                   (mail-fetch-field "from-r13"))))
        (setq date (mail-fetch-field "date"))
        (setq id (mail-fetch-field "message-id"))


@@ -667,7 +667,7 @@
        (goto-char (point-max))
        (widen)
        (insert "\n"))
        (goto-char (point-max))
        (widen)
        (insert "\n"))

-      (setq p (point)) 
+      (setq p (point))

       (when (search-forward "X-Body-of-Message" nil t)
        (forward-line)
        (delete-region p (point))
       (when (search-forward "X-Body-of-Message" nil t)
        (forward-line)
        (delete-region p (point))


@@ -679,8 +679,8 @@
          (if (> (skip-chars-forward "\040\n\r\t") 0)
              (delete-region (point-min) (point)))
          (while (not (eobp))
          (if (> (skip-chars-forward "\040\n\r\t") 0)
              (delete-region (point-min) (point)))
          (while (not (eobp))

-           (cond 
-            ((looking-at "<PRE>\r?\n?") 
+           (cond
+            ((looking-at "<PRE>\r?\n?")

              (delete-region (match-beginning 0) (match-end 0))
              (setq p (point))
              (when (search-forward "</PRE>" nil t)
              (delete-region (match-beginning 0) (match-end 0))
              (setq p (point))
              (when (search-forward "</PRE>" nil t)


@@ -692,9 +692,9 @@
                  (goto-char (point-max)))))
             ((looking-at "<P><A HREF=\"\\([^\"]+\\)")
              (setq url (match-string 1))
                  (goto-char (point-max)))))
             ((looking-at "<P><A HREF=\"\\([^\"]+\\)")
              (setq url (match-string 1))

-             (delete-region (match-beginning 0) 
+             (delete-region (match-beginning 0)

                             (progn (forward-line) (point)))
                             (progn (forward-line) (point)))

-             ;; I hate to download the url encode it, then immediately 
+             ;; I hate to download the url encode it, then immediately

              ;; decode it.
              (insert "<#external"
                      " type="
              ;; decode it.
              (insert "<#external"
                      " type="


@@ -703,7 +703,7 @@
                               (mailcap-extension-to-mime
                                (match-string 0 url)))
                          "application/octet-stream")
                               (mailcap-extension-to-mime
                                (match-string 0 url)))
                          "application/octet-stream")

-                     (format " url=\"http://www.mail-archive.com/%s/%s\"" 
+                     (format " url=\"http://www.mail-archive.com/%s/%s\""

                              group url)
                      ">\n"
                      "<#/external>")
                              group url)
                      ">\n"
                      "<#/external>")


@@ -712,8 +712,8 @@
              (setq p (point))
              (insert "<#part type=\"text/html\" disposition=inline>")
              (goto-char
              (setq p (point))
              (insert "<#part type=\"text/html\" disposition=inline>")
              (goto-char

-              (if (re-search-forward 
-                   "[\040\n\r\t]*<PRE>\\|[\040\n\r\t]*<P><A HREF=\"" 
+              (if (re-search-forward
+                   "[\040\n\r\t]*<PRE>\\|[\040\n\r\t]*<P><A HREF=\""

                    nil t)
                   (match-beginning 0)
                 (point-max)))
                    nil t)
                   (match-beginning 0)
                 (point-max)))


@@ -739,7 +739,7 @@
          (insert " " (pop refs)))
        (insert "\n"))
       (when mime
          (insert " " (pop refs)))
        (insert "\n"))
       (when mime

-       (unless (looking-at "$") 
+       (unless (looking-at "$")

          (search-forward "\n\n" nil t)
          (forward-line -1))
        (narrow-to-region (point) (point-max))
          (search-forward "\n\n" nil t)
          (forward-line -1))
        (narrow-to-region (point) (point-max))

diff --git a/lisp/nnweb.el b/lisp/nnweb.el
index beba951..10ae416 100644 (file)
--- a/lisp/nnweb.el
+++ b/lisp/nnweb.el
@@ -194,7 +194,7 @@ and `altavista'.")
                           (nnweb-fetch-url url))
                         (if (nnweb-definition 'reference t)
                             (setq article
                           (nnweb-fetch-url url))
                         (if (nnweb-definition 'reference t)
                             (setq article

-                                  (funcall (nnweb-definition 
+                                  (funcall (nnweb-definition

                                             'reference) article)))))))
        (unless nnheader-callback-function
          (funcall (nnweb-definition 'article))
                                             'reference) article)))))))
        (unless nnheader-callback-function
          (funcall (nnweb-definition 'article))


@@ -733,13 +733,13 @@ and `altavista'.")
        Subject Score Date Newsgroups From
        map url)
     (unless active
        Subject Score Date Newsgroups From
        map url)
     (unless active

-      (push (list nnweb-group (setq active (cons 1 0)) 
+      (push (list nnweb-group (setq active (cons 1 0))

                  nnweb-type nnweb-search)
            nnweb-group-alist))
     ;; Go through all the article hits on this page.
     (goto-char (point-min))
     (while (re-search-forward
                  nnweb-type nnweb-search)
            nnweb-group-alist))
     ;; Go through all the article hits on this page.
     (goto-char (point-min))
     (while (re-search-forward

-            "a href=/groups\\(\\?[^ \">]*selm=[^ \">]*\\)" nil t)
+           "a href=/groups\\(\\?[^ \">]*selm=[^ \">]*\\)" nil t)

       (setq url
            (concat (nnweb-definition 'address)
                    (match-string 1)))
       (setq url
            (concat (nnweb-definition 'address)
                    (match-string 1)))


@@ -763,7 +763,7 @@ and `altavista'.")
        (goto-char (point-max))
        (widen)
        (skip-chars-forward "- \t"))
        (goto-char (point-max))
        (widen)
        (skip-chars-forward "- \t"))

-      (when (looking-at 
+      (when (looking-at

             "\\([0-9]+[/ ][A-Za-z]+[/ ][0-9]+\\)[ \t]*by[ \t]*\\([^<]*\\) - <a")
        (setq From (match-string 2)
              Date (match-string 1)))
             "\\([0-9]+[/ ][A-Za-z]+[/ ][0-9]+\\)[ \t]*by[ \t]*\\([^<]*\\) - <a")
        (setq From (match-string 2)
              Date (match-string 1)))


@@ -775,7 +775,7 @@ and `altavista'.")
          (incf (cdr active))
          (make-full-mail-header
           (cdr active) (if Newsgroups
          (incf (cdr active))
          (make-full-mail-header
           (cdr active) (if Newsgroups

-                           (concat  "(" Newsgroups ") " Subject) 
+                           (concat  "(" Newsgroups ") " Subject)

                          Subject)
           From Date Message-ID
           nil 0 0 url))
                          Subject)
           From Date Message-ID
           nil 0 0 url))


@@ -785,7 +785,7 @@ and `altavista'.")
 
 (defun nnweb-google-reference (id)
   (let ((map (nnweb-google-parse-1 id)) header)
 
 (defun nnweb-google-reference (id)
   (let ((map (nnweb-google-parse-1 id)) header)

-    (setq nnweb-articles 
+    (setq nnweb-articles

          (nconc nnweb-articles map))
     (when (setq header (cadar map))
       (mm-with-unibyte-current-buffer
          (nconc nnweb-articles map))
     (when (setq header (cadar map))
       (mm-with-unibyte-current-buffer

diff --git a/lisp/nnwfm.el b/lisp/nnwfm.el
index 130c689..ddf072b 100644 (file)
--- a/lisp/nnwfm.el
+++ b/lisp/nnwfm.el
@@ -56,7 +56,7 @@
 (defvoo nnwfm-groups nil)
 (defvoo nnwfm-headers nil)
 (defvoo nnwfm-articles nil)
 (defvoo nnwfm-groups nil)
 (defvoo nnwfm-headers nil)
 (defvoo nnwfm-articles nil)

-(defvar nnwfm-table-regexp 
+(defvar nnwfm-table-regexp

   "postings.*editpost\\|forumdisplay\\|Forum[0-9]+/HTML\\|getbio")
 
 ;;; Interface functions
   "postings.*editpost\\|forumdisplay\\|Forum[0-9]+/HTML\\|getbio")
 
 ;;; Interface functions


@@ -377,7 +377,7 @@
        nnwfm-groups-alist)
   (with-temp-file (expand-file-name "groups" nnwfm-directory)
     (prin1 nnwfm-groups-alist (current-buffer))))
        nnwfm-groups-alist)
   (with-temp-file (expand-file-name "groups" nnwfm-directory)
     (prin1 nnwfm-groups-alist (current-buffer))))

-    
+

 (defun nnwfm-init (server)
   "Initialize buffers and such."
   (unless (file-exists-p nnwfm-directory)
 (defun nnwfm-init (server)
   "Initialize buffers and such."
   (unless (file-exists-p nnwfm-directory)

diff --git a/lisp/qp.el b/lisp/qp.el
index 13882fd..8c3b828 100644 (file)
--- a/lisp/qp.el
+++ b/lisp/qp.el
@@ -65,7 +65,7 @@ coding-system."
                                            16)))
                   (insert byte)
                   (delete-char 3)
                                            16)))
                   (insert byte)
                   (delete-char 3)

-                  ;; Why backward-char??? 
+                  ;; Why backward-char???

                   ;;(unless (eq byte 61) ;; 61 is not ?= in XEmacs
                   ;;  (backward-char))
                   ))
                   ;;(unless (eq byte 61) ;; 61 is not ?= in XEmacs
                   ;;  (backward-char))
                   ))

diff --git a/lisp/rfc1843.el b/lisp/rfc1843.el
index c3bb790..87164ba 100644 (file)
--- a/lisp/rfc1843.el
+++ b/lisp/rfc1843.el
@@ -88,7 +88,7 @@ ftp://ftp.math.psu.edu/pub/simpson/chinese/hzp/hzp.doc"
                                          rfc1843-hzp-word-regexp
                                        rfc1843-word-regexp) (point-max) t)
              ;;; Text with extents may cause XEmacs crash
                                          rfc1843-hzp-word-regexp
                                        rfc1843-word-regexp) (point-max) t)
              ;;; Text with extents may cause XEmacs crash

-             (setq str (buffer-substring-no-properties 
+             (setq str (buffer-substring-no-properties

                         (match-beginning 1)
                         (match-end 1)))
              (setq firstc (aref str 0))
                         (match-beginning 1)
                         (match-end 1)))
              (setq firstc (aref str 0))


@@ -145,7 +145,7 @@ ftp://ftp.math.psu.edu/pub/simpson/chinese/hzp/hzp.doc"
                 (ct (message-fetch-field "Content-Type" t))
                 (ctl (and ct (ignore-errors
                                (mail-header-parse-content-type ct)))))
                 (ct (message-fetch-field "Content-Type" t))
                 (ctl (and ct (ignore-errors
                                (mail-header-parse-content-type ct)))))

-           (if (and ctl (not (string-match "/" (car ctl)))) 
+           (if (and ctl (not (string-match "/" (car ctl))))

                (setq ctl nil))
            (goto-char (point-max))
            (widen)
                (setq ctl nil))
            (goto-char (point-max))
            (widen)

diff --git a/lisp/rfc2045.el b/lisp/rfc2045.el
index 70c8c39..ba3116b 100644 (file)
--- a/lisp/rfc2045.el
+++ b/lisp/rfc2045.el
@@ -19,7 +19,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.

-  
+

 ;; RFC 2045 is: "Multipurpose Internet Mail Extensions (MIME) Part
 ;; One:  Format of Internet Message Bodies".
 
 ;; RFC 2045 is: "Multipurpose Internet Mail Extensions (MIME) Part
 ;; One:  Format of Internet Message Bodies".
 

diff --git a/lisp/rfc2047.el b/lisp/rfc2047.el
index 4b8cff9..d8263bb 100644 (file)
--- a/lisp/rfc2047.el
+++ b/lisp/rfc2047.el
@@ -427,7 +427,7 @@ The buffer may be narrowed."
        (while alist
          (when (looking-at (caar alist))
            (mm-with-unibyte-current-buffer-mule4
        (while alist
          (when (looking-at (caar alist))
            (mm-with-unibyte-current-buffer-mule4

-             (quoted-printable-encode-region 
+             (quoted-printable-encode-region

               (point-min) (point-max) nil (cdar alist)))
            (subst-char-in-region (point-min) (point-max) ?  ?_)
            (setq alist nil))
               (point-min) (point-max) nil (cdar alist)))
            (subst-char-in-region (point-min) (point-max) ?  ?_)
            (setq alist nil))

diff --git a/lisp/rfc2104.el b/lisp/rfc2104.el
index 64dbe53..5496a4f 100644 (file)
--- a/lisp/rfc2104.el
+++ b/lisp/rfc2104.el
@@ -53,7 +53,7 @@
 ;;; 2000-05-12  added sha-1 example, added test case reference
 
 ;;; Code:
 ;;; 2000-05-12  added sha-1 example, added test case reference
 
 ;;; Code:

- 
+

 (eval-when-compile (require 'cl))
 
 ;; Magic character for inner HMAC round. 0x36 == 54 == '6'
 (eval-when-compile (require 'cl))
 
 ;; Magic character for inner HMAC round. 0x36 == 54 == '6'


@@ -66,7 +66,7 @@
 (defconst rfc2104-zero ?\x00)
 
 ;; Alist for converting hex to decimal.
 (defconst rfc2104-zero ?\x00)
 
 ;; Alist for converting hex to decimal.

-(defconst rfc2104-hex-alist 
+(defconst rfc2104-hex-alist

   '((?0 . 0)         (?a . 10)       (?A . 10)
     (?1 . 1)         (?b . 11)       (?B . 11)
     (?2 . 2)         (?c . 12)       (?C . 12)
   '((?0 . 0)         (?a . 10)       (?A . 10)
     (?1 . 1)         (?b . 11)       (?B . 11)
     (?2 . 2)         (?c . 12)       (?C . 12)


@@ -95,7 +95,7 @@
 
 (defun rfc2104-hash (hash block-length hash-length key text)
   (let* (;; if key is longer than B, reset it to HASH(key)
 
 (defun rfc2104-hash (hash block-length hash-length key text)
   (let* (;; if key is longer than B, reset it to HASH(key)

-        (key (if (> (length key) block-length) 
+        (key (if (> (length key) block-length)

                  (funcall hash key) key))
         (k_ipad (append key nil))
         (k_opad (append key nil)))
                  (funcall hash key) key))
         (k_ipad (append key nil))
         (k_opad (append key nil)))

diff --git a/lisp/smiley-ems.el b/lisp/smiley-ems.el
index 8e0cae3..fd58d68 100644 (file)
--- a/lisp/smiley-ems.el
+++ b/lisp/smiley-ems.el
@@ -120,7 +120,7 @@ rgexp to replace with IMAGE.  IMAGE is the name of a PBM file in
              (overlay-put overlay
                           'help-echo "mouse-2: toggle smilies in buffer")
              (overlay-put overlay 'keymap smiley-mouse-map))))))
              (overlay-put overlay
                           'help-echo "mouse-2: toggle smilies in buffer")
              (overlay-put overlay 'keymap smiley-mouse-map))))))

-        (setq smiley-active t)))
+    (setq smiley-active t)))

 
 (defun smiley-toggle-buffer (&optional arg)
   "Toggle displaying smiley faces.
 
 (defun smiley-toggle-buffer (&optional arg)
   "Toggle displaying smiley faces.

diff --git a/lisp/smiley.el b/lisp/smiley.el
index 15f3ec9..9d08378 100644 (file)
--- a/lisp/smiley.el
+++ b/lisp/smiley.el
@@ -51,7 +51,7 @@
   :group 'gnus-visual)
 
 ;; FIXME: Where is the directory when using Emacs?
   :group 'gnus-visual)
 
 ;; FIXME: Where is the directory when using Emacs?

-(defcustom smiley-data-directory 
+(defcustom smiley-data-directory

   (if (featurep 'xemacs)
     (message-xmas-find-glyph-directory "smilies")
     "/usr/local/lib/xemacs/xemacs-packages/etc/smilies")
   (if (featurep 'xemacs)
     (message-xmas-find-glyph-directory "smilies")
     "/usr/local/lib/xemacs/xemacs-packages/etc/smilies")


@@ -334,7 +334,7 @@ Mouse button3 - menu"))
        (dolist (overlay (overlays-in (or st (point-min))
                                      (or nd (point-max))))
          (when (overlay-get overlay 'smiley)
        (dolist (overlay (overlays-in (or st (point-min))
                                      (or nd (point-max))))
          (when (overlay-get overlay 'smiley)

-           (remove-text-properties (overlay-start overlay)  
+           (remove-text-properties (overlay-start overlay)

                                    (overlay-end overlay) '(display))
            (delete-overlay overlay)))
        (goto-char (or st (point-min)))
                                    (overlay-end overlay) '(display))
            (delete-overlay overlay)))
        (goto-char (or st (point-min)))


@@ -399,7 +399,7 @@ With arg, turn displaying on if and only if arg is positive."
 ;; FIXME: make it work as the one in XEmacs.
 (defun smiley-toggle-buffer-ems (&optional arg buffer st nd)
   "Toggle displaying smiley faces.
 ;; FIXME: make it work as the one in XEmacs.
 (defun smiley-toggle-buffer-ems (&optional arg buffer st nd)
   "Toggle displaying smiley faces.

-With arg, turn displaying on if and only if arg is positive." 
+With arg, turn displaying on if and only if arg is positive."

   (interactive "P")
   (save-excursion
     (when buffer
   (interactive "P")
   (save-excursion
     (when buffer


@@ -408,7 +408,7 @@ With arg, turn displaying on if and only if arg is positive."
       (dolist (overlay (overlays-in (or st (point-min))
                                    (or nd (point-max))))
        (when (overlay-get overlay 'smiley)
       (dolist (overlay (overlays-in (or st (point-min))
                                    (or nd (point-max))))
        (when (overlay-get overlay 'smiley)

-         (remove-text-properties (overlay-start overlay)  
+         (remove-text-properties (overlay-start overlay)

                                  (overlay-end overlay) '(display))
          (setq found t)))
       (unless found
                                  (overlay-end overlay) '(display))
          (setq found t)))
       (unless found

diff --git a/lisp/smime.el b/lisp/smime.el
index 9b88f6c..fb5ac73 100644 (file)
--- a/lisp/smime.el
+++ b/lisp/smime.el
@@ -177,7 +177,7 @@ and the files themself should be in PEM format."
                 (const :tag "RC2 64 bits" "-rc2-64")
                 (const :tag "RC2 128 bits" "-rc2-128"))
   :group 'smime)
                 (const :tag "RC2 64 bits" "-rc2-64")
                 (const :tag "RC2 128 bits" "-rc2-128"))
   :group 'smime)

-  
+

 (defcustom smime-dns-server nil
   "DNS server to query certificates from.
 If nil, use system defaults."
 (defcustom smime-dns-server nil
   "DNS server to query certificates from.
 If nil, use system defaults."


@@ -229,7 +229,7 @@ to include in its caar."
     (if passphrase
        (setenv "GNUS_SMIME_PASSPHRASE" passphrase))
     (prog1
     (if passphrase
        (setenv "GNUS_SMIME_PASSPHRASE" passphrase))
     (prog1

-       (when (apply 'smime-call-openssl-region b e buffer "smime" "-sign" 
+       (when (apply 'smime-call-openssl-region b e buffer "smime" "-sign"

                     "-signer" (expand-file-name keyfile)
                     (append
                      (smime-make-certfiles certfiles)
                     "-signer" (expand-file-name keyfile)
                     (append
                      (smime-make-certfiles certfiles)


@@ -338,7 +338,7 @@ nil."
     (if passphrase
        (setenv "GNUS_SMIME_PASSPHRASE" passphrase))
     (when (apply 'smime-call-openssl-region
     (if passphrase
        (setenv "GNUS_SMIME_PASSPHRASE" passphrase))
     (when (apply 'smime-call-openssl-region

-                b e buffer "smime" "-decrypt" 
+                b e buffer "smime" "-decrypt"

                 "-recip" keyfile
                 (if passphrase
                     (list "-passin" "env:GNUS_SMIME_PASSPHRASE" )))
                 "-recip" keyfile
                 (if passphrase
                     (list "-passin" "env:GNUS_SMIME_PASSPHRASE" )))