From dd9fdb9123576f1c0fa65094365f2ba83937b044 Mon Sep 17 00:00:00 2001 From: Katsumi Yamaoka Date: Thu, 5 Jun 2014 04:31:15 +0000 Subject: [PATCH] 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. --- lisp/ChangeLog | 11 +++++++++++ lisp/gnus-art.el | 11 +++++++---- lisp/mm-decode.el | 2 +- lisp/mm-view.el | 6 +++--- 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6484175c3..27e5fb361 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,14 @@ +2014-06-05 Katsumi Yamaoka + + * 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 * gnus-art.el (gnus-mm-display-part): diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index 5566b0ea3..183e219db 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -4988,7 +4988,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 @@ -4996,7 +4995,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)) @@ -5737,7 +5740,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) @@ -6791,7 +6794,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/mm-decode.el b/lisp/mm-decode.el index 31c46f2f5..cde0af036 100644 --- a/lisp/mm-decode.el +++ b/lisp/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/mm-view.el b/lisp/mm-view.el index 84030fc20..ecfa2ac95 100644 --- a/lisp/mm-view.el +++ b/lisp/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")) -- 2.25.1