Commit 53cfefc8 authored by Miles Bader's avatar Miles Bader
Browse files

Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-564

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 125-127)

   - Merge from emacs--cvs-trunk--0
   - Update from CVS

2005-09-27  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/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.

2005-09-27  Simon Josefsson  <jas@extundo.com>

   * lisp/gnus/message.el (message-idna-to-ascii-rhs-1): Reformat.

2005-09-27  Arne J,Ax(Brgensen  <arne@arnested.dk>

   * lisp/gnus/message.el (message-remove-duplicates): New function.
   Implementation borrowed from `gnus-remove-duplicates'.
   (message-idna-to-ascii-rhs): Also encode idna addresses in
   Reply-To:, Mail-Reply-To: and Mail-Followup-To:.
   (message-idna-to-ascii-rhs-1): When `message-use-idna' is 'ask
   only ask about the same idna domain once per header and also tell
   in what header to replace the idna domain.

   * lisp/gnus/gnus-art.el (article-decode-idna-rhs): Also decode idna
   addresses in Reply-To:, Mail-Reply-To: and Mail-Followup-To:.
   (article-decode-idna-rhs): Fix regexp so that all idna-address in
   a header is decoded and not just the last one.

2005-09-27  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-art.el (gnus-mime-display-single): Don't modify text if it
   has been decoded.

   * lisp/gnus/mm-decode.el (mm-insert-part): Don't modify text if it has been
   decoded.

   * lisp/gnus/mm-view.el (mm-inline-text): Don't strip text props unless
   decoding enriched or richtext parts.

2005-09-26  Katsumi Yamaoka  <yamaoka@jpl.org>

   * man/gnus.texi (Server Buffer Format): Document the %a format spec.
parent 0b292bd0
2005-09-27 Reiner Steib <Reiner.Steib@gmx.de>
* 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.
2005-09-27 Simon Josefsson <jas@extundo.com>
* message.el (message-idna-to-ascii-rhs-1): Reformat.
2005-09-27 Arne J,Ax(Brgensen <arne@arnested.dk>
* message.el (message-remove-duplicates): New function.
Implementation borrowed from `gnus-remove-duplicates'.
(message-idna-to-ascii-rhs): Also encode idna addresses in
Reply-To:, Mail-Reply-To: and Mail-Followup-To:.
(message-idna-to-ascii-rhs-1): When `message-use-idna' is 'ask
only ask about the same idna domain once per header and also tell
in what header to replace the idna domain.
* gnus-art.el (article-decode-idna-rhs): Also decode idna
addresses in Reply-To:, Mail-Reply-To: and Mail-Followup-To:.
(article-decode-idna-rhs): Fix regexp so that all idna-address in
a header is decoded and not just the last one.
2005-09-27 Katsumi Yamaoka <yamaoka@jpl.org>
* gnus-art.el (gnus-mime-display-single): Don't modify text if it
has been decoded.
* mm-decode.el (mm-insert-part): Don't modify text if it has been
decoded.
* mm-view.el (mm-inline-text): Don't strip text props unless
decoding enriched or richtext parts.
2005-09-25 Romain Francoise <romain@orebokech.com> 2005-09-25 Romain Francoise <romain@orebokech.com>
* gnus-agent.el (gnus-agent-expire-group, gnus-agent-expire): * gnus-agent.el (gnus-agent-expire-group, gnus-agent-expire):
......
...@@ -2333,20 +2333,22 @@ If PROMPT (the prefix), prompt for a coding system to use." ...@@ -2333,20 +2333,22 @@ If PROMPT (the prefix), prompt for a coding system to use."
(autoload 'idna-to-unicode "idna") (autoload 'idna-to-unicode "idna")
(defun article-decode-idna-rhs () (defun article-decode-idna-rhs ()
"Decode IDNA strings in RHS in From:, To: and Cc: headers in current buffer." "Decode IDNA strings in RHS in various headers in current buffer.
The following headers are decoded: From:, To:, Cc:, Reply-To:,
Mail-Reply-To: and Mail-Followup-To:."
(when gnus-use-idna (when gnus-use-idna
(save-restriction (save-restriction
(let ((inhibit-point-motion-hooks t) (let ((inhibit-point-motion-hooks t)
(inhibit-read-only t)) (inhibit-read-only t))
(article-narrow-to-head) (article-narrow-to-head)
(goto-char (point-min)) (goto-char (point-min))
(while (re-search-forward "@.*\\(xn--[-A-Za-z0-9.]*\\)[ \t\n\r,>]" nil t) (while (re-search-forward "@[^ \t\n\r,>]*\\(xn--[-A-Za-z0-9.]*\\)[ \t\n\r,>]" nil t)
(let (ace unicode) (let (ace unicode)
(when (save-match-data (when (save-match-data
(and (setq ace (match-string 1)) (and (setq ace (match-string 1))
(save-excursion (save-excursion
(and (re-search-backward "^[^ \t]" nil t) (and (re-search-backward "^[^ \t]" nil t)
(looking-at "From\\|To\\|Cc"))) (looking-at "From\\|To\\|Cc\\|Reply-To\\|Mail-Reply-To\\|Mail-Followup-To")))
(setq unicode (idna-to-unicode ace)))) (setq unicode (idna-to-unicode ace))))
(unless (string= ace unicode) (unless (string= ace unicode)
(replace-match unicode nil nil nil 1))))))))) (replace-match unicode nil nil nil 1)))))))))
...@@ -4864,14 +4866,17 @@ If displaying \"text/html\" is discouraged \(see ...@@ -4864,14 +4866,17 @@ If displaying \"text/html\" is discouraged \(see
(forward-line -1) (forward-line -1)
(setq beg (point))) (setq beg (point)))
(gnus-article-insert-newline) (gnus-article-insert-newline)
(mm-insert-inline handle (mm-insert-inline
(let ((charset handle
(mail-content-type-get (let ((charset (mail-content-type-get (mm-handle-type handle)
(mm-handle-type handle) 'charset))) 'charset)))
(if (eq charset 'gnus-decoded) (cond ((not charset)
(mm-get-part handle) (mm-string-as-multibyte (mm-get-part handle)))
(mm-decode-string (mm-get-part handle) ((eq charset 'gnus-decoded)
charset)))) (with-current-buffer (mm-handle-buffer handle)
(buffer-string)))
(t
(mm-decode-string (mm-get-part handle) charset)))))
(goto-char (point-max)))) (goto-char (point-max))))
;; Do highlighting. ;; Do highlighting.
(save-excursion (save-excursion
......
...@@ -2030,6 +2030,14 @@ With prefix-argument just set Follow-Up, don't cross-post." ...@@ -2030,6 +2030,14 @@ With prefix-argument just set Follow-Up, don't cross-post."
;;; End of functions adopted from `message-utils.el'. ;;; 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) (defun message-remove-header (header &optional is-regexp first reverse)
"Remove HEADER in the narrowed buffer. "Remove HEADER in the narrowed buffer.
If IS-REGEXP, HEADER is a regular expression. If IS-REGEXP, HEADER is a regular expression.
...@@ -4957,13 +4965,17 @@ subscribed address (and not the additional To and Cc header contents)." ...@@ -4957,13 +4965,17 @@ subscribed address (and not the additional To and Cc header contents)."
(let ((field (message-fetch-field header)) (let ((field (message-fetch-field header))
rhs ace address) rhs ace address)
(when field (when field
(dolist (address (mail-header-parse-addresses field)) (dolist (rhs
(setq address (car address) (message-remove-duplicates
rhs (downcase (or (cadr (split-string address "@")) "")) (mapcar (lambda (rhs) (or (cadr (split-string rhs "@")) ""))
ace (downcase (idna-to-ascii rhs))) (mapcar 'downcase
(mapcar
'car (mail-header-parse-addresses field))))))
(setq ace (downcase (idna-to-ascii rhs)))
(when (and (not (equal rhs ace)) (when (and (not (equal rhs ace))
(or (not (eq message-use-idna 'ask)) (or (not (eq message-use-idna 'ask))
(y-or-n-p (format "Replace %s with %s? " rhs ace)))) (y-or-n-p (format "Replace %s with %s in %s:? "
rhs ace header))))
(goto-char (point-min)) (goto-char (point-min))
(while (re-search-forward (concat "^" header ":") nil t) (while (re-search-forward (concat "^" header ":") nil t)
(message-narrow-to-field) (message-narrow-to-field)
...@@ -4982,6 +4994,9 @@ See `message-idna-encode'." ...@@ -4982,6 +4994,9 @@ See `message-idna-encode'."
(message-narrow-to-head) (message-narrow-to-head)
(message-idna-to-ascii-rhs-1 "From") (message-idna-to-ascii-rhs-1 "From")
(message-idna-to-ascii-rhs-1 "To") (message-idna-to-ascii-rhs-1 "To")
(message-idna-to-ascii-rhs-1 "Reply-To")
(message-idna-to-ascii-rhs-1 "Mail-Reply-To")
(message-idna-to-ascii-rhs-1 "Mail-Followup-To")
(message-idna-to-ascii-rhs-1 "Cc"))))) (message-idna-to-ascii-rhs-1 "Cc")))))
(defun message-generate-headers (headers) (defun message-generate-headers (headers)
......
...@@ -1058,9 +1058,15 @@ external if displayed external." ...@@ -1058,9 +1058,15 @@ external if displayed external."
(defun mm-insert-part (handle) (defun mm-insert-part (handle)
"Insert the contents of HANDLE in the current buffer." "Insert the contents of HANDLE in the current buffer."
(save-excursion (save-excursion
(insert (if (mm-multibyte-p) (insert
(mm-string-as-multibyte (mm-get-part handle)) (cond ((eq (mail-content-type-get (mm-handle-type handle) 'charset)
(mm-get-part handle))))) 'gnus-decoded)
(with-current-buffer (mm-handle-buffer handle)
(buffer-string)))
((mm-multibyte-p)
(mm-string-as-multibyte (mm-get-part handle)))
(t
(mm-get-part handle))))))
(defun mm-file-name-delete-whitespace (file-name) (defun mm-file-name-delete-whitespace (file-name)
"Remove all whitespace characters from FILE-NAME." "Remove all whitespace characters from FILE-NAME."
......
...@@ -77,11 +77,15 @@ decoder, such as hexbin." ...@@ -77,11 +77,15 @@ decoder, such as hexbin."
"The default disposition of uu parts. "The default disposition of uu parts.
This can be either \"inline\" or \"attachment\".") This can be either \"inline\" or \"attachment\".")
(defvar mm-uu-emacs-sources-regexp "gnu\\.emacs\\.sources" (defcustom mm-uu-emacs-sources-regexp "\\.emacs\\.sources"
"The regexp of Emacs sources groups.") "The regexp of Emacs sources groups."
:version "22.1"
:type 'regexp
:group 'gnus-article-mime)
(defcustom mm-uu-diff-groups-regexp "gnus\\.commits" (defcustom mm-uu-diff-groups-regexp
"*Regexp matching diff groups." "\\(gmane\\|gnu\\)\\..*\\(diff\\|commit\\|cvs\\|bug\\|devel\\)"
"Regexp matching diff groups."
:version "22.1" :version "22.1"
:type 'regexp :type 'regexp
:group 'gnus-article-mime) :group 'gnus-article-mime)
...@@ -153,7 +157,12 @@ This can be either \"inline\" or \"attachment\".") ...@@ -153,7 +157,12 @@ This can be either \"inline\" or \"attachment\".")
nil nil
mm-uu-diff-extract mm-uu-diff-extract
nil nil
mm-uu-diff-test))) mm-uu-diff-test))
"A list of specifications for non-MIME attachments.
Each element consist of the following entries: label,
start-regexp, end-regexp, extract-function, test-function.
After modifying this list you must run \\[mm-uu-configure].")
(defcustom mm-uu-configure-list '((shar . disabled)) (defcustom mm-uu-configure-list '((shar . disabled))
"A list of mm-uu configuration. "A list of mm-uu configuration.
...@@ -202,6 +211,8 @@ Return that buffer." ...@@ -202,6 +211,8 @@ Return that buffer."
(member (cons key val) mm-uu-configure-list)) (member (cons key val) mm-uu-configure-list))
(defun mm-uu-configure (&optional symbol value) (defun mm-uu-configure (&optional symbol value)
"Configure detection of non-MIME attachments."
(interactive)
(if symbol (set-default symbol value)) (if symbol (set-default symbol value))
(setq mm-uu-beginning-regexp nil) (setq mm-uu-beginning-regexp nil)
(mapcar (lambda (entry) (mapcar (lambda (entry)
......
...@@ -367,9 +367,9 @@ ...@@ -367,9 +367,9 @@
(goto-char (point-max)))) (goto-char (point-max))))
(save-restriction (save-restriction
(narrow-to-region b (point)) (narrow-to-region b (point))
(set-text-properties (point-min) (point-max) nil)
(when (or (equal type "enriched") (when (or (equal type "enriched")
(equal type "richtext")) (equal type "richtext"))
(set-text-properties (point-min) (point-max) nil)
(ignore-errors (ignore-errors
(enriched-decode (point-min) (point-max)))) (enriched-decode (point-min) (point-max))))
(mm-handle-set-undisplayer (mm-handle-set-undisplayer
......
2005-09-26 Katsumi Yamaoka <yamaoka@jpl.org>
* gnus.texi (Server Buffer Format): Document the %a format spec.
2005-09-25 Richard M. Stallman <rms@gnu.org> 2005-09-25 Richard M. Stallman <rms@gnu.org>
* search.texi (Regexp Search): Doc search-whitespace-regexp. * search.texi (Regexp Search): Doc search-whitespace-regexp.
......
...@@ -12199,6 +12199,9 @@ Where the news is to be fetched from---the address. ...@@ -12199,6 +12199,9 @@ Where the news is to be fetched from---the address.
   
@item s @item s
The opened/closed/denied status of the server. The opened/closed/denied status of the server.
@item a
Whether this server is agentized.
@end table @end table
   
@vindex gnus-server-mode-line-format @vindex gnus-server-mode-line-format
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment