Mercurial > emacs
comparison lisp/gnus/mml.el @ 59764:472e5513512f
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-58
Merge from gnus--rel--5.10
Patches applied:
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-7
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-8
- miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-11
Update from CVS
2005-01-28 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-art.el (gnus-article-setup-buffer): Kill and re-create the
article buffer when editing of the article is discarded.
(gnus-article-prepare): Revert.
2005-01-28 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-art.el (gnus-article-prepare): Remove
message-strip-forbidden-properties from the local hook.
2005-01-24 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/mml.el (mml-generate-mime-1): Convert string into unibyte when
inserting " *mml*" buffer's contents into a unibyte temp buffer.
2005-01-28 Lars Magne Ingebrigtsen <larsi@gnus.org>
* man/gnus.texi: Some edits based on comments from David Abrahams.
2005-01-24 Katsumi Yamaoka <yamaoka@jpl.org>
* man/gnus.texi (RSS): Fix the keystroke.
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 28 Jan 2005 23:52:19 +0000 |
parents | 645f020dcc8a |
children | aac0a33f5772 f8a7a9ba3d08 |
comparison
equal
deleted
inserted
replaced
59763:61d237d84508 | 59764:472e5513512f |
---|---|
1 ;;; mml.el --- A package for parsing and validating MML documents | 1 ;;; mml.el --- A package for parsing and validating MML documents |
2 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 | 2 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 |
3 ;; Free Software Foundation, Inc. | 3 ;; Free Software Foundation, Inc. |
4 | 4 |
5 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> | 5 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> |
6 ;; This file is part of GNU Emacs. | 6 ;; This file is part of GNU Emacs. |
7 | 7 |
470 (insert "\n") | 470 (insert "\n") |
471 (insert coded)) | 471 (insert coded)) |
472 (mm-with-unibyte-buffer | 472 (mm-with-unibyte-buffer |
473 (cond | 473 (cond |
474 ((cdr (assq 'buffer cont)) | 474 ((cdr (assq 'buffer cont)) |
475 (insert-buffer-substring (cdr (assq 'buffer cont)))) | 475 (insert (with-current-buffer (cdr (assq 'buffer cont)) |
476 (mm-with-unibyte-current-buffer | |
477 (buffer-string))))) | |
476 ((and (setq filename (cdr (assq 'filename cont))) | 478 ((and (setq filename (cdr (assq 'filename cont))) |
477 (not (equal (cdr (assq 'nofile cont)) "yes"))) | 479 (not (equal (cdr (assq 'nofile cont)) "yes"))) |
478 (let ((coding-system-for-read mm-binary-coding-system)) | 480 (let ((coding-system-for-read mm-binary-coding-system)) |
479 (mm-insert-file-contents filename nil nil nil nil t))) | 481 (mm-insert-file-contents filename nil nil nil nil t))) |
480 (t | 482 (t |