aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2010-09-02 01:42:32 +0000
committerKatsumi Yamaoka2010-09-02 01:42:32 +0000
commitc9fc72fa5acddcdc670a2eb89a777f48fb031820 (patch)
tree32bcbc2b4fe4797bc8469b3aea4c11b3021ad7fd /lisp
parent36a806f35776e884b6228f72030993284789c785 (diff)
downloademacs-c9fc72fa5acddcdc670a2eb89a777f48fb031820.tar.gz
emacs-c9fc72fa5acddcdc670a2eb89a777f48fb031820.zip
Delete all trailing white space.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/gnus/ecomplete.el2
-rw-r--r--lisp/gnus/gnus-agent.el8
-rw-r--r--lisp/gnus/gnus-cache.el8
-rw-r--r--lisp/gnus/gnus-dired.el2
-rw-r--r--lisp/gnus/gnus-html.el4
-rw-r--r--lisp/gnus/gnus-range.el6
-rw-r--r--lisp/gnus/gnus-registry.el110
-rw-r--r--lisp/gnus/gnus-start.el2
-rw-r--r--lisp/gnus/mail-source.el4
-rw-r--r--lisp/gnus/message.el4
-rw-r--r--lisp/gnus/mm-uu.el2
-rw-r--r--lisp/gnus/nnagent.el4
-rw-r--r--lisp/gnus/nnbabyl.el4
-rw-r--r--lisp/gnus/nndoc.el2
-rw-r--r--lisp/gnus/nndraft.el2
-rw-r--r--lisp/gnus/nnfolder.el4
-rw-r--r--lisp/gnus/nnir.el2
-rw-r--r--lisp/gnus/nnmairix.el2
-rw-r--r--lisp/gnus/nnmh.el4
-rw-r--r--lisp/gnus/nntp.el6
-rw-r--r--lisp/gnus/pop3.el8
-rw-r--r--lisp/gnus/sieve-manage.el2
-rw-r--r--lisp/gnus/spam-report.el4
-rw-r--r--lisp/net/dns.el2
-rw-r--r--lisp/net/imap.el2
-rw-r--r--lisp/net/netrc.el6
-rw-r--r--lisp/net/ntlm.el6
-rw-r--r--lisp/net/sasl-digest.el4
28 files changed, 108 insertions, 108 deletions
diff --git a/lisp/gnus/ecomplete.el b/lisp/gnus/ecomplete.el
index 45fbcf902a2..1e9769f757d 100644
--- a/lisp/gnus/ecomplete.el
+++ b/lisp/gnus/ecomplete.el
@@ -95,7 +95,7 @@
95 (let* ((elems (cdr (assq type ecomplete-database))) 95 (let* ((elems (cdr (assq type ecomplete-database)))
96 (match (regexp-quote match)) 96 (match (regexp-quote match))
97 (candidates 97 (candidates
98 (sort 98 (sort
99 (loop for (key count time text) in elems 99 (loop for (key count time text) in elems
100 when (string-match match text) 100 when (string-match match text)
101 collect (list count time text)) 101 collect (list count time text))
diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el
index adc6be82184..71ebfb59aff 100644
--- a/lisp/gnus/gnus-agent.el
+++ b/lisp/gnus/gnus-agent.el
@@ -1788,7 +1788,7 @@ and that there are no duplicates."
1788 (while alist 1788 (while alist
1789 (let ((entry (pop alist))) 1789 (let ((entry (pop alist)))
1790 (when (gnus-methods-equal-p gnus-command-method (gnus-info-method entry)) 1790 (when (gnus-methods-equal-p gnus-command-method (gnus-info-method entry))
1791 (gnus-agent-flush-group (gnus-info-group entry))))))) 1791 (gnus-agent-flush-group (gnus-info-group entry)))))))
1792 1792
1793(defun gnus-agent-flush-group (group) 1793(defun gnus-agent-flush-group (group)
1794 "Flush the agent's index files such that the GROUP no longer 1794 "Flush the agent's index files such that the GROUP no longer
@@ -2162,13 +2162,13 @@ doesn't exist, to valid the overview buffer."
2162 (gnus-agent-save-alist gnus-agent-read-agentview))) 2162 (gnus-agent-save-alist gnus-agent-read-agentview)))
2163 alist)) 2163 alist))
2164 ((end-of-file file-error) 2164 ((end-of-file file-error)
2165 ;; The agentview file is missing. 2165 ;; The agentview file is missing.
2166 (condition-case nil 2166 (condition-case nil
2167 ;; If the agent directory exists, attempt to perform a brute-force 2167 ;; If the agent directory exists, attempt to perform a brute-force
2168 ;; reconstruction of its contents. 2168 ;; reconstruction of its contents.
2169 (let* (alist 2169 (let* (alist
2170 (file-name-coding-system nnmail-pathname-coding-system) 2170 (file-name-coding-system nnmail-pathname-coding-system)
2171 (file-attributes (directory-files-and-attributes 2171 (file-attributes (directory-files-and-attributes
2172 (gnus-agent-article-name "" 2172 (gnus-agent-article-name ""
2173 gnus-agent-read-agentview) nil "^[0-9]+$" t))) 2173 gnus-agent-read-agentview) nil "^[0-9]+$" t)))
2174 (while file-attributes 2174 (while file-attributes
@@ -3258,7 +3258,7 @@ FORCE is equivalent to setting the expiration predicates to true."
3258 (gnus-message 7 "gnus-agent-expire: Loading overview...") 3258 (gnus-message 7 "gnus-agent-expire: Loading overview...")
3259 (nnheader-insert-file-contents nov-file) 3259 (nnheader-insert-file-contents nov-file)
3260 (goto-char (point-min)) 3260 (goto-char (point-min))
3261 3261
3262 (let (p) 3262 (let (p)
3263 (while (< (setq p (point)) (point-max)) 3263 (while (< (setq p (point)) (point-max))
3264 (condition-case nil 3264 (condition-case nil
diff --git a/lisp/gnus/gnus-cache.el b/lisp/gnus/gnus-cache.el
index 6043f26e3df..e3f33be8819 100644
--- a/lisp/gnus/gnus-cache.el
+++ b/lisp/gnus/gnus-cache.el
@@ -868,7 +868,7 @@ supported."
868 (while (setq file (pop files)) 868 (while (setq file (pop files))
869 (setq attrs (file-attributes file)) 869 (setq attrs (file-attributes file))
870 (unless (nth 0 attrs) 870 (unless (nth 0 attrs)
871 (incf size (float (nth 7 attrs))))))) 871 (incf size (float (nth 7 attrs)))))))
872 872
873 (setq gnus-cache-need-update-total-fetched-for t) 873 (setq gnus-cache-need-update-total-fetched-for t)
874 874
@@ -879,10 +879,10 @@ supported."
879 (gnus-cache-with-refreshed-group 879 (gnus-cache-with-refreshed-group
880 group 880 group
881 (let* ((entry (or (gnus-gethash group gnus-cache-total-fetched-hashtb) 881 (let* ((entry (or (gnus-gethash group gnus-cache-total-fetched-hashtb)
882 (gnus-sethash group (make-list 2 0) 882 (gnus-sethash group (make-list 2 0)
883 gnus-cache-total-fetched-hashtb))) 883 gnus-cache-total-fetched-hashtb)))
884 (file-name-coding-system nnmail-pathname-coding-system) 884 (file-name-coding-system nnmail-pathname-coding-system)
885 (size (or (nth 7 (file-attributes 885 (size (or (nth 7 (file-attributes
886 (or file 886 (or file
887 (gnus-cache-file-name group ".overview")))) 887 (gnus-cache-file-name group ".overview"))))
888 0))) 888 0)))
@@ -911,7 +911,7 @@ supported."
911 (if entry 911 (if entry
912 (apply '+ entry) 912 (apply '+ entry)
913 (let ((gnus-cache-inhibit-update-total-fetched-for (not no-inhibit))) 913 (let ((gnus-cache-inhibit-update-total-fetched-for (not no-inhibit)))
914 (+ 914 (+
915 (gnus-cache-update-overview-total-fetched-for group nil) 915 (gnus-cache-update-overview-total-fetched-for group nil)
916 (gnus-cache-update-file-total-fetched-for group nil))))))) 916 (gnus-cache-update-file-total-fetched-for group nil)))))))
917 917
diff --git a/lisp/gnus/gnus-dired.el b/lisp/gnus/gnus-dired.el
index 4f812c414c5..f9502b43c06 100644
--- a/lisp/gnus/gnus-dired.el
+++ b/lisp/gnus/gnus-dired.el
@@ -204,7 +204,7 @@ If ARG is non-nil, open it in a new buffer."
204 (setq method 204 (setq method
205 (cdr (assoc 'viewer 205 (cdr (assoc 'viewer
206 (car (mailcap-mime-info mime-type 206 (car (mailcap-mime-info mime-type
207 'all 207 'all
208 'no-decode))))))) 208 'no-decode)))))))
209 (let ((view-command (mm-mailcap-command method file-name nil))) 209 (let ((view-command (mm-mailcap-command method file-name nil)))
210 (message "viewing via %s" view-command) 210 (message "viewing via %s" view-command)
diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el
index 5bbf5d5893b..6824fbf7d39 100644
--- a/lisp/gnus/gnus-html.el
+++ b/lisp/gnus/gnus-html.el
@@ -84,7 +84,7 @@ fit these criteria."
84 (not (eq charset 'ascii))) 84 (not (eq charset 'ascii)))
85 (mm-decode-coding-region (point-min) (point-max) charset)) 85 (mm-decode-coding-region (point-min) (point-max) charset))
86 (call-process-region (point-min) (point-max) 86 (call-process-region (point-min) (point-max)
87 "w3m" 87 "w3m"
88 nil article-buffer nil 88 nil article-buffer nil
89 "-halfdump" 89 "-halfdump"
90 "-no-cookie" 90 "-no-cookie"
@@ -328,7 +328,7 @@ fit these criteria."
328 (push (gnus-html-image-id url) urls) 328 (push (gnus-html-image-id url) urls)
329 (push "-o" urls))))) 329 (push "-o" urls)))))
330 (let ((process 330 (let ((process
331 (apply 'start-process 331 (apply 'start-process
332 "images" nil "curl" 332 "images" nil "curl"
333 "-s" "--create-dirs" 333 "-s" "--create-dirs"
334 "--location" 334 "--location"
diff --git a/lisp/gnus/gnus-range.el b/lisp/gnus/gnus-range.el
index 6edf82eb9c6..5eb8080ac0a 100644
--- a/lisp/gnus/gnus-range.el
+++ b/lisp/gnus/gnus-range.el
@@ -187,7 +187,7 @@ LIST1 and LIST2 have to be sorted over <."
187RANGE1 and RANGE2 have to be sorted over <." 187RANGE1 and RANGE2 have to be sorted over <."
188 (let* (out 188 (let* (out
189 (min1 (car range1)) 189 (min1 (car range1))
190 (max1 (if (numberp min1) 190 (max1 (if (numberp min1)
191 (if (numberp (cdr range1)) 191 (if (numberp (cdr range1))
192 (prog1 (cdr range1) 192 (prog1 (cdr range1)
193 (setq range1 nil)) min1) 193 (setq range1 nil)) min1)
@@ -196,8 +196,8 @@ RANGE1 and RANGE2 have to be sorted over <."
196 (min2 (car range2)) 196 (min2 (car range2))
197 (max2 (if (numberp min2) 197 (max2 (if (numberp min2)
198 (if (numberp (cdr range2)) 198 (if (numberp (cdr range2))
199 (prog1 (cdr range2) 199 (prog1 (cdr range2)
200 (setq range2 nil)) min2) 200 (setq range2 nil)) min2)
201 (prog1 (cdr min2) 201 (prog1 (cdr min2)
202 (setq min2 (car min2)))))) 202 (setq min2 (car min2))))))
203 (setq range1 (cdr range1) 203 (setq range1 (cdr range1)
diff --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el
index cd167bdf2bc..5f945826941 100644
--- a/lisp/gnus/gnus-registry.el
+++ b/lisp/gnus/gnus-registry.el
@@ -1,6 +1,6 @@
1;;; gnus-registry.el --- article registry for Gnus 1;;; gnus-registry.el --- article registry for Gnus
2 2
3;;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 3;;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
4;;; Free Software Foundation, Inc. 4;;; Free Software Foundation, Inc.
5 5
6;; Author: Ted Zlatanov <tzz@lifelogs.com> 6;; Author: Ted Zlatanov <tzz@lifelogs.com>
@@ -72,7 +72,7 @@
72 :version "22.1" 72 :version "22.1"
73 :group 'gnus) 73 :group 'gnus)
74 74
75(defvar gnus-registry-hashtb (make-hash-table 75(defvar gnus-registry-hashtb (make-hash-table
76 :size 256 76 :size 256
77 :test 'equal) 77 :test 'equal)
78 "*The article registry by Message ID.") 78 "*The article registry by Message ID.")
@@ -97,7 +97,7 @@
97 "List of registry marks and their options. 97 "List of registry marks and their options.
98 98
99`gnus-registry-mark-article' will offer symbols from this list 99`gnus-registry-mark-article' will offer symbols from this list
100for completion. 100for completion.
101 101
102Each entry must have a character to be useful for summary mode 102Each entry must have a character to be useful for summary mode
103line display and for keyboard shortcuts. 103line display and for keyboard shortcuts.
@@ -121,7 +121,7 @@ display."
121 :group 'gnus-registry 121 :group 'gnus-registry
122 :type 'symbol) 122 :type 'symbol)
123 123
124(defcustom gnus-registry-unfollowed-groups 124(defcustom gnus-registry-unfollowed-groups
125 '("delayed$" "drafts$" "queue$" "INBOX$") 125 '("delayed$" "drafts$" "queue$" "INBOX$")
126 "List of groups that gnus-registry-split-fancy-with-parent won't return. 126 "List of groups that gnus-registry-split-fancy-with-parent won't return.
127The group names are matched, they don't have to be fully 127The group names are matched, they don't have to be fully
@@ -206,9 +206,9 @@ considered precious) will not be trimmed."
206 :group 'gnus-registry 206 :group 'gnus-registry
207 :type '(repeat symbol)) 207 :type '(repeat symbol))
208 208
209(defcustom gnus-registry-cache-file 209(defcustom gnus-registry-cache-file
210 (nnheader-concat 210 (nnheader-concat
211 (or gnus-dribble-directory gnus-home-directory "~/") 211 (or gnus-dribble-directory gnus-home-directory "~/")
212 ".gnus.registry.eld") 212 ".gnus.registry.eld")
213 "File where the Gnus registry will be stored." 213 "File where the Gnus registry will be stored."
214 :group 'gnus-registry 214 :group 'gnus-registry
@@ -253,7 +253,7 @@ considered precious) will not be trimmed."
253 (if gnus-save-startup-file-via-temp-buffer 253 (if gnus-save-startup-file-via-temp-buffer
254 (let ((coding-system-for-write gnus-ding-file-coding-system) 254 (let ((coding-system-for-write gnus-ding-file-coding-system)
255 (standard-output (current-buffer))) 255 (standard-output (current-buffer)))
256 (gnus-gnus-to-quick-newsrc-format 256 (gnus-gnus-to-quick-newsrc-format
257 t "gnus registry startup file" 'gnus-registry-alist) 257 t "gnus registry startup file" 'gnus-registry-alist)
258 (gnus-registry-cache-whitespace file) 258 (gnus-registry-cache-whitespace file)
259 (save-buffer)) 259 (save-buffer))
@@ -276,7 +276,7 @@ considered precious) will not be trimmed."
276 (unwind-protect 276 (unwind-protect
277 (progn 277 (progn
278 (gnus-with-output-to-file working-file 278 (gnus-with-output-to-file working-file
279 (gnus-gnus-to-quick-newsrc-format 279 (gnus-gnus-to-quick-newsrc-format
280 t "gnus registry startup file" 'gnus-registry-alist)) 280 t "gnus registry startup file" 'gnus-registry-alist))
281 281
282 ;; These bindings will mislead the current buffer 282 ;; These bindings will mislead the current buffer
@@ -326,7 +326,7 @@ considered precious) will not be trimmed."
326 (when gnus-registry-clean-empty 326 (when gnus-registry-clean-empty
327 (gnus-registry-clean-empty-function)) 327 (gnus-registry-clean-empty-function))
328 ;; now trim and clean text properties from the registry appropriately 328 ;; now trim and clean text properties from the registry appropriately
329 (setq gnus-registry-alist 329 (setq gnus-registry-alist
330 (gnus-registry-remove-alist-text-properties 330 (gnus-registry-remove-alist-text-properties
331 (gnus-registry-trim 331 (gnus-registry-trim
332 (gnus-hashtable-to-alist 332 (gnus-hashtable-to-alist
@@ -346,7 +346,7 @@ considered precious) will not be trimmed."
346 (dolist (group (gnus-registry-fetch-groups key)) 346 (dolist (group (gnus-registry-fetch-groups key))
347 (when (gnus-parameter-registry-ignore group) 347 (when (gnus-parameter-registry-ignore group)
348 (gnus-message 348 (gnus-message
349 10 349 10
350 "gnus-registry: deleted ignored group %s from key %s" 350 "gnus-registry: deleted ignored group %s from key %s"
351 group key) 351 group key)
352 (gnus-registry-delete-group key group))) 352 (gnus-registry-delete-group key group)))
@@ -361,14 +361,14 @@ considered precious) will not be trimmed."
361 (gnus-registry-fetch-extra key 'label)) 361 (gnus-registry-fetch-extra key 'label))
362 (incf count) 362 (incf count)
363 (gnus-registry-delete-id key)) 363 (gnus-registry-delete-id key))
364 364
365 (unless (stringp key) 365 (unless (stringp key)
366 (gnus-message 366 (gnus-message
367 10 367 10
368 "gnus-registry key %s was not a string, removing" 368 "gnus-registry key %s was not a string, removing"
369 key) 369 key)
370 (gnus-registry-delete-id key)))) 370 (gnus-registry-delete-id key))))
371 371
372 gnus-registry-hashtb) 372 gnus-registry-hashtb)
373 count)) 373 count))
374 374
@@ -391,7 +391,7 @@ considered precious) will not be trimmed."
391(defun gnus-registry-trim (alist) 391(defun gnus-registry-trim (alist)
392 "Trim alist to size, using gnus-registry-max-entries. 392 "Trim alist to size, using gnus-registry-max-entries.
393Any entries with extra data (marks, currently) are left alone." 393Any entries with extra data (marks, currently) are left alone."
394 (if (null gnus-registry-max-entries) 394 (if (null gnus-registry-max-entries)
395 alist ; just return the alist 395 alist ; just return the alist
396 ;; else, when given max-entries, trim the alist 396 ;; else, when given max-entries, trim the alist
397 (let* ((timehash (make-hash-table 397 (let* ((timehash (make-hash-table
@@ -420,25 +420,25 @@ Any entries with extra data (marks, currently) are left alone."
420 (push item precious-list) 420 (push item precious-list)
421 (push item junk-list)))) 421 (push item junk-list))))
422 422
423 (sort 423 (sort
424 junk-list 424 junk-list
425 (lambda (a b) 425 (lambda (a b)
426 (let ((t1 (or (cdr (gethash (car a) timehash)) 426 (let ((t1 (or (cdr (gethash (car a) timehash))
427 '(0 0 0))) 427 '(0 0 0)))
428 (t2 (or (cdr (gethash (car b) timehash)) 428 (t2 (or (cdr (gethash (car b) timehash))
429 '(0 0 0)))) 429 '(0 0 0))))
430 (time-less-p t1 t2)))) 430 (time-less-p t1 t2))))
431 431
432 ;; we use the return value of this setq, which is the trimmed alist 432 ;; we use the return value of this setq, which is the trimmed alist
433 (setq alist (append precious-list 433 (setq alist (append precious-list
434 (nthcdr trim-length junk-list)))))) 434 (nthcdr trim-length junk-list))))))
435 435
436(defun gnus-registry-action (action data-header from &optional to method) 436(defun gnus-registry-action (action data-header from &optional to method)
437 (let* ((id (mail-header-id data-header)) 437 (let* ((id (mail-header-id data-header))
438 (subject (gnus-string-remove-all-properties 438 (subject (gnus-string-remove-all-properties
439 (gnus-registry-simplify-subject 439 (gnus-registry-simplify-subject
440 (mail-header-subject data-header)))) 440 (mail-header-subject data-header))))
441 (sender (gnus-string-remove-all-properties 441 (sender (gnus-string-remove-all-properties
442 (mail-header-from data-header))) 442 (mail-header-from data-header)))
443 (from (gnus-group-guess-full-name-from-command-method from)) 443 (from (gnus-group-guess-full-name-from-command-method from))
444 (to (if to (gnus-group-guess-full-name-from-command-method to) nil)) 444 (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."
489 (let* ((refstr (or (message-fetch-field "references") "")) ; guaranteed 489 (let* ((refstr (or (message-fetch-field "references") "")) ; guaranteed
490 (reply-to (message-fetch-field "in-reply-to")) ; may be nil 490 (reply-to (message-fetch-field "in-reply-to")) ; may be nil
491 ;; now, if reply-to is valid, append it to the References 491 ;; now, if reply-to is valid, append it to the References
492 (refstr (if reply-to 492 (refstr (if reply-to
493 (concat refstr " " reply-to) 493 (concat refstr " " reply-to)
494 refstr)) 494 refstr))
495 ;; these may not be used, but the code is cleaner having them up here 495 ;; 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."
517 9 517 9
518 "%s is looking for matches for reference %s from [%s]" 518 "%s is looking for matches for reference %s from [%s]"
519 log-agent reference refstr) 519 log-agent reference refstr)
520 (dolist (group (gnus-registry-fetch-groups 520 (dolist (group (gnus-registry-fetch-groups
521 reference 521 reference
522 gnus-registry-max-track-groups)) 522 gnus-registry-max-track-groups))
523 (when (and group (gnus-registry-follow-group-p group)) 523 (when (and group (gnus-registry-follow-group-p group))
524 (gnus-message 524 (gnus-message
@@ -528,9 +528,9 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
528 (push group found)))) 528 (push group found))))
529 ;; filter the found groups and return them 529 ;; filter the found groups and return them
530 ;; the found groups are the full groups 530 ;; the found groups are the full groups
531 (setq found (gnus-registry-post-process-groups 531 (setq found (gnus-registry-post-process-groups
532 "references" refstr found found))) 532 "references" refstr found found)))
533 533
534 ;; else: there were no matches, now try the extra tracking by sender 534 ;; else: there were no matches, now try the extra tracking by sender
535 ((and (gnus-registry-track-sender-p) 535 ((and (gnus-registry-track-sender-p)
536 sender 536 sender
@@ -543,7 +543,7 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
543 matches) 543 matches)
544 (when (and this-sender 544 (when (and this-sender
545 (equal sender this-sender)) 545 (equal sender this-sender))
546 (let ((groups (gnus-registry-fetch-groups 546 (let ((groups (gnus-registry-fetch-groups
547 key 547 key
548 gnus-registry-max-track-groups))) 548 gnus-registry-max-track-groups)))
549 (dolist (group groups) 549 (dolist (group groups)
@@ -558,9 +558,9 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
558 gnus-registry-hashtb) 558 gnus-registry-hashtb)
559 ;; filter the found groups and return them 559 ;; filter the found groups and return them
560 ;; the found groups are NOT the full groups 560 ;; the found groups are NOT the full groups
561 (setq found (gnus-registry-post-process-groups 561 (setq found (gnus-registry-post-process-groups
562 "sender" sender found found-full))) 562 "sender" sender found found-full)))
563 563
564 ;; else: there were no matches, now try the extra tracking by subject 564 ;; else: there were no matches, now try the extra tracking by subject
565 ((and (gnus-registry-track-subject-p) 565 ((and (gnus-registry-track-subject-p)
566 subject 566 subject
@@ -572,7 +572,7 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
572 matches) 572 matches)
573 (when (and this-subject 573 (when (and this-subject
574 (equal subject this-subject)) 574 (equal subject this-subject))
575 (let ((groups (gnus-registry-fetch-groups 575 (let ((groups (gnus-registry-fetch-groups
576 key 576 key
577 gnus-registry-max-track-groups))) 577 gnus-registry-max-track-groups)))
578 (dolist (group groups) 578 (dolist (group groups)
@@ -587,7 +587,7 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
587 gnus-registry-hashtb) 587 gnus-registry-hashtb)
588 ;; filter the found groups and return them 588 ;; filter the found groups and return them
589 ;; the found groups are NOT the full groups 589 ;; the found groups are NOT the full groups
590 (setq found (gnus-registry-post-process-groups 590 (setq found (gnus-registry-post-process-groups
591 "subject" subject found found-full)))) 591 "subject" subject found found-full))))
592 ;; after the (cond) we extract the actual value safely 592 ;; after the (cond) we extract the actual value safely
593 (car-safe found))) 593 (car-safe found)))
@@ -627,7 +627,7 @@ necessary."
627 (lambda (a b) 627 (lambda (a b)
628 (> (gethash a freq 0) 628 (> (gethash a freq 0)
629 (gethash b freq 0))))))))) 629 (gethash b freq 0)))))))))
630 630
631 (if gnus-registry-use-long-group-names 631 (if gnus-registry-use-long-group-names
632 (dolist (group groups) 632 (dolist (group groups)
633 (let ((m1 (gnus-find-method-for-group group)) 633 (let ((m1 (gnus-find-method-for-group group))
@@ -708,8 +708,8 @@ Consults `gnus-registry-unfollowed-groups' and
708 (unless (member gnus-newsgroup-name (gnus-registry-fetch-groups id)) 708 (unless (member gnus-newsgroup-name (gnus-registry-fetch-groups id))
709 (gnus-message 9 "Registry: Registering article %d with group %s" 709 (gnus-message 9 "Registry: Registering article %d with group %s"
710 article gnus-newsgroup-name) 710 article gnus-newsgroup-name)
711 (gnus-registry-add-group 711 (gnus-registry-add-group
712 id 712 id
713 gnus-newsgroup-name 713 gnus-newsgroup-name
714 (gnus-registry-fetch-simplified-message-subject-fast article) 714 (gnus-registry-fetch-simplified-message-subject-fast article)
715 (gnus-registry-fetch-sender-fast article))))))) 715 (gnus-registry-fetch-sender-fast article)))))))
@@ -785,18 +785,18 @@ Uses `gnus-registry-marks' to find what shortcuts to install."
785 (shortcut (if remove (upcase shortcut) shortcut))) 785 (shortcut (if remove (upcase shortcut) shortcut)))
786 (unintern function-name) 786 (unintern function-name)
787 (eval 787 (eval
788 `(defun 788 `(defun
789 ;; function name 789 ;; function name
790 ,(intern function-name) 790 ,(intern function-name)
791 ;; parameter definition 791 ;; parameter definition
792 (&rest articles) 792 (&rest articles)
793 ;; documentation 793 ;; documentation
794 ,(format 794 ,(format
795 "%s the %s mark over process-marked ARTICLES." 795 "%s the %s mark over process-marked ARTICLES."
796 (upcase-initials variant-name) 796 (upcase-initials variant-name)
797 mark) 797 mark)
798 ;; interactive definition 798 ;; interactive definition
799 (interactive 799 (interactive
800 (gnus-summary-work-articles current-prefix-arg)) 800 (gnus-summary-work-articles current-prefix-arg))
801 ;; actual code 801 ;; actual code
802 802
@@ -807,49 +807,49 @@ Uses `gnus-registry-marks' to find what shortcuts to install."
807 807
808 ;; now the user is asked if gnus-registry-install is 'ask 808 ;; now the user is asked if gnus-registry-install is 'ask
809 (when (gnus-registry-install-p) 809 (when (gnus-registry-install-p)
810 (gnus-registry-set-article-mark-internal 810 (gnus-registry-set-article-mark-internal
811 ;; all this just to get the mark, I must be doing it wrong 811 ;; all this just to get the mark, I must be doing it wrong
812 (intern ,(symbol-name mark)) 812 (intern ,(symbol-name mark))
813 articles ,remove t) 813 articles ,remove t)
814 (gnus-message 814 (gnus-message
815 9 815 9
816 "Applying mark %s to %d articles" 816 "Applying mark %s to %d articles"
817 ,(symbol-name mark) (length articles)) 817 ,(symbol-name mark) (length articles))
818 (dolist (article articles) 818 (dolist (article articles)
819 (gnus-summary-update-article 819 (gnus-summary-update-article
820 article 820 article
821 (assoc article (gnus-data-list nil))))))) 821 (assoc article (gnus-data-list nil)))))))
822 (push (intern function-name) keys-plist) 822 (push (intern function-name) keys-plist)
823 (push shortcut keys-plist) 823 (push shortcut keys-plist)
824 (push (vector (format "%s %s" 824 (push (vector (format "%s %s"
825 (upcase-initials variant-name) 825 (upcase-initials variant-name)
826 (symbol-name mark)) 826 (symbol-name mark))
827 (intern function-name) t) 827 (intern function-name) t)
828 gnus-registry-misc-menus) 828 gnus-registry-misc-menus)
829 (gnus-message 829 (gnus-message
830 9 830 9
831 "Defined mark handling function %s" 831 "Defined mark handling function %s"
832 function-name)))))) 832 function-name))))))
833 (gnus-define-keys-1 833 (gnus-define-keys-1
834 '(gnus-registry-mark-map "M" gnus-summary-mark-map) 834 '(gnus-registry-mark-map "M" gnus-summary-mark-map)
835 keys-plist) 835 keys-plist)
836 (add-hook 'gnus-summary-menu-hook 836 (add-hook 'gnus-summary-menu-hook
837 (lambda () 837 (lambda ()
838 (easy-menu-add-item 838 (easy-menu-add-item
839 gnus-summary-misc-menu 839 gnus-summary-misc-menu
840 nil 840 nil
841 (cons "Registry Marks" gnus-registry-misc-menus)))))) 841 (cons "Registry Marks" gnus-registry-misc-menus))))))
842 842
843;;; use like this: 843;;; use like this:
844;;; (defalias 'gnus-user-format-function-M 844;;; (defalias 'gnus-user-format-function-M
845;;; 'gnus-registry-user-format-function-M) 845;;; 'gnus-registry-user-format-function-M)
846(defun gnus-registry-user-format-function-M (headers) 846(defun gnus-registry-user-format-function-M (headers)
847 (let* ((id (mail-header-message-id headers)) 847 (let* ((id (mail-header-message-id headers))
848 (marks (when id (gnus-registry-fetch-extra-marks id)))) 848 (marks (when id (gnus-registry-fetch-extra-marks id))))
849 (apply 'concat (mapcar (lambda(mark) 849 (apply 'concat (mapcar (lambda(mark)
850 (let ((c 850 (let ((c
851 (plist-get 851 (plist-get
852 (cdr-safe 852 (cdr-safe
853 (assoc mark gnus-registry-marks)) 853 (assoc mark gnus-registry-marks))
854 :char))) 854 :char)))
855 (if c 855 (if c
@@ -859,9 +859,9 @@ Uses `gnus-registry-marks' to find what shortcuts to install."
859 859
860(defun gnus-registry-read-mark () 860(defun gnus-registry-read-mark ()
861 "Read a mark name from the user with completion." 861 "Read a mark name from the user with completion."
862 (let ((mark (gnus-completing-read-with-default 862 (let ((mark (gnus-completing-read-with-default
863 (symbol-name gnus-registry-default-mark) 863 (symbol-name gnus-registry-default-mark)
864 "Label" 864 "Label"
865 (mapcar (lambda (x) ; completion list 865 (mapcar (lambda (x) ; completion list
866 (cons (symbol-name (car-safe x)) (car-safe x))) 866 (cons (symbol-name (car-safe x)) (car-safe x)))
867 gnus-registry-marks)))) 867 gnus-registry-marks))))
@@ -896,7 +896,7 @@ Uses `gnus-registry-marks' to find what shortcuts to install."
896 (gnus-message 1 "%s mark %s with message ID %s, resulting in %S" 896 (gnus-message 1 "%s mark %s with message ID %s, resulting in %S"
897 (if remove "Removing" "Adding") 897 (if remove "Removing" "Adding")
898 mark id new-marks)) 898 mark id new-marks))
899 899
900 (apply 'gnus-registry-store-extra-marks ; set the extra marks 900 (apply 'gnus-registry-store-extra-marks ; set the extra marks
901 id ; for the message ID 901 id ; for the message ID
902 new-marks))))) 902 new-marks)))))
@@ -1007,7 +1007,7 @@ The message must have at least one group name."
1007 "Put a specific entry in the extras field of the registry entry for id." 1007 "Put a specific entry in the extras field of the registry entry for id."
1008 (let* ((extra (gnus-registry-fetch-extra id)) 1008 (let* ((extra (gnus-registry-fetch-extra id))
1009 ;; all the entries except the one for `key' 1009 ;; all the entries except the one for `key'
1010 (the-rest (gnus-assq-delete-all key (gnus-registry-fetch-extra id))) 1010 (the-rest (gnus-assq-delete-all key (gnus-registry-fetch-extra id)))
1011 (alist (if value 1011 (alist (if value
1012 (gnus-registry-remove-alist-text-properties 1012 (gnus-registry-remove-alist-text-properties
1013 (cons (cons key value) 1013 (cons (cons key value)
@@ -1034,7 +1034,7 @@ Returns the first place where the trail finds a group name."
1034 (dolist (crumb trail) 1034 (dolist (crumb trail)
1035 (when (stringp crumb) 1035 (when (stringp crumb)
1036 ;; push the group name into the list 1036 ;; push the group name into the list
1037 (setq 1037 (setq
1038 groups 1038 groups
1039 (cons 1039 (cons
1040 (if (or (not (stringp crumb)) gnus-registry-use-long-group-names) 1040 (if (or (not (stringp crumb)) gnus-registry-use-long-group-names)
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index daf7a0e7f5d..2a332f7c420 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -765,7 +765,7 @@ prompt the user for the name of an NNTP server to use."
765 (when gnus-select-method 765 (when gnus-select-method
766 (push (cons "native" gnus-select-method) 766 (push (cons "native" gnus-select-method)
767 gnus-predefined-server-alist)) 767 gnus-predefined-server-alist))
768 768
769 (if gnus-agent 769 (if gnus-agent
770 (gnus-agentize)) 770 (gnus-agentize))
771 771
diff --git a/lisp/gnus/mail-source.el b/lisp/gnus/mail-source.el
index aebe5de8dca..ec15e982390 100644
--- a/lisp/gnus/mail-source.el
+++ b/lisp/gnus/mail-source.el
@@ -466,10 +466,10 @@ the `mail-source-keyword-map' variable."
466 ;; 1) the auth-sources user and password override everything 466 ;; 1) the auth-sources user and password override everything
467 ;; 2) it avoids macros, so it's cleaner 467 ;; 2) it avoids macros, so it's cleaner
468 ;; 3) it falls through to the mail-sources and then default values 468 ;; 3) it falls through to the mail-sources and then default values
469 (cond 469 (cond
470 ((and 470 ((and
471 (eq keyword :user) 471 (eq keyword :user)
472 (setq user-auth 472 (setq user-auth
473 (nth 0 (auth-source-user-or-password 473 (nth 0 (auth-source-user-or-password
474 '("login" "password") 474 '("login" "password")
475 ;; this is "host" in auth-sources 475 ;; this is "host" in auth-sources
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 760345b326c..feef4b9e8ef 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -6687,7 +6687,7 @@ want to get rid of this query permanently.")))
6687 (setq recipients (delq recip recipients)))))))) 6687 (setq recipients (delq recip recipients))))))))
6688 6688
6689 (setq recipients (message-prune-recipients recipients)) 6689 (setq recipients (message-prune-recipients recipients))
6690 6690
6691 ;; Build the header alist. Allow the user to be asked whether 6691 ;; Build the header alist. Allow the user to be asked whether
6692 ;; or not to reply to all recipients in a wide reply. 6692 ;; or not to reply to all recipients in a wide reply.
6693 (setq follow-to (list (cons 'To (cdr (pop recipients))))) 6693 (setq follow-to (list (cons 'To (cdr (pop recipients)))))
@@ -6704,7 +6704,7 @@ want to get rid of this query permanently.")))
6704(defun message-prune-recipients (recipients) 6704(defun message-prune-recipients (recipients)
6705 (dolist (rule message-prune-recipient-rules) 6705 (dolist (rule message-prune-recipient-rules)
6706 (let ((match (car rule)) 6706 (let ((match (car rule))
6707 dup-match 6707 dup-match
6708 address) 6708 address)
6709 (dolist (recipient recipients) 6709 (dolist (recipient recipients)
6710 (setq address (car recipient)) 6710 (setq address (car recipient))
diff --git a/lisp/gnus/mm-uu.el b/lisp/gnus/mm-uu.el
index f844f3b9a80..83b38c8ae1e 100644
--- a/lisp/gnus/mm-uu.el
+++ b/lisp/gnus/mm-uu.el
@@ -441,7 +441,7 @@ apply the face `mm-uu-extract'."
441(defun mm-uu-yenc-extract () 441(defun mm-uu-yenc-extract ()
442 ;; This might not be exactly correct, but we sure can't get the 442 ;; This might not be exactly correct, but we sure can't get the
443 ;; binary data from the article buffer, since that's already in a 443 ;; binary data from the article buffer, since that's already in a
444 ;; non-binary charset. So get it from the original article buffer. 444 ;; non-binary charset. So get it from the original article buffer.
445 (mm-make-handle (with-current-buffer gnus-original-article-buffer 445 (mm-make-handle (with-current-buffer gnus-original-article-buffer
446 (mm-uu-copy-to-buffer start-point end-point)) 446 (mm-uu-copy-to-buffer start-point end-point))
447 (list (or (and file-name 447 (list (or (and file-name
diff --git a/lisp/gnus/nnagent.el b/lisp/gnus/nnagent.el
index 69e2702380f..263d721dad2 100644
--- a/lisp/gnus/nnagent.el
+++ b/lisp/gnus/nnagent.el
@@ -121,7 +121,7 @@
121(deffoo nnagent-request-set-mark (group action server) 121(deffoo nnagent-request-set-mark (group action server)
122 (mm-with-unibyte-buffer 122 (mm-with-unibyte-buffer
123 (insert "(gnus-agent-synchronize-group-flags \"" 123 (insert "(gnus-agent-synchronize-group-flags \""
124 group 124 group
125 "\" '") 125 "\" '")
126 (gnus-pp action) 126 (gnus-pp action)
127 (insert " \"" 127 (insert " \""
@@ -151,7 +151,7 @@
151 ;; Assume that articles with smaller numbers than the first one 151 ;; Assume that articles with smaller numbers than the first one
152 ;; Agent knows are gone. 152 ;; Agent knows are gone.
153 (setq first (caar gnus-agent-article-alist)) 153 (setq first (caar gnus-agent-article-alist))
154 (when first 154 (when first
155 (while (and arts (< (car arts) first)) 155 (while (and arts (< (car arts) first))
156 (pop arts))) 156 (pop arts)))
157 (set-buffer nntp-server-buffer) 157 (set-buffer nntp-server-buffer)
diff --git a/lisp/gnus/nnbabyl.el b/lisp/gnus/nnbabyl.el
index 555036672b6..58e848bcb5c 100644
--- a/lisp/gnus/nnbabyl.el
+++ b/lisp/gnus/nnbabyl.el
@@ -344,7 +344,7 @@
344 (while (re-search-backward "^X-Gnus-Newsgroup: " beg t) 344 (while (re-search-backward "^X-Gnus-Newsgroup: " beg t)
345 (delete-region (point) (progn (forward-line 1) (point))))) 345 (delete-region (point) (progn (forward-line 1) (point)))))
346 (when nnmail-cache-accepted-message-ids 346 (when nnmail-cache-accepted-message-ids
347 (nnmail-cache-insert (nnmail-fetch-field "message-id") 347 (nnmail-cache-insert (nnmail-fetch-field "message-id")
348 group 348 group
349 (nnmail-fetch-field "subject") 349 (nnmail-fetch-field "subject")
350 (nnmail-fetch-field "from"))) 350 (nnmail-fetch-field "from")))
@@ -363,7 +363,7 @@
363 (insert-buffer-substring buf) 363 (insert-buffer-substring buf)
364 (when last 364 (when last
365 (when nnmail-cache-accepted-message-ids 365 (when nnmail-cache-accepted-message-ids
366 (nnmail-cache-insert (nnmail-fetch-field "message-id") 366 (nnmail-cache-insert (nnmail-fetch-field "message-id")
367 group 367 group
368 (nnmail-fetch-field "subject") 368 (nnmail-fetch-field "subject")
369 (nnmail-fetch-field "from"))) 369 (nnmail-fetch-field "from")))
diff --git a/lisp/gnus/nndoc.el b/lisp/gnus/nndoc.el
index 6acae6dcdd5..ddeac7f9523 100644
--- a/lisp/gnus/nndoc.el
+++ b/lisp/gnus/nndoc.el
@@ -100,7 +100,7 @@ from the document.")
100 (head-end . "^\t") 100 (head-end . "^\t")
101 (generate-head-function . nndoc-generate-clari-briefs-head) 101 (generate-head-function . nndoc-generate-clari-briefs-head)
102 (article-transform-function . nndoc-transform-clari-briefs)) 102 (article-transform-function . nndoc-transform-clari-briefs))
103 103
104 (standard-digest 104 (standard-digest
105 (first-article . ,(concat "^" (make-string 70 ?-) "\n *\n+")) 105 (first-article . ,(concat "^" (make-string 70 ?-) "\n *\n+"))
106 (article-begin . ,(concat "^\n" (make-string 30 ?-) "\n *\n+")) 106 (article-begin . ,(concat "^\n" (make-string 30 ?-) "\n *\n+"))
diff --git a/lisp/gnus/nndraft.el b/lisp/gnus/nndraft.el
index 13efd8c5092..dd2b8a6b48d 100644
--- a/lisp/gnus/nndraft.el
+++ b/lisp/gnus/nndraft.el
@@ -202,7 +202,7 @@ are generated if and only if they are also in `message-draft-headers'.")
202 'nnmh-request-group 202 'nnmh-request-group
203 (list group server dont-check))) 203 (list group server dont-check)))
204 204
205(deffoo nndraft-request-move-article (article group server accept-form 205(deffoo nndraft-request-move-article (article group server accept-form
206 &optional last move-is-internal) 206 &optional last move-is-internal)
207 (nndraft-possibly-change-group group) 207 (nndraft-possibly-change-group group)
208 (let ((buf (get-buffer-create " *nndraft move*")) 208 (let ((buf (get-buffer-create " *nndraft move*"))
diff --git a/lisp/gnus/nnfolder.el b/lisp/gnus/nnfolder.el
index 6923c538673..6413e98cc1e 100644
--- a/lisp/gnus/nnfolder.el
+++ b/lisp/gnus/nnfolder.el
@@ -494,7 +494,7 @@ the group. Then the marks file will be regenerated properly by Gnus.")
494 (nnfolder-save-active nnfolder-group-alist nnfolder-active-file) 494 (nnfolder-save-active nnfolder-group-alist nnfolder-active-file)
495 (gnus-sorted-difference articles (nreverse deleted-articles))))) 495 (gnus-sorted-difference articles (nreverse deleted-articles)))))
496 496
497(deffoo nnfolder-request-move-article (article group server accept-form 497(deffoo nnfolder-request-move-article (article group server accept-form
498 &optional last move-is-internal) 498 &optional last move-is-internal)
499 (save-excursion 499 (save-excursion
500 (let ((buf (get-buffer-create " *nnfolder move*")) 500 (let ((buf (get-buffer-create " *nnfolder move*"))
@@ -552,7 +552,7 @@ the group. Then the marks file will be regenerated properly by Gnus.")
552 (while (re-search-backward (concat "^" nnfolder-article-marker) nil t) 552 (while (re-search-backward (concat "^" nnfolder-article-marker) nil t)
553 (delete-region (point) (progn (forward-line 1) (point)))) 553 (delete-region (point) (progn (forward-line 1) (point))))
554 (when nnmail-cache-accepted-message-ids 554 (when nnmail-cache-accepted-message-ids
555 (nnmail-cache-insert (nnmail-fetch-field "message-id") 555 (nnmail-cache-insert (nnmail-fetch-field "message-id")
556 group 556 group
557 (nnmail-fetch-field "subject") 557 (nnmail-fetch-field "subject")
558 (nnmail-fetch-field "from"))) 558 (nnmail-fetch-field "from")))
diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el
index be89332249e..6096c6fb374 100644
--- a/lisp/gnus/nnir.el
+++ b/lisp/gnus/nnir.el
@@ -792,7 +792,7 @@ and show thread that contains this article."
792 (setq novitem (funcall nnir-get-article-nov-override-function 792 (setq novitem (funcall nnir-get-article-nov-override-function
793 artitem)) 793 artitem))
794 ;; else, set novitem through nnheader-parse-nov/nnheader-parse-head 794 ;; else, set novitem through nnheader-parse-nov/nnheader-parse-head
795 (case (setq foo (gnus-retrieve-headers (list artno) 795 (case (setq foo (gnus-retrieve-headers (list artno)
796 artfullgroup nil)) 796 artfullgroup nil))
797 (nov 797 (nov
798 (goto-char (point-min)) 798 (goto-char (point-min))
diff --git a/lisp/gnus/nnmairix.el b/lisp/gnus/nnmairix.el
index ede10a45662..04db76b942a 100644
--- a/lisp/gnus/nnmairix.el
+++ b/lisp/gnus/nnmairix.el
@@ -556,7 +556,7 @@ Other back ends might or might not work.")
556 (mapcar 556 (mapcar
557 (lambda (arg) (- arg numcorr)) 557 (lambda (arg) (- arg numcorr))
558 articles))) 558 articles)))
559 (setq rval 559 (setq rval
560 (if (eq nnmairix-backend 'nnimap) 560 (if (eq nnmairix-backend 'nnimap)
561 (let ((gnus-nov-is-evil t)) 561 (let ((gnus-nov-is-evil t))
562 (nnmairix-call-backend 562 (nnmairix-call-backend
diff --git a/lisp/gnus/nnmh.el b/lisp/gnus/nnmh.el
index a39f7fb0398..05eb669fa0b 100644
--- a/lisp/gnus/nnmh.el
+++ b/lisp/gnus/nnmh.el
@@ -287,7 +287,7 @@ as unread by Gnus.")
287(deffoo nnmh-close-group (group &optional server) 287(deffoo nnmh-close-group (group &optional server)
288 t) 288 t)
289 289
290(deffoo nnmh-request-move-article (article group server accept-form 290(deffoo nnmh-request-move-article (article group server accept-form
291 &optional last move-is-internal) 291 &optional last move-is-internal)
292 (let ((buf (get-buffer-create " *nnmh move*")) 292 (let ((buf (get-buffer-create " *nnmh move*"))
293 result) 293 result)
@@ -312,7 +312,7 @@ as unread by Gnus.")
312 (nnmh-possibly-change-directory group server) 312 (nnmh-possibly-change-directory group server)
313 (nnmail-check-syntax) 313 (nnmail-check-syntax)
314 (when nnmail-cache-accepted-message-ids 314 (when nnmail-cache-accepted-message-ids
315 (nnmail-cache-insert (nnmail-fetch-field "message-id") 315 (nnmail-cache-insert (nnmail-fetch-field "message-id")
316 group 316 group
317 (nnmail-fetch-field "subject") 317 (nnmail-fetch-field "subject")
318 (nnmail-fetch-field "from"))) 318 (nnmail-fetch-field "from")))
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index 1d6c6a52444..5373230fd8e 100644
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -309,8 +309,8 @@ port number on server. The program should accept IMAP commands on
309stdin and return responses to stdout.") 309stdin and return responses to stdout.")
310 310
311(defvar nntp-authinfo-rejected nil 311(defvar nntp-authinfo-rejected nil
312"A custom error condition used to report 'Authentication Rejected' errors. 312"A custom error condition used to report 'Authentication Rejected' errors.
313Condition handlers that match just this condition ensure that the nntp 313Condition handlers that match just this condition ensure that the nntp
314backend doesn't catch this error.") 314backend doesn't catch this error.")
315(put 'nntp-authinfo-rejected 'error-conditions '(error nntp-authinfo-rejected)) 315(put 'nntp-authinfo-rejected 'error-conditions '(error nntp-authinfo-rejected))
316(put 'nntp-authinfo-rejected 'error-message "Authorization Rejected") 316(put 'nntp-authinfo-rejected 'error-message "Authorization Rejected")
@@ -2013,7 +2013,7 @@ Please refer to the following variables to customize the connection:
2013 (and nntp-pre-command (push nntp-pre-command command)) 2013 (and nntp-pre-command (push nntp-pre-command command))
2014 (let ((process-connection-type nil)) ;See `nntp-open-via-rlogin-and-netcat'. 2014 (let ((process-connection-type nil)) ;See `nntp-open-via-rlogin-and-netcat'.
2015 (apply 'start-process "nntpd" buffer command)))) 2015 (apply 'start-process "nntpd" buffer command))))
2016 2016
2017 2017
2018(defun nntp-open-via-telnet-and-telnet (buffer) 2018(defun nntp-open-via-telnet-and-telnet (buffer)
2019 "Open a connection to an nntp server through an intermediate host. 2019 "Open a connection to an nntp server through an intermediate host.
diff --git a/lisp/gnus/pop3.el b/lisp/gnus/pop3.el
index 34bf71df520..be9ed179d28 100644
--- a/lisp/gnus/pop3.el
+++ b/lisp/gnus/pop3.el
@@ -102,7 +102,7 @@ thing can fall apart and leave you with a corrupt mailbox."
102 "*If non-nil, display the size of the message that is being fetched." 102 "*If non-nil, display the size of the message that is being fetched."
103 :version "22.1" ;; Oort Gnus 103 :version "22.1" ;; Oort Gnus
104 :type 'boolean 104 :type 'boolean
105 :group 'pop3) 105 :group 'pop3)
106 106
107(defvar pop3-timestamp nil 107(defvar pop3-timestamp nil
108 "Timestamp returned when initially connected to the POP server. 108 "Timestamp returned when initially connected to the POP server.
@@ -167,7 +167,7 @@ Shorter values mean quicker response, but are more CPU intensive.")
167 (/ (cdr (assoc n message-sizes)) 167 (/ (cdr (assoc n message-sizes))
168 1024.0)) 168 1024.0))
169 (message "Retrieving message %d of %d from %s..." 169 (message "Retrieving message %d of %d from %s..."
170 n message-count pop3-mailhost)) 170 n message-count pop3-mailhost))
171 (pop3-retr process n crashbuf) 171 (pop3-retr process n crashbuf)
172 (save-excursion 172 (save-excursion
173 (set-buffer crashbuf) 173 (set-buffer crashbuf)
@@ -283,7 +283,7 @@ Returns the process associated with the connection."
283 (pop3-quit process) 283 (pop3-quit process)
284 (error "POP server doesn't support starttls"))) 284 (error "POP server doesn't support starttls")))
285 process)) 285 process))
286 (t 286 (t
287 (open-network-stream "POP" (current-buffer) mailhost port)))) 287 (open-network-stream "POP" (current-buffer) mailhost port))))
288 (let ((response (pop3-read-response process t))) 288 (let ((response (pop3-read-response process t)))
289 (setq pop3-timestamp 289 (setq pop3-timestamp
@@ -468,7 +468,7 @@ If NOW, use that time instead."
468(defun pop3-list (process &optional msg) 468(defun pop3-list (process &optional msg)
469 "If MSG is nil, return an alist of (MESSAGE-ID . SIZE) pairs. 469 "If MSG is nil, return an alist of (MESSAGE-ID . SIZE) pairs.
470Otherwise, return the size of the message-id MSG" 470Otherwise, return the size of the message-id MSG"
471 (pop3-send-command process (if msg 471 (pop3-send-command process (if msg
472 (format "LIST %d" msg) 472 (format "LIST %d" msg)
473 "LIST")) 473 "LIST"))
474 (let ((response (pop3-read-response process t))) 474 (let ((response (pop3-read-response process t)))
diff --git a/lisp/gnus/sieve-manage.el b/lisp/gnus/sieve-manage.el
index 0cf12590cbf..0f16444ca39 100644
--- a/lisp/gnus/sieve-manage.el
+++ b/lisp/gnus/sieve-manage.el
@@ -335,7 +335,7 @@ Returns t if login was successful, nil otherwise."
335(defun sieve-sasl-auth (buffer mech) 335(defun sieve-sasl-auth (buffer mech)
336 "Login to server using the SASL MECH method." 336 "Login to server using the SASL MECH method."
337 (message "sieve: Authenticating using %s..." mech) 337 (message "sieve: Authenticating using %s..." mech)
338 (if (sieve-manage-interactive-login 338 (if (sieve-manage-interactive-login
339 buffer 339 buffer
340 (lambda (user passwd) 340 (lambda (user passwd)
341 (let (client step tag data rsp) 341 (let (client step tag data rsp)
diff --git a/lisp/gnus/spam-report.el b/lisp/gnus/spam-report.el
index 31dc1cf8438..0e4576ae3f5 100644
--- a/lisp/gnus/spam-report.el
+++ b/lisp/gnus/spam-report.el
@@ -95,12 +95,12 @@ undo that change.")
95 "Report an article as spam by resending via email. 95 "Report an article as spam by resending via email.
96Reports is as ham when HAM is set." 96Reports is as ham when HAM is set."
97 (dolist (article articles) 97 (dolist (article articles)
98 (gnus-message 6 98 (gnus-message 6
99 "Reporting %s article %d to <%s>..." 99 "Reporting %s article %d to <%s>..."
100 (if ham "ham" "spam") 100 (if ham "ham" "spam")
101 article spam-report-resend-to) 101 article spam-report-resend-to)
102 (unless spam-report-resend-to 102 (unless spam-report-resend-to
103 (customize-set-variable 103 (customize-set-variable
104 spam-report-resend-to 104 spam-report-resend-to
105 (read-from-minibuffer "email address to resend SPAM/HAM to? "))) 105 (read-from-minibuffer "email address to resend SPAM/HAM to? ")))
106 ;; This is ganked from the `gnus-summary-resend-message' function. 106 ;; This is ganked from the `gnus-summary-resend-message' function.
diff --git a/lisp/net/dns.el b/lisp/net/dns.el
index dfa17995a23..2d4c2d8cd8b 100644
--- a/lisp/net/dns.el
+++ b/lisp/net/dns.el
@@ -151,7 +151,7 @@ If TCP-P, the first two bytes of the package with be the length field."
151 (lsh (if (dns-get 'truncated-p spec) 1 0) -1) 151 (lsh (if (dns-get 'truncated-p spec) 1 0) -1)
152 (lsh (if (dns-get 'recursion-desired-p spec) 1 0) 0))) 152 (lsh (if (dns-get 'recursion-desired-p spec) 1 0) 0)))
153 (dns-write-bytes 153 (dns-write-bytes
154 (cond 154 (cond
155 ((eq (dns-get 'response-code spec) 'no-error) 0) 155 ((eq (dns-get 'response-code spec) 'no-error) 0)
156 ((eq (dns-get 'response-code spec) 'format-error) 1) 156 ((eq (dns-get 'response-code spec) 'format-error) 1)
157 ((eq (dns-get 'response-code spec) 'server-failure) 2) 157 ((eq (dns-get 'response-code spec) 'server-failure) 2)
diff --git a/lisp/net/imap.el b/lisp/net/imap.el
index e5bc3a83b55..31646176b46 100644
--- a/lisp/net/imap.el
+++ b/lisp/net/imap.el
@@ -1227,7 +1227,7 @@ password is remembered in the buffer."
1227 (when user (setq imap-username user)) 1227 (when user (setq imap-username user))
1228 (when passwd (setq imap-password passwd)) 1228 (when passwd (setq imap-password passwd))
1229 (if imap-auth 1229 (if imap-auth
1230 (and (setq imap-last-authenticator 1230 (and (setq imap-last-authenticator
1231 (assq imap-auth imap-authenticator-alist)) 1231 (assq imap-auth imap-authenticator-alist))
1232 (funcall (nth 2 imap-last-authenticator) (current-buffer)) 1232 (funcall (nth 2 imap-last-authenticator) (current-buffer))
1233 (setq imap-state 'auth)) 1233 (setq imap-state 'auth))
diff --git a/lisp/net/netrc.el b/lisp/net/netrc.el
index 5252134367e..2306927f080 100644
--- a/lisp/net/netrc.el
+++ b/lisp/net/netrc.el
@@ -160,9 +160,9 @@ MODE can be \"login\" or \"password\", suitable for passing to
160 (defaults (or defaults '(nil))) 160 (defaults (or defaults '(nil)))
161 info) 161 info)
162 (if (listp mode) 162 (if (listp mode)
163 (setq info 163 (setq info
164 (mapcar 164 (mapcar
165 (lambda (mode-element) 165 (lambda (mode-element)
166 (netrc-machine-user-or-password 166 (netrc-machine-user-or-password
167 mode-element 167 mode-element
168 authinfo-list 168 authinfo-list
diff --git a/lisp/net/ntlm.el b/lisp/net/ntlm.el
index 8e9330c46d0..517e97efe6c 100644
--- a/lisp/net/ntlm.el
+++ b/lisp/net/ntlm.el
@@ -27,9 +27,9 @@
27;; This library is a direct translation of the Samba release 2.2.0 27;; This library is a direct translation of the Samba release 2.2.0
28;; implementation of Windows NT and LanManager compatible password 28;; implementation of Windows NT and LanManager compatible password
29;; encryption. 29;; encryption.
30;; 30;;
31;; Interface functions: 31;; Interface functions:
32;; 32;;
33;; ntlm-build-auth-request 33;; ntlm-build-auth-request
34;; This will return a binary string, which should be used in the 34;; This will return a binary string, which should be used in the
35;; base64 encoded form and it is the caller's responsibility to encode 35;; base64 encoded form and it is the caller's responsibility to encode
@@ -40,7 +40,7 @@
40;; (which will be a binary string) as the first argument and to 40;; (which will be a binary string) as the first argument and to
41;; encode the returned string with base64. The second argument user 41;; encode the returned string with base64. The second argument user
42;; should be given in user@domain format. 42;; should be given in user@domain format.
43;; 43;;
44;; ntlm-get-password-hashes 44;; ntlm-get-password-hashes
45;; 45;;
46;; 46;;
diff --git a/lisp/net/sasl-digest.el b/lisp/net/sasl-digest.el
index 6db95c6904e..8559c8f3fa9 100644
--- a/lisp/net/sasl-digest.el
+++ b/lisp/net/sasl-digest.el
@@ -95,10 +95,10 @@ charset algorithm cipher-opts auth-param)."
95 (md5-binary 95 (md5-binary
96 (concat 96 (concat
97 (encode-hex-string 97 (encode-hex-string
98 (md5-binary (concat (md5-binary 98 (md5-binary (concat (md5-binary
99 (concat username ":" realm ":" passphrase)) 99 (concat username ":" realm ":" passphrase))
100 ":" nonce ":" cnonce 100 ":" nonce ":" cnonce
101 (if authzid 101 (if authzid
102 (concat ":" authzid))))) 102 (concat ":" authzid)))))
103 ":" nonce 103 ":" nonce
104 ":" (format "%08x" nonce-count) ":" cnonce ":" qop ":" 104 ":" (format "%08x" nonce-count) ":" cnonce ":" qop ":"