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.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 124e3b9073513728dd9d2b08e66ac16007beb2b4..94a9f56f6011bb477db22f804af59ccb6388508c 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,14 @@
+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):

diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 7929e2e3284a1bc6922aebb10c3654f618152d5f..edb111f99ea40c6538f47a7ecc7af79a3ac2ffb8 100644 (file)
--- 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 31c46f2f53fa4dead266f8478e07a0c83f001fb6..cde0af036a569949028259b0bbfc4b495ca86768 100644 (file)
--- 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 84030fc20652f3b0fc437a66ef4247c001ed4d17..ecfa2ac958252318cb735ae5fbc4827a0f59be21 100644 (file)
--- 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"))