Update copyright year to 2015

[gnu-emacs] / lisp / mail / rmailmm.el

diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index becfb2f8cab668d6377ace05cbf9040a258ed8a2..120d517f55ca63b2514b80304a28edb16a142288 100644 (file)
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -1,6 +1,6 @@
 ;;; rmailmm.el --- MIME decoding and display stuff for RMAIL
 
-;; Copyright (C) 2006-2014 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2015 Free Software Foundation, Inc.
 
 ;; Author: Alexander Pohoyda
 ;;     Alex Schroeder
@@ -139,7 +139,7 @@ automatically display the image in the buffer."
 extracted from message in a temporary buffer.  Converts to text in current 
 buffer. If NIL, display HTML source."
   :group 'rmail
-  :version "24.5"
+  :version "25.1"
   :type '(choice function (const nil)))
 
 (defcustom rmail-mime-prefer-html
@@ -148,7 +148,7 @@ buffer. If NIL, display HTML source."
   "If non-nil, default to showing HTML part rather than text part
 when both are available"
   :group 'rmail
-  :version "24.5"
+  :version "25.1"
   :type 'boolean)
 
 ;;; End of user options.
@@ -694,7 +694,12 @@ HEADER is a header component of a MIME-entity object (see
        ;; Image retrieval happens asynchronously, but meanwhile
        ;; `rmail-swap-buffers' may have been run, leaving
        ;; `shr-image-fetched' trying to insert the image in the wrong buffer.
-       (shr-inhibit-images t))
+       (shr-inhibit-images t)
+       ;; Bind shr-width to nil to force shr-insert-document break
+       ;; the lines at the window margin.  The default is
+       ;; fill-column, whose default value is too small, and screws
+       ;; up display of the quoted messages.
+       shr-width)
     (shr-insert-document dom)))
 
 (defun rmail-mime-render-html-lynx (source-buffer)