[Emacs-diffs] trunk r117263: Gnus: fix last change

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 117263
revision-id: address@hidden
parent: address@hidden
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2014-06-05 04:31:36 +0000
message:
  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.
modified:
  lisp/gnus/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-1433
  lisp/gnus/gnus-art.el          gnusart.el-20091113204419-o5vbwnq5f7feedwu-1108
  lisp/gnus/mm-decode.el         
mmdecode.el-20091113204419-o5vbwnq5f7feedwu-1971
  lisp/gnus/mm-view.el           mmview.el-20091113204419-o5vbwnq5f7feedwu-1976

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2014-06-05 01:38:42 +0000
+++ b/lisp/gnus/ChangeLog       2014-06-05 04:31:36 +0000
@@ -1,5 +1,16 @@
 2014-06-05  Katsumi Yamaoka  <address@hidden>
 
+       * 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  <address@hidden>
+
        * 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)

=== modified file 'lisp/gnus/gnus-art.el'
--- a/lisp/gnus/gnus-art.el     2014-06-05 01:38:42 +0000
+++ b/lisp/gnus/gnus-art.el     2014-06-05 04:31:36 +0000
@@ -4987,7 +4987,6 @@
     (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 @@
                   ',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 @@
                        `(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 @@
                        (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))

=== modified file 'lisp/gnus/mm-decode.el'
--- a/lisp/gnus/mm-decode.el    2014-06-05 01:38:42 +0000
+++ b/lisp/gnus/mm-decode.el    2014-06-05 04:31:36 +0000
@@ -1868,7 +1868,7 @@
        `(lambda ()
          (let ((inhibit-read-only t))
            (delete-region ,(copy-marker (point-min) t)
-                          ,(copy-marker (point-max) t))))))))
+                          ,(point-max-marker))))))))
 
 (defvar shr-map)
 

=== modified file 'lisp/gnus/mm-view.el'
--- a/lisp/gnus/mm-view.el      2014-06-05 01:38:42 +0000
+++ b/lisp/gnus/mm-view.el      2014-06-05 04:31:36 +0000
@@ -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"))