Mercurial > emacs
comparison lisp/gnus/gnus-art.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 | 3e162bf0db79 |
children | 06561ecd74ea f8a7a9ba3d08 |
comparison
equal
deleted
inserted
replaced
59763:61d237d84508 | 59764:472e5513512f |
---|---|
1 ;;; gnus-art.el --- article mode commands for Gnus | 1 ;;; gnus-art.el --- article mode commands for Gnus |
2 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 | 2 ;; Copyright (C) 1996, 1997, 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 ;; Keywords: news | 6 ;; Keywords: news |
7 | 7 |
3741 (save-excursion | 3741 (save-excursion |
3742 (set-buffer (gnus-get-buffer-create gnus-original-article-buffer)) | 3742 (set-buffer (gnus-get-buffer-create gnus-original-article-buffer)) |
3743 (mm-enable-multibyte) | 3743 (mm-enable-multibyte) |
3744 (setq major-mode 'gnus-original-article-mode) | 3744 (setq major-mode 'gnus-original-article-mode) |
3745 (make-local-variable 'gnus-original-article)) | 3745 (make-local-variable 'gnus-original-article)) |
3746 (if (get-buffer name) | 3746 (if (and (get-buffer name) |
3747 (with-current-buffer name | |
3748 (if gnus-article-edit-mode | |
3749 (if (y-or-n-p "Article mode edit in progress; discard? ") | |
3750 (progn | |
3751 (set-buffer-modified-p nil) | |
3752 (gnus-kill-buffer name) | |
3753 (message "") | |
3754 nil) | |
3755 (error "Action aborted")) | |
3756 t))) | |
3747 (save-excursion | 3757 (save-excursion |
3748 (set-buffer name) | 3758 (set-buffer name) |
3749 (when (and gnus-article-edit-mode | |
3750 (buffer-modified-p) | |
3751 (not | |
3752 (y-or-n-p "Article mode edit in progress; discard? "))) | |
3753 (error "Action aborted")) | |
3754 (set (make-local-variable 'gnus-article-edit-mode) nil) | 3759 (set (make-local-variable 'gnus-article-edit-mode) nil) |
3755 (when gnus-article-mime-handles | 3760 (when gnus-article-mime-handles |
3756 (mm-destroy-parts gnus-article-mime-handles) | 3761 (mm-destroy-parts gnus-article-mime-handles) |
3757 (setq gnus-article-mime-handles nil)) | 3762 (setq gnus-article-mime-handles nil)) |
3758 ;; Set it to nil in article-buffer! | 3763 ;; Set it to nil in article-buffer! |