Commit c9fc72fa authored by Lars Magne Ingebrigtsen's avatar Lars Magne Ingebrigtsen Committed by Katsumi Yamaoka
Browse files

Delete all trailing white space.

parent 36a806f3
......@@ -95,7 +95,7 @@
(let* ((elems (cdr (assq type ecomplete-database)))
(match (regexp-quote match))
(candidates
(sort
(sort
(loop for (key count time text) in elems
when (string-match match text)
collect (list count time text))
......
......@@ -1788,7 +1788,7 @@ and that there are no duplicates."
(while alist
(let ((entry (pop alist)))
(when (gnus-methods-equal-p gnus-command-method (gnus-info-method entry))
(gnus-agent-flush-group (gnus-info-group entry)))))))
(gnus-agent-flush-group (gnus-info-group entry)))))))
(defun gnus-agent-flush-group (group)
"Flush the agent's index files such that the GROUP no longer
......@@ -2162,13 +2162,13 @@ doesn't exist, to valid the overview buffer."
(gnus-agent-save-alist gnus-agent-read-agentview)))
alist))
((end-of-file file-error)
;; The agentview file is missing.
;; The agentview file is missing.
(condition-case nil
;; If the agent directory exists, attempt to perform a brute-force
;; reconstruction of its contents.
(let* (alist
(file-name-coding-system nnmail-pathname-coding-system)
(file-attributes (directory-files-and-attributes
(file-attributes (directory-files-and-attributes
(gnus-agent-article-name ""
gnus-agent-read-agentview) nil "^[0-9]+$" t)))
(while file-attributes
......@@ -3258,7 +3258,7 @@ FORCE is equivalent to setting the expiration predicates to true."
(gnus-message 7 "gnus-agent-expire: Loading overview...")
(nnheader-insert-file-contents nov-file)
(goto-char (point-min))
(let (p)
(while (< (setq p (point)) (point-max))
(condition-case nil
......
......@@ -868,7 +868,7 @@ supported."
(while (setq file (pop files))
(setq attrs (file-attributes file))
(unless (nth 0 attrs)
(incf size (float (nth 7 attrs)))))))
(incf size (float (nth 7 attrs)))))))
(setq gnus-cache-need-update-total-fetched-for t)
......@@ -879,10 +879,10 @@ supported."
(gnus-cache-with-refreshed-group
group
(let* ((entry (or (gnus-gethash group gnus-cache-total-fetched-hashtb)
(gnus-sethash group (make-list 2 0)
(gnus-sethash group (make-list 2 0)
gnus-cache-total-fetched-hashtb)))
(file-name-coding-system nnmail-pathname-coding-system)
(size (or (nth 7 (file-attributes
(size (or (nth 7 (file-attributes
(or file
(gnus-cache-file-name group ".overview"))))
0)))
......@@ -911,7 +911,7 @@ supported."
(if entry
(apply '+ entry)
(let ((gnus-cache-inhibit-update-total-fetched-for (not no-inhibit)))
(+
(+
(gnus-cache-update-overview-total-fetched-for group nil)
(gnus-cache-update-file-total-fetched-for group nil)))))))
......
......@@ -204,7 +204,7 @@ If ARG is non-nil, open it in a new buffer."
(setq method
(cdr (assoc 'viewer
(car (mailcap-mime-info mime-type
'all
'all
'no-decode)))))))
(let ((view-command (mm-mailcap-command method file-name nil)))
(message "viewing via %s" view-command)
......
......@@ -84,7 +84,7 @@ fit these criteria."
(not (eq charset 'ascii)))
(mm-decode-coding-region (point-min) (point-max) charset))
(call-process-region (point-min) (point-max)
"w3m"
"w3m"
nil article-buffer nil
"-halfdump"
"-no-cookie"
......@@ -328,7 +328,7 @@ fit these criteria."
(push (gnus-html-image-id url) urls)
(push "-o" urls)))))
(let ((process
(apply 'start-process
(apply 'start-process
"images" nil "curl"
"-s" "--create-dirs"
"--location"
......
......@@ -187,7 +187,7 @@ LIST1 and LIST2 have to be sorted over <."
RANGE1 and RANGE2 have to be sorted over <."
(let* (out
(min1 (car range1))
(max1 (if (numberp min1)
(max1 (if (numberp min1)
(if (numberp (cdr range1))
(prog1 (cdr range1)
(setq range1 nil)) min1)
......@@ -196,8 +196,8 @@ RANGE1 and RANGE2 have to be sorted over <."
(min2 (car range2))
(max2 (if (numberp min2)
(if (numberp (cdr range2))
(prog1 (cdr range2)
(setq range2 nil)) min2)
(prog1 (cdr range2)
(setq range2 nil)) min2)
(prog1 (cdr min2)
(setq min2 (car min2))))))
(setq range1 (cdr range1)
......
;;; gnus-registry.el --- article registry for Gnus
;;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
;;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
;;; Free Software Foundation, Inc.
;; Author: Ted Zlatanov <tzz@lifelogs.com>
......@@ -72,7 +72,7 @@
:version "22.1"
:group 'gnus)
(defvar gnus-registry-hashtb (make-hash-table
(defvar gnus-registry-hashtb (make-hash-table
:size 256
:test 'equal)
"*The article registry by Message ID.")
......@@ -97,7 +97,7 @@
"List of registry marks and their options.
`gnus-registry-mark-article' will offer symbols from this list
for completion.
for completion.
Each entry must have a character to be useful for summary mode
line display and for keyboard shortcuts.
......@@ -121,7 +121,7 @@ display."
:group 'gnus-registry
:type 'symbol)
(defcustom gnus-registry-unfollowed-groups
(defcustom gnus-registry-unfollowed-groups
'("delayed$" "drafts$" "queue$" "INBOX$")
"List of groups that gnus-registry-split-fancy-with-parent won't return.
The group names are matched, they don't have to be fully
......@@ -206,9 +206,9 @@ considered precious) will not be trimmed."
:group 'gnus-registry
:type '(repeat symbol))
(defcustom gnus-registry-cache-file
(nnheader-concat
(or gnus-dribble-directory gnus-home-directory "~/")
(defcustom gnus-registry-cache-file
(nnheader-concat
(or gnus-dribble-directory gnus-home-directory "~/")
".gnus.registry.eld")
"File where the Gnus registry will be stored."
:group 'gnus-registry
......@@ -253,7 +253,7 @@ considered precious) will not be trimmed."
(if gnus-save-startup-file-via-temp-buffer
(let ((coding-system-for-write gnus-ding-file-coding-system)
(standard-output (current-buffer)))
(gnus-gnus-to-quick-newsrc-format
(gnus-gnus-to-quick-newsrc-format
t "gnus registry startup file" 'gnus-registry-alist)
(gnus-registry-cache-whitespace file)
(save-buffer))
......@@ -276,7 +276,7 @@ considered precious) will not be trimmed."
(unwind-protect
(progn
(gnus-with-output-to-file working-file
(gnus-gnus-to-quick-newsrc-format
(gnus-gnus-to-quick-newsrc-format
t "gnus registry startup file" 'gnus-registry-alist))
;; These bindings will mislead the current buffer
......@@ -326,7 +326,7 @@ considered precious) will not be trimmed."
(when gnus-registry-clean-empty
(gnus-registry-clean-empty-function))
;; now trim and clean text properties from the registry appropriately
(setq gnus-registry-alist
(setq gnus-registry-alist
(gnus-registry-remove-alist-text-properties
(gnus-registry-trim
(gnus-hashtable-to-alist
......@@ -346,7 +346,7 @@ considered precious) will not be trimmed."
(dolist (group (gnus-registry-fetch-groups key))
(when (gnus-parameter-registry-ignore group)
(gnus-message
10
10
"gnus-registry: deleted ignored group %s from key %s"
group key)
(gnus-registry-delete-group key group)))
......@@ -361,14 +361,14 @@ considered precious) will not be trimmed."
(gnus-registry-fetch-extra key 'label))
(incf count)
(gnus-registry-delete-id key))
(unless (stringp key)
(gnus-message
10
"gnus-registry key %s was not a string, removing"
(gnus-message
10
"gnus-registry key %s was not a string, removing"
key)
(gnus-registry-delete-id key))))
gnus-registry-hashtb)
count))
......@@ -391,7 +391,7 @@ considered precious) will not be trimmed."
(defun gnus-registry-trim (alist)
"Trim alist to size, using gnus-registry-max-entries.
Any entries with extra data (marks, currently) are left alone."
(if (null gnus-registry-max-entries)
(if (null gnus-registry-max-entries)
alist ; just return the alist
;; else, when given max-entries, trim the alist
(let* ((timehash (make-hash-table
......@@ -420,25 +420,25 @@ Any entries with extra data (marks, currently) are left alone."
(push item precious-list)
(push item junk-list))))
(sort
(sort
junk-list
(lambda (a b)
(let ((t1 (or (cdr (gethash (car a) timehash))
(let ((t1 (or (cdr (gethash (car a) timehash))
'(0 0 0)))
(t2 (or (cdr (gethash (car b) timehash))
(t2 (or (cdr (gethash (car b) timehash))
'(0 0 0))))
(time-less-p t1 t2))))
;; we use the return value of this setq, which is the trimmed alist
(setq alist (append precious-list
(nthcdr trim-length junk-list))))))
(defun gnus-registry-action (action data-header from &optional to method)
(let* ((id (mail-header-id data-header))
(subject (gnus-string-remove-all-properties
(gnus-registry-simplify-subject
(mail-header-subject data-header))))
(sender (gnus-string-remove-all-properties
(sender (gnus-string-remove-all-properties
(mail-header-from data-header)))
(from (gnus-group-guess-full-name-from-command-method from))
(to (if to (gnus-group-guess-full-name-from-command-method to) nil))
......@@ -489,7 +489,7 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
(let* ((refstr (or (message-fetch-field "references") "")) ; guaranteed
(reply-to (message-fetch-field "in-reply-to")) ; may be nil
;; now, if reply-to is valid, append it to the References
(refstr (if reply-to
(refstr (if reply-to
(concat refstr " " reply-to)
refstr))
;; these may not be used, but the code is cleaner having them up here
......@@ -517,8 +517,8 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
9
"%s is looking for matches for reference %s from [%s]"
log-agent reference refstr)
(dolist (group (gnus-registry-fetch-groups
reference
(dolist (group (gnus-registry-fetch-groups
reference
gnus-registry-max-track-groups))
(when (and group (gnus-registry-follow-group-p group))
(gnus-message
......@@ -528,9 +528,9 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
(push group found))))
;; filter the found groups and return them
;; the found groups are the full groups
(setq found (gnus-registry-post-process-groups
(setq found (gnus-registry-post-process-groups
"references" refstr found found)))
;; else: there were no matches, now try the extra tracking by sender
((and (gnus-registry-track-sender-p)
sender
......@@ -543,7 +543,7 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
matches)
(when (and this-sender
(equal sender this-sender))
(let ((groups (gnus-registry-fetch-groups
(let ((groups (gnus-registry-fetch-groups
key
gnus-registry-max-track-groups)))
(dolist (group groups)
......@@ -558,9 +558,9 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
gnus-registry-hashtb)
;; filter the found groups and return them
;; the found groups are NOT the full groups
(setq found (gnus-registry-post-process-groups
(setq found (gnus-registry-post-process-groups
"sender" sender found found-full)))
;; else: there were no matches, now try the extra tracking by subject
((and (gnus-registry-track-subject-p)
subject
......@@ -572,7 +572,7 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
matches)
(when (and this-subject
(equal subject this-subject))
(let ((groups (gnus-registry-fetch-groups
(let ((groups (gnus-registry-fetch-groups
key
gnus-registry-max-track-groups)))
(dolist (group groups)
......@@ -587,7 +587,7 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
gnus-registry-hashtb)
;; filter the found groups and return them
;; the found groups are NOT the full groups
(setq found (gnus-registry-post-process-groups
(setq found (gnus-registry-post-process-groups
"subject" subject found found-full))))
;; after the (cond) we extract the actual value safely
(car-safe found)))
......@@ -627,7 +627,7 @@ necessary."
(lambda (a b)
(> (gethash a freq 0)
(gethash b freq 0)))))))))
(if gnus-registry-use-long-group-names
(dolist (group groups)
(let ((m1 (gnus-find-method-for-group group))
......@@ -708,8 +708,8 @@ Consults `gnus-registry-unfollowed-groups' and
(unless (member gnus-newsgroup-name (gnus-registry-fetch-groups id))
(gnus-message 9 "Registry: Registering article %d with group %s"
article gnus-newsgroup-name)
(gnus-registry-add-group
id
(gnus-registry-add-group
id
gnus-newsgroup-name
(gnus-registry-fetch-simplified-message-subject-fast article)
(gnus-registry-fetch-sender-fast article)))))))
......@@ -785,18 +785,18 @@ Uses `gnus-registry-marks' to find what shortcuts to install."
(shortcut (if remove (upcase shortcut) shortcut)))
(unintern function-name)
(eval
`(defun
`(defun
;; function name
,(intern function-name)
,(intern function-name)
;; parameter definition
(&rest articles)
;; documentation
,(format
,(format
"%s the %s mark over process-marked ARTICLES."
(upcase-initials variant-name)
mark)
;; interactive definition
(interactive
(interactive
(gnus-summary-work-articles current-prefix-arg))
;; actual code
......@@ -807,49 +807,49 @@ Uses `gnus-registry-marks' to find what shortcuts to install."
;; now the user is asked if gnus-registry-install is 'ask
(when (gnus-registry-install-p)
(gnus-registry-set-article-mark-internal
(gnus-registry-set-article-mark-internal
;; all this just to get the mark, I must be doing it wrong
(intern ,(symbol-name mark))
articles ,remove t)
(gnus-message
9
9
"Applying mark %s to %d articles"
,(symbol-name mark) (length articles))
(dolist (article articles)
(gnus-summary-update-article
(gnus-summary-update-article
article
(assoc article (gnus-data-list nil)))))))
(push (intern function-name) keys-plist)
(push shortcut keys-plist)
(push shortcut keys-plist)
(push (vector (format "%s %s"
(upcase-initials variant-name)
(symbol-name mark))
(intern function-name) t)
gnus-registry-misc-menus)
(gnus-message
9
"Defined mark handling function %s"
9
"Defined mark handling function %s"
function-name))))))
(gnus-define-keys-1
'(gnus-registry-mark-map "M" gnus-summary-mark-map)
keys-plist)
(add-hook 'gnus-summary-menu-hook
(lambda ()
(easy-menu-add-item
(easy-menu-add-item
gnus-summary-misc-menu
nil
nil
(cons "Registry Marks" gnus-registry-misc-menus))))))
;;; use like this:
;;; (defalias 'gnus-user-format-function-M
;;; (defalias 'gnus-user-format-function-M
;;; 'gnus-registry-user-format-function-M)
(defun gnus-registry-user-format-function-M (headers)
(let* ((id (mail-header-message-id headers))
(marks (when id (gnus-registry-fetch-extra-marks id))))
(apply 'concat (mapcar (lambda(mark)
(let ((c
(let ((c
(plist-get
(cdr-safe
(cdr-safe
(assoc mark gnus-registry-marks))
:char)))
(if c
......@@ -859,9 +859,9 @@ Uses `gnus-registry-marks' to find what shortcuts to install."
(defun gnus-registry-read-mark ()
"Read a mark name from the user with completion."
(let ((mark (gnus-completing-read-with-default
(let ((mark (gnus-completing-read-with-default
(symbol-name gnus-registry-default-mark)
"Label"
"Label"
(mapcar (lambda (x) ; completion list
(cons (symbol-name (car-safe x)) (car-safe x)))
gnus-registry-marks))))
......@@ -896,7 +896,7 @@ Uses `gnus-registry-marks' to find what shortcuts to install."
(gnus-message 1 "%s mark %s with message ID %s, resulting in %S"
(if remove "Removing" "Adding")
mark id new-marks))
(apply 'gnus-registry-store-extra-marks ; set the extra marks
id ; for the message ID
new-marks)))))
......@@ -1007,7 +1007,7 @@ The message must have at least one group name."
"Put a specific entry in the extras field of the registry entry for id."
(let* ((extra (gnus-registry-fetch-extra id))
;; all the entries except the one for `key'
(the-rest (gnus-assq-delete-all key (gnus-registry-fetch-extra id)))
(the-rest (gnus-assq-delete-all key (gnus-registry-fetch-extra id)))
(alist (if value
(gnus-registry-remove-alist-text-properties
(cons (cons key value)
......@@ -1034,7 +1034,7 @@ Returns the first place where the trail finds a group name."
(dolist (crumb trail)
(when (stringp crumb)
;; push the group name into the list
(setq
(setq
groups
(cons
(if (or (not (stringp crumb)) gnus-registry-use-long-group-names)
......
......@@ -765,7 +765,7 @@ prompt the user for the name of an NNTP server to use."
(when gnus-select-method
(push (cons "native" gnus-select-method)
gnus-predefined-server-alist))
(if gnus-agent
(gnus-agentize))
......
......@@ -466,10 +466,10 @@ the `mail-source-keyword-map' variable."
;; 1) the auth-sources user and password override everything
;; 2) it avoids macros, so it's cleaner
;; 3) it falls through to the mail-sources and then default values
(cond
(cond
((and
(eq keyword :user)
(setq user-auth
(setq user-auth
(nth 0 (auth-source-user-or-password
'("login" "password")
;; this is "host" in auth-sources
......
......@@ -6687,7 +6687,7 @@ want to get rid of this query permanently.")))
(setq recipients (delq recip recipients))))))))
(setq recipients (message-prune-recipients recipients))
;; Build the header alist. Allow the user to be asked whether
;; or not to reply to all recipients in a wide reply.
(setq follow-to (list (cons 'To (cdr (pop recipients)))))
......@@ -6704,7 +6704,7 @@ want to get rid of this query permanently.")))
(defun message-prune-recipients (recipients)
(dolist (rule message-prune-recipient-rules)
(let ((match (car rule))
dup-match
dup-match
address)
(dolist (recipient recipients)
(setq address (car recipient))
......
......@@ -441,7 +441,7 @@ apply the face `mm-uu-extract'."
(defun mm-uu-yenc-extract ()
;; This might not be exactly correct, but we sure can't get the
;; binary data from the article buffer, since that's already in a
;; non-binary charset. So get it from the original article buffer.
;; non-binary charset. So get it from the original article buffer.
(mm-make-handle (with-current-buffer gnus-original-article-buffer
(mm-uu-copy-to-buffer start-point end-point))
(list (or (and file-name
......
......@@ -121,7 +121,7 @@
(deffoo nnagent-request-set-mark (group action server)
(mm-with-unibyte-buffer
(insert "(gnus-agent-synchronize-group-flags \""
group
group
"\" '")
(gnus-pp action)
(insert " \""
......@@ -151,7 +151,7 @@
;; Assume that articles with smaller numbers than the first one
;; Agent knows are gone.
(setq first (caar gnus-agent-article-alist))
(when first
(when first
(while (and arts (< (car arts) first))
(pop arts)))
(set-buffer nntp-server-buffer)
......
......@@ -344,7 +344,7 @@
(while (re-search-backward "^X-Gnus-Newsgroup: " beg t)
(delete-region (point) (progn (forward-line 1) (point)))))
(when nnmail-cache-accepted-message-ids
(nnmail-cache-insert (nnmail-fetch-field "message-id")
(nnmail-cache-insert (nnmail-fetch-field "message-id")
group
(nnmail-fetch-field "subject")
(nnmail-fetch-field "from")))
......@@ -363,7 +363,7 @@
(insert-buffer-substring buf)
(when last
(when nnmail-cache-accepted-message-ids
(nnmail-cache-insert (nnmail-fetch-field "message-id")
(nnmail-cache-insert (nnmail-fetch-field "message-id")
group
(nnmail-fetch-field "subject")
(nnmail-fetch-field "from")))
......
......@@ -100,7 +100,7 @@ from the document.")
(head-end . "^\t")
(generate-head-function . nndoc-generate-clari-briefs-head)
(article-transform-function . nndoc-transform-clari-briefs))
(standard-digest
(first-article . ,(concat "^" (make-string 70 ?-) "\n *\n+"))
(article-begin . ,(concat "^\n" (make-string 30 ?-) "\n *\n+"))
......
......@@ -202,7 +202,7 @@ are generated if and only if they are also in `message-draft-headers'.")
'nnmh-request-group
(list group server dont-check)))
(deffoo nndraft-request-move-article (article group server accept-form
(deffoo nndraft-request-move-article (article group server accept-form
&optional last move-is-internal)
(nndraft-possibly-change-group group)
(let ((buf (get-buffer-create " *nndraft move*"))
......
......@@ -494,7 +494,7 @@ the group. Then the marks file will be regenerated properly by Gnus.")
(nnfolder-save-active nnfolder-group-alist nnfolder-active-file)
(gnus-sorted-difference articles (nreverse deleted-articles)))))
(deffoo nnfolder-request-move-article (article group server accept-form
(deffoo nnfolder-request-move-article (article group server accept-form
&optional last move-is-internal)
(save-excursion
(let ((buf (get-buffer-create " *nnfolder move*"))
......@@ -552,7 +552,7 @@ the group. Then the marks file will be regenerated properly by Gnus.")
(while (re-search-backward (concat "^" nnfolder-article-marker) nil t)
(delete-region (point) (progn (forward-line 1) (point))))
(when nnmail-cache-accepted-message-ids
(nnmail-cache-insert (nnmail-fetch-field "message-id")
(nnmail-cache-insert (nnmail-fetch-field "message-id")
group
(nnmail-fetch-field "subject")
(nnmail-fetch-field "from")))
......
......@@ -792,7 +792,7 @@ and show thread that contains this article."
(setq novitem (funcall nnir-get-article-nov-override-function
artitem))
;; else, set novitem through nnheader-parse-nov/nnheader-parse-head
(case (setq foo (gnus-retrieve-headers (list artno)
(case (setq foo (gnus-retrieve-headers (list artno)
artfullgroup nil))
(nov
(goto-char (point-min))
......
......@@ -556,7 +556,7 @@ Other back ends might or might not work.")
(mapcar
(lambda (arg) (- arg numcorr))
articles)))
(setq rval
(setq rval
(if (eq nnmairix-backend 'nnimap)
(let ((gnus-nov-is-evil t))
(nnmairix-call-backend
......
......@@ -287,7 +287,7 @@ as unread by Gnus.")
(deffoo nnmh-close-group (group &optional server)
t)
(deffoo nnmh-request-move-article (article group server accept-form
(deffoo nnmh-request-move-article (article group server accept-form
&optional last move-is-internal)
(let ((buf (get-buffer-create " *nnmh move*"))
result)
......@@ -312,7 +312,7 @@ as unread by Gnus.")
(nnmh-possibly-change-directory group server)