Gnus: fix last change

* gnus-art.el (gnus-article-edit-part): Don't modifiy markers.
(gnus-article-read-summary-keys):
Don't bug out when there is no article in the summary buffer.

* gnus-art.el (gnus-mm-display-part):
* mm-decode.el (mm-shr):
* mm-view.el (mm-inline-text-html-render-with-w3m, mm-inline-text)
(mm-insert-inline): Revert last changes.

4 files changed, 22 insertions, 8 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 124e3b90735..94a9f56f601 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,16 @@
 2014-06-05  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+        * gnus-art.el (gnus-article-edit-part): Don't modifiy markers.
+        (gnus-article-read-summary-keys):
+        Don't bug out when there is no article in the summary buffer.
+
+        * gnus-art.el (gnus-mm-display-part):
+        * mm-decode.el (mm-shr):
+        * mm-view.el (mm-inline-text-html-render-with-w3m, mm-inline-text)
+        (mm-insert-inline): Revert last changes.
+
+2014-06-05  Katsumi Yamaoka  <yamaoka@jpl.org>
+
         * gnus-art.el (gnus-mm-display-part):
         * mm-decode.el (mm-shr):
         * mm-view.el (mm-inline-text-html-render-with-w3m, mm-inline-text)
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 7929e2e3284..edb111f99ea 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -4987,7 +4987,6 @@ and `gnus-mime-delete-part', and not provided at run-time normally."
     (gnus-article-edit-article
      `(lambda ()
         (buffer-disable-undo)
-        (erase-buffer)
         (let ((mail-parse-charset (or gnus-article-charset
                                       ',gnus-newsgroup-charset))
               (mail-parse-ignored-charsets
@@ -4995,7 +4994,11 @@ and `gnus-mime-delete-part', and not provided at run-time normally."
                    ',gnus-newsgroup-ignored-charsets))
               (mbl mml-buffer-list))
           (setq mml-buffer-list nil)
-          (insert-buffer-substring gnus-original-article-buffer)
+          (delete-region
+           (point-min)
+           (prog1
+               (goto-char (point-max))
+             (insert-buffer-substring gnus-original-article-buffer)))
           (mime-to-mml ',handles)
           (setq gnus-article-mime-handles nil)
           (let ((mbl1 mml-buffer-list))
@@ -5736,7 +5739,7 @@ all parts."
                         `(lambda ()
                            (let ((inhibit-read-only t))
                              (delete-region ,(copy-marker (point-min) t)
-                                            ,(copy-marker (point-max) t)))))))
+                                            ,(point-max-marker)))))))
                     (part
                      (mm-display-inline handle))))))
       (goto-char point)
@@ -6790,7 +6793,7 @@ not have a face in `gnus-article-boring-faces'."
                         (when (eq obuf (current-buffer))
                           (set-buffer in-buffer)
                           t))
-                (setq selected (gnus-summary-select-article))
+                (setq selected (ignore-errors (gnus-summary-select-article)))
                 (set-buffer obuf)
                 (unless not-restore-window
                   (set-window-configuration owin))
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index 31c46f2f53f..cde0af036a5 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -1868,7 +1868,7 @@ If RECURSIVE, search recursively."
        `(lambda ()
           (let ((inhibit-read-only t))
             (delete-region ,(copy-marker (point-min) t)
-                           ,(copy-marker (point-max) t))))))))
+                           ,(point-max-marker))))))))
 
 (defvar shr-map)
 
diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el
index 84030fc2065..ecfa2ac9582 100644
--- a/lisp/gnus/mm-view.el
+++ b/lisp/gnus/mm-view.el
@@ -218,7 +218,7 @@
          `(lambda ()
             (let ((inhibit-read-only t))
               (delete-region ,(copy-marker (point-min) t)
-                             ,(copy-marker (point-max) t)))))))))
+                             ,(point-max-marker)))))))))
 
 (defvar mm-w3m-standalone-supports-m17n-p (if (featurep 'mule) 'undecided)
   "*T means the w3m command supports the m17n feature.")
@@ -392,7 +392,7 @@
        `(lambda ()
           (let ((inhibit-read-only t))
             (delete-region ,(copy-marker (point-min) t)
-                           ,(copy-marker (point-max) t))))))))
+                           ,(point-max-marker))))))))
 
 (defun mm-insert-inline (handle text)
   "Insert TEXT inline from HANDLE."
@@ -405,7 +405,7 @@
      `(lambda ()
         (let ((inhibit-read-only t))
           (delete-region ,(copy-marker b t)
-                         ,(copy-marker (point) t)))))))
+                         ,(point-marker)))))))
 
 (defun mm-inline-audio (handle)
   (message "Not implemented"))