2 files changed, 5 insertions, 1 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 07d1d471b9f..5f8b092c62a 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-23  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-art.el (gnus-mime-display-single): Avoid "End of buffer" error.
+
 2015-02-18  Eric Abrahamsen  <eric@ericabrahamsen.net>
 
         * nnimap.el (nnimap-get-groups): Correctly read unquoted group names
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 85030959f79..83a2f941e9c 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -6101,7 +6101,7 @@ If nil, don't show those extra buttons."
               (gnus-article-insert-newline)
             (if (prog1
                     (= (skip-chars-backward "\n") -1)
-                  (forward-char 1))
+                  (unless (eobp) (forward-char 1)))
                 (gnus-article-insert-newline)
               (put-text-property (point) (point-max) 'gnus-undeletable t))
             (goto-char (point-max)))