diff options
Diffstat (limited to 'lisp/gnus')
| -rw-r--r-- | lisp/gnus/auth-source.el | 16 | ||||
| -rw-r--r-- | lisp/gnus/gnus-group.el | 3 | ||||
| -rw-r--r-- | lisp/gnus/gnus-mlspl.el | 4 | ||||
| -rw-r--r-- | lisp/gnus/gnus-util.el | 19 | ||||
| -rw-r--r-- | lisp/gnus/message.el | 4 | ||||
| -rw-r--r-- | lisp/gnus/mm-decode.el | 2 | ||||
| -rw-r--r-- | lisp/gnus/mm-util.el | 2 | ||||
| -rw-r--r-- | lisp/gnus/nnml.el | 17 | ||||
| -rw-r--r-- | lisp/gnus/qp.el | 3 |
9 files changed, 32 insertions, 38 deletions
diff --git a/lisp/gnus/auth-source.el b/lisp/gnus/auth-source.el index 9d842c04f64..10d32d45070 100644 --- a/lisp/gnus/auth-source.el +++ b/lisp/gnus/auth-source.el @@ -919,13 +919,15 @@ while \(:host t) would find all host entries." prompt) (defun auth-source-ensure-strings (values) - (unless (listp values) - (setq values (list values))) - (mapcar (lambda (value) - (if (numberp value) - (format "%s" value) - value)) - values)) + (if (eq values t) + values + (unless (listp values) + (setq values (list values))) + (mapcar (lambda (value) + (if (numberp value) + (format "%s" value) + value)) + values))) ;;; Backend specific parsing: netrc/authinfo backend diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el index b1a4933ebf1..9f272f42587 100644 --- a/lisp/gnus/gnus-group.el +++ b/lisp/gnus/gnus-group.el @@ -1396,7 +1396,8 @@ if it is a string, only list groups matching REGEXP." (gnus-group-prepare-flat-list-dead (gnus-union not-in-list - (setq gnus-killed-list (sort gnus-killed-list 'string<))) + (setq gnus-killed-list (sort gnus-killed-list 'string<)) + :test 'equal) gnus-level-killed ?K regexp)) (gnus-group-set-mode-line) diff --git a/lisp/gnus/gnus-mlspl.el b/lisp/gnus/gnus-mlspl.el index 37a5d6150db..cb95aac45e5 100644 --- a/lisp/gnus/gnus-mlspl.el +++ b/lisp/gnus/gnus-mlspl.el @@ -122,9 +122,9 @@ clauses will be generated. If CATCH-ALL is nil, no catch-all handling is performed, regardless of catch-all marks in group parameters. Otherwise, if there is no selected group whose SPLIT-REGEXP matches the empty string, nor is -there a selected group whose SPLIT-SPEC is 'catch-all, this fancy +there a selected group whose SPLIT-SPEC is `catch-all', this fancy split (say, a group name) will be appended to the returned SPLIT list, -as the last element of a '| SPLIT. +as the last element of a `|' SPLIT. For example, given the following group parameters: diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el index 933387da559..63ae2e628d1 100644 --- a/lisp/gnus/gnus-util.el +++ b/lisp/gnus/gnus-util.el @@ -1372,18 +1372,25 @@ Return the modified alist." (if (fboundp 'union) (defalias 'gnus-union 'union) - (defun gnus-union (l1 l2) - "Set union of lists L1 and L2." + (defun gnus-union (l1 l2 &rest keys) + "Set union of lists L1 and L2. +If KEYS contains the `:test' and `equal' pair, use `equal' to compare +items in lists, otherwise use `eq'." (cond ((null l1) l2) ((null l2) l1) ((equal l1 l2) l1) (t (or (>= (length l1) (length l2)) (setq l1 (prog1 l2 (setq l2 l1)))) - (while l2 - (or (member (car l2) l1) - (push (car l2) l1)) - (pop l2)) + (if (eq 'equal (plist-get keys :test)) + (while l2 + (or (member (car l2) l1) + (push (car l2) l1)) + (pop l2)) + (while l2 + (or (memq (car l2) l1) + (push (car l2) l1)) + (pop l2))) l1)))) (declare-function gnus-add-text-properties "gnus" diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index 1b693d77983..a6c82824e4e 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -865,7 +865,7 @@ It may also be a function. For e.g., if you wish to set the envelope sender address so that bounces go to the right place or to deal with listserv's usage of that address, you -might set this variable to '(\"-f\" \"you@some.where\")." +might set this variable to (\"-f\" \"you@some.where\")." :group 'message-sending :link '(custom-manual "(message)Mail Variables") :type '(choice (function) @@ -1114,7 +1114,7 @@ Note: Many newsgroups frown upon nontraditional reply styles. You probably want to set this variable only for specific groups, e.g. using `gnus-posting-styles': - (eval (set (make-local-variable 'message-cite-reply-position) 'above))" + (eval (set (make-local-variable \\='message-cite-reply-position) \\='above))" :version "24.1" :type '(choice (const :tag "Reply inline" traditional) (const :tag "Reply above" above) diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el index 327b0e6e86f..be56d2398af 100644 --- a/lisp/gnus/mm-decode.el +++ b/lisp/gnus/mm-decode.el @@ -393,7 +393,7 @@ enables you to choose manually one of two types those mails include." (defcustom mm-inline-large-images nil "If t, then all images fit in the buffer. -If 'resize, try to resize the images so they fit." +If `resize', try to resize the images so they fit." :type '(radio (const :tag "Inline large images as they are." t) (const :tag "Resize large images." resize) diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el index ab9145f8b1c..24d3a9e749e 100644 --- a/lisp/gnus/mm-util.el +++ b/lisp/gnus/mm-util.el @@ -1074,7 +1074,7 @@ can be encoded using a single one of the corresponding coding systems. It treats `mm-coding-system-priorities' as the list of preferred coding systems; a useful example setting for this list in Western -Europe would be '(iso-8859-1 iso-8859-15 utf-8), which would default +Europe would be (iso-8859-1 iso-8859-15 utf-8), which would default to the very standard Latin 1 coding system, and only move to coding systems that are less supported as is necessary to encode the characters that exist in the buffer. diff --git a/lisp/gnus/nnml.el b/lisp/gnus/nnml.el index 33eae1c166e..a2947c0a992 100644 --- a/lisp/gnus/nnml.el +++ b/lisp/gnus/nnml.el @@ -268,23 +268,6 @@ non-nil.") (max (1+ (- (cdr active) (car active))) 0) (car active) (cdr active) group))))))) -(deffoo nnml-retrieve-groups (groups &optional server) - (when nnml-get-new-mail - (if (nnmail-get-new-mail-per-group) - (dolist (group groups) - (nnml-request-scan group server)) - (nnml-request-scan nil server))) - (with-current-buffer nntp-server-buffer - (erase-buffer) - (dolist (group groups) - (let* ((entry (assoc group nnml-group-alist)) - (active (nth 1 entry))) - (if (consp active) - (insert (format "211 %d %d %d %s\n" - (max (1+ (- (cdr active) (car active))) 0) - (car active) (cdr active) group)))))) - 'group) - (deffoo nnml-request-scan (&optional group server) (setq nnml-article-file-alist nil) (nnml-possibly-change-directory group server) diff --git a/lisp/gnus/qp.el b/lisp/gnus/qp.el index 6c48f0fc9a4..d7ed30d3749 100644 --- a/lisp/gnus/qp.el +++ b/lisp/gnus/qp.el @@ -143,7 +143,8 @@ encode lines starting with \"From\"." (and (boundp 'mm-use-ultra-safe-encoding) mm-use-ultra-safe-encoding))) (when (or fold mm-use-ultra-safe-encoding) - (let ((tab-width 1)) ; HTAB is one character. + (let ((tab-width 1) ; HTAB is one character. + (case-fold-search nil)) (goto-char (point-min)) (while (not (eobp)) ;; In ultra-safe mode, encode "From " at the beginning |