Commit fe62aacc authored by Miles Bader's avatar Miles Bader

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-139

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 49-51)

   - Merge from emacs--devo--0
   - Update from CVS
parent 48b60fa1
......@@ -355,6 +355,10 @@ in the Agent, it won't get downloaded once more. Customize
On composing messages, it is enabled by `use-hard-newlines'. Decoding
format=flowed was present but not documented in earlier versions.
** The option `mm-fill-flowed' can be used to disable treatment of
format=flowed messages. Also, flowed text is disabled when sending
inline PGP signed messages. (New in Gnus 5.10.7)
** Gnus supports the generation of RFC 2298 Disposition Notification requests.
This is invoked with the C-c M-n key binding from message mode.
......
2006-03-06 Katsumi Yamaoka <yamaoka@jpl.org>
* mm-view.el (mm-w3m-cid-retrieve-1): Check carefully whether
handle is multipart when calling it recursively.
(mm-w3m-cid-retrieve): Display warning if retrieving fails.
2006-03-03 Reiner Steib <Reiner.Steib@gmx.de>
* mm-util.el (mm-with-unibyte-current-buffer): Change "Emacs 23"
to "Emacs 23 (unicode)" in doc string.
* gnus-sum.el (gnus-summary-set-display-table): Change "Emacs 23" to
"Emacs 23 (unicode)" in comment.
2006-03-03 Katsumi Yamaoka <yamaoka@jpl.org>
* mm-decode.el (mm-get-part): Don't use
......
......@@ -3099,7 +3099,7 @@ display only a single character."
;; We keep TAB as well.
(aset table ?\t nil)
;; We nix out any glyphs 127 through 255, or 127 through 159 in
;; Emacs 23, that are not set already.
;; Emacs 23 (unicode), that are not set already.
(let ((i (if (ignore-errors (= (make-char 'latin-iso8859-1 160) 160))
160
256)))
......
......@@ -802,7 +802,8 @@ NOTE: Use this macro with caution in multibyte buffers (it is not
worth using this macro in unibyte buffers of course). Use of
`(set-buffer-multibyte t)', which is run finally, is generally
harmful since it is likely to modify existing data in the buffer.
For instance, it converts \"\\300\\255\" into \"\\255\" in Emacs 23."
For instance, it converts \"\\300\\255\" into \"\\255\" in
Emacs 23 (unicode)."
(let ((multibyte (make-symbol "multibyte"))
(buffer (make-symbol "buffer")))
`(if mm-emacs-mule
......
......@@ -213,21 +213,25 @@
(defun mm-w3m-cid-retrieve-1 (url handle)
(dolist (elem handle)
(when (listp elem)
(if (equal url (mm-handle-id elem))
(progn
(mm-insert-part elem)
(throw 'found-handle (mm-handle-media-type elem))))
(if (equal "multipart" (mm-handle-media-supertype elem))
(mm-w3m-cid-retrieve-1 url elem)))))
(when (consp elem)
(when (equal url (mm-handle-id elem))
(mm-insert-part elem)
(throw 'found-handle (mm-handle-media-type elem)))
(when (and (stringp (car elem))
(equal "multipart" (mm-handle-media-supertype elem)))
(mm-w3m-cid-retrieve-1 url elem)))))
(defun mm-w3m-cid-retrieve (url &rest args)
"Insert a content pointed by URL if it has the cid: scheme."
(when (string-match "\\`cid:" url)
(catch 'found-handle
(mm-w3m-cid-retrieve-1 (concat "<" (substring url (match-end 0)) ">")
(with-current-buffer w3m-current-buffer
gnus-article-mime-handles)))))
(or (catch 'found-handle
(mm-w3m-cid-retrieve-1
(setq url (concat "<" (substring url (match-end 0)) ">"))
(with-current-buffer w3m-current-buffer
gnus-article-mime-handles)))
(prog1
nil
(message "Failed to find \"Content-ID: %s\"" url)))))
(defun mm-inline-text-html-render-with-w3m (handle)
"Render a text/html part using emacs-w3m."
......
2006-03-03 Reiner Steib <Reiner.Steib@gmx.de>
* gnus.texi (Oort Gnus): Add `mm-fill-flowed'.
2006-03-01 Carsten Dominik <dominik@science.uva.nl>
* org.texi: (Interaction): Added item about `org-mouse.el' by
......
......@@ -26308,6 +26308,11 @@ composing messages, it is enabled by @code{use-hard-newlines}.
Decoding format=flowed was present but not documented in earlier
versions.
@item
The option @code{mm-fill-flowed} can be used to disable treatment of
``format=flowed'' messages. Also, flowed text is disabled when sending
inline PGP signed messages. (New in Gnus 5.10.7)
@item
Gnus supports the generation of RFC 2298 Disposition Notification requests.
......
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