(gnus-article-setup-buffer): Kill and re-create the article buffer when editing

 of the article is discarded.
(gnus-article-prepare): Revert.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7b05853..6ac1e4e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * 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>
 
        * gnus-art.el (gnus-article-prepare): Remove
 2005-01-28  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-art.el (gnus-article-prepare): Remove

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index fe812a2..6a30529 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -3774,14 +3774,19 @@ commands:
       (mm-enable-multibyte)
       (setq major-mode 'gnus-original-article-mode)
       (make-local-variable 'gnus-original-article))
       (mm-enable-multibyte)
       (setq major-mode 'gnus-original-article-mode)
       (make-local-variable 'gnus-original-article))

-    (if (get-buffer name)
+    (if (and (get-buffer name)
+            (with-current-buffer name
+              (if gnus-article-edit-mode
+                  (if (y-or-n-p "Article mode edit in progress; discard? ")
+                      (progn
+                        (set-buffer-modified-p nil)
+                        (gnus-kill-buffer name)
+                        (message "")
+                        nil)
+                    (error "Action aborted"))
+                t)))

        (save-excursion
          (set-buffer name)
        (save-excursion
          (set-buffer name)

-         (when (and gnus-article-edit-mode
-                    (buffer-modified-p)
-                    (not
-                     (y-or-n-p "Article mode edit in progress; discard? ")))
-           (error "Action aborted"))

          (set (make-local-variable 'gnus-article-edit-mode) nil)
          (when gnus-article-mime-handles
            (mm-destroy-parts gnus-article-mime-handles)
          (set (make-local-variable 'gnus-article-edit-mode) nil)
          (when gnus-article-mime-handles
            (mm-destroy-parts gnus-article-mime-handles)


@@ -3839,11 +3844,6 @@ If ALL-HEADERS is non-nil, no headers are hidden."
        (when (and (boundp 'transient-mark-mode)
                   transient-mark-mode)
          (setq mark-active nil))
        (when (and (boundp 'transient-mark-mode)
                   transient-mark-mode)
          (setq mark-active nil))

-       ;; Editing of the article might not have been finished.
-       (when (local-variable-p 'after-change-functions (current-buffer))
-         (remove-hook 'after-change-functions
-                      'message-strip-forbidden-properties
-                      'local))

        (if (not (setq result (let ((inhibit-read-only t))
                                (gnus-request-article-this-buffer
                                 article group))))
        (if (not (setq result (let ((inhibit-read-only t))
                                (gnus-request-article-this-buffer
                                 article group))))