diff options
Diffstat (limited to 'lisp/gnus')
| -rw-r--r-- | lisp/gnus/ChangeLog | 47 | ||||
| -rw-r--r-- | lisp/gnus/ChangeLog.2 | 2 | ||||
| -rw-r--r-- | lisp/gnus/gnus-util.el | 8 | ||||
| -rw-r--r-- | lisp/gnus/message.el | 10 | ||||
| -rw-r--r-- | lisp/gnus/mm-decode.el | 22 | ||||
| -rw-r--r-- | lisp/gnus/mm-url.el | 2 | ||||
| -rw-r--r-- | lisp/gnus/mm-util.el | 23 | ||||
| -rw-r--r-- | lisp/gnus/nnmail.el | 2 |
8 files changed, 68 insertions, 48 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 36963b5ce24..d013524a1c8 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,31 @@ +2005-10-04 Reiner Steib <Reiner.Steib@gmx.de> + + * mm-url.el (mm-url-predefined-programs): Add switches for curl. + + * gnus-util.el (gnus-remove-duplicates): Remove. + + * nnmail.el (nnmail-article-group): Use mm-delete-duplicates + instead of gnus-remove-duplicates. + + * message.el (message-remove-duplicates): Remove. + (message-idna-to-ascii-rhs-1): Use mm-delete-duplicates instead of + message-remove-duplicates. + + * mm-util.el (mm-delete-duplicates): Use `delete-dups' if + available, else use implementation from `delete-dups'. + +2005-10-02 Katsumi Yamaoka <yamaoka@jpl.org> + + * time-date.el: Autoload parse-time-string, XEmacs needs it. + +2005-09-30 Stefan Monnier <monnier@iro.umontreal.ca> + + * mm-decode.el (mm-inline-media-tests): Check presence of the diff-mode + function rather than the diff-mode.el package. + (mm-display-external): Use with-current-buffer. + (mm-viewer-completion-map, mm-viewer-completion-map): + Move initialization inside declaration. + 2005-09-28 Reiner Steib <Reiner.Steib@gmx.de> * message.el: Remove useless autoloads. @@ -16,10 +44,9 @@ * mm-uu.el (mm-uu-emacs-sources-regexp): Make variable customizable. Change default value. (mm-uu-diff-groups-regexp): Change default value. - (mm-uu-type-alist): Added doc string. - (mm-uu-configure): Added doc string. Make it interactive. - (mm-uu-diff-groups-regexp): Fix missing quotes from previous - commit. + (mm-uu-type-alist): Add doc string. + (mm-uu-configure): Add doc string. Make it interactive. + (mm-uu-diff-groups-regexp): Fix missing quotes from previous commit. 2005-09-27 Simon Josefsson <jas@extundo.com> @@ -75,8 +102,8 @@ 2005-09-22 Reiner Steib <Reiner.Steib@gmx.de> - * spam-report.el (spam-report-url-ping-plain): Use - gnus-extended-version as User-Agent. + * spam-report.el (spam-report-url-ping-plain): + Use gnus-extended-version as User-Agent. * gnus-agent.el (gnus-agent-synchronize-flags): Explain why the default value is nil. @@ -92,7 +119,7 @@ * mm-url.el (mm-url-decode-entities): Fix regexp. -2005-09-18 D Goel <deego@gnufans.org> +2005-09-18 Deepak Goel <deego@gnufans.org> * sieve.el (sieve-help): Fix `message' call: first arg should be a format spec. @@ -125,9 +152,9 @@ 2005-09-07 Reiner Steib <Reiner.Steib@gmx.de> * spam-report.el (spam-report-gmane): Make it work without - X-Report-Spam header. Gmane now only provides Archived-At. This - is only used if `spam-report-gmane-use-article-number' is nil. - (spam-report-gmane-spam-header): Removed. Not used anymore. + X-Report-Spam header. Gmane now only provides Archived-At. + This is only used if `spam-report-gmane-use-article-number' is nil. + (spam-report-gmane-spam-header): Remove. Not used anymore. * nnweb.el (nnweb-google-wash-article): Print a message if article is not available. diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2 index f39bf525db8..50b978e7e75 100644 --- a/lisp/gnus/ChangeLog.2 +++ b/lisp/gnus/ChangeLog.2 @@ -7390,7 +7390,7 @@ instead of mm-auto-save-coding-system for the draft or delayed group. -2002-10-28 Josh <huber@alum.wpi.edu> +2002-10-28 Josh Huber <huber@alum.wpi.edu> * mml.el (mml-mode-map): Fixed keybindings for mml-secure-* functions. diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el index 5556a815d2a..f7fb279f20f 100644 --- a/lisp/gnus/gnus-util.el +++ b/lisp/gnus/gnus-util.el @@ -1037,14 +1037,6 @@ This function saves the current buffer." (set-buffer gnus-group-buffer) (eq major-mode 'gnus-group-mode)))) -(defun gnus-remove-duplicates (list) - (let (new) - (while list - (or (member (car list) new) - (setq new (cons (car list) new))) - (setq list (cdr list))) - (nreverse new))) - (defun gnus-remove-if (predicate list) "Return a copy of LIST with all items satisfying PREDICATE removed." (let (out) diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index 721988045cf..5ed670aced8 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -2027,14 +2027,6 @@ With prefix-argument just set Follow-Up, don't cross-post." ;;; End of functions adopted from `message-utils.el'. -(defun message-remove-duplicates (list) - (let (new) - (while list - (or (member (car list) new) - (setq new (cons (car list) new))) - (setq list (cdr list))) - (nreverse new))) - (defun message-remove-header (header &optional is-regexp first reverse) "Remove HEADER in the narrowed buffer. If IS-REGEXP, HEADER is a regular expression. @@ -4963,7 +4955,7 @@ subscribed address (and not the additional To and Cc header contents)." rhs ace address) (when field (dolist (rhs - (message-remove-duplicates + (mm-delete-duplicates (mapcar (lambda (rhs) (or (cadr (split-string rhs "@")) "")) (mapcar 'downcase (mapcar diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el index 76a66268586..9d0bbdfeb63 100644 --- a/lisp/gnus/mm-decode.el +++ b/lisp/gnus/mm-decode.el @@ -222,7 +222,12 @@ before the external MIME handler is invoked." ("text/richtext" mm-inline-text identity) ("text/x-patch" mm-display-patch-inline (lambda (handle) - (locate-library "diff-mode"))) + ;; If the diff-mode.el package is installed, the function is + ;; autoloaded. Checking (locate-library "diff-mode") would be trying + ;; to cater to broken installations. OTOH checking the function + ;; makes it possible to install another package which provides an + ;; alternative implementation of diff-mode. --Stef + (fboundp 'diff-mode))) ("application/emacs-lisp" mm-display-elisp-inline identity) ("application/x-emacs-lisp" mm-display-elisp-inline identity) ("text/html" @@ -451,21 +456,19 @@ If not set, `default-directory' will be used." (defvar mm-viewer-completion-map (let ((map (make-sparse-keymap 'mm-viewer-completion-map))) (set-keymap-parent map minibuffer-local-completion-map) + ;; Should we bind other key to minibuffer-complete-word? + (define-key map " " 'self-insert-command) map) "Keymap for input viewer with completion.") -;; Should we bind other key to minibuffer-complete-word? -(define-key mm-viewer-completion-map " " 'self-insert-command) - (defvar mm-viewer-completion-map (let ((map (make-sparse-keymap 'mm-viewer-completion-map))) (set-keymap-parent map minibuffer-local-completion-map) + ;; Should we bind other key to minibuffer-complete-word? + (define-key map " " 'self-insert-command) map) "Keymap for input viewer with completion.") -;; Should we bind other key to minibuffer-complete-word? -(define-key mm-viewer-completion-map " " 'self-insert-command) - ;;; The functions. (defun mm-alist-to-plist (alist) @@ -564,7 +567,7 @@ Postpone undisplaying of viewers for types in ;; 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 article). That would probably require changing - ;; the mm-handle API so we simply store the multipart buffert + ;; the mm-handle API so we simply store the multipart buffer ;; name as a text property of the "multipart/whatever" string. (add-text-properties 0 (length (car ctl)) (list 'buffer (mm-copy-to-buffer) @@ -807,8 +810,7 @@ external if displayed external." (mm-mailcap-command method file (mm-handle-type handle))) (if (buffer-live-p buffer) - (save-excursion - (set-buffer buffer) + (with-current-buffer buffer (buffer-string)))) (progn (ignore-errors (delete-file file)) diff --git a/lisp/gnus/mm-url.el b/lisp/gnus/mm-url.el index 4fd39e477f6..b24f9d4132a 100644 --- a/lisp/gnus/mm-url.el +++ b/lisp/gnus/mm-url.el @@ -64,7 +64,7 @@ '((wget "wget" "--user-agent=mm-url" "-q" "-O" "-") (w3m "w3m" "-dump_source") (lynx "lynx" "-source") - (curl "curl" "--silent"))) + (curl "curl" "--silent" "--user-agent mm-url" "--location"))) (defcustom mm-url-program (cond diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el index a40e147c026..ef050f3d621 100644 --- a/lisp/gnus/mm-util.el +++ b/lisp/gnus/mm-util.el @@ -538,14 +538,21 @@ If the charset is `composition', return the actual one." ;; This is for XEmacs. (mm-mule-charset-to-mime-charset charset))) -(defun mm-delete-duplicates (list) - "Simple substitute for CL `delete-duplicates', testing with `equal'." - (let (result head) - (while list - (setq head (car list)) - (setq list (delete head list)) - (setq result (cons head result))) - (nreverse result))) +(if (fboundp 'delete-dups) + (defalias 'mm-delete-duplicates 'delete-dups) + (defun mm-delete-duplicates (list) + "Destructively remove `equal' duplicates from LIST. +Store the result in LIST and return it. LIST must be a proper list. +Of several `equal' occurrences of an element in LIST, the first +one is kept. + +This is a compatibility function for Emacsen without `delete-dups'." + ;; Code from `subr.el' in Emacs 22: + (let ((tail list)) + (while tail + (setcdr tail (delete (car tail) (cdr tail))) + (setq tail (cdr tail)))) + list)) ;; Fixme: This is used in places when it should be testing the ;; default multibyteness. See mm-default-multibyte-p. diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el index 98563143243..ad913d441b7 100644 --- a/lisp/gnus/nnmail.el +++ b/lisp/gnus/nnmail.el @@ -1142,7 +1142,7 @@ FUNC will be called with the group name to determine the article number." 5 "Error in `nnmail-split-methods'; using `bogus' mail group") (sit-for 1) '("bogus"))))) - (setq split (gnus-remove-duplicates split)) + (setq split (mm-delete-duplicates split)) ;; The article may be "cross-posted" to `junk'. What ;; to do? Just remove the `junk' spec. Don't really ;; see anything else to do... |