mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 43-48)

   - Munge arch explicit ids in etc/images to match Emacs
   - Update from CVS
This commit is contained in:
Miles Bader 2006-03-03 07:45:27 +00:00
parent c99f622718
commit 719120eff4
9 changed files with 164 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lisp/gnus/mml.el
View file

@ -507,7 +507,15 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
(let ((coding-system-for-read mm-binary-coding-system))
(mm-insert-file-contents filename nil nil nil nil t)))
(t
(insert (cdr (assq 'contents cont)))))
(let ((contents (cdr (assq 'contents cont))))
(if (if (featurep 'xemacs)
(string-match "[^\000-\377]" contents)
(mm-multibyte-string-p contents))
(progn
(mm-enable-multibyte)
(insert contents)
(setq charset (mm-encode-body)))
(insert contents)))))
(setq encoding (mm-encode-buffer type)
coded (mm-string-as-multibyte (buffer-string))))
(mml-insert-mime-headers cont type charset encoding nil)