diff options
| author | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2015-02-10 15:32:50 +1100 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2015-02-10 15:32:50 +1100 |
| commit | f149da7e9517d2fc6825e6235b3bcbbc68122d2b (patch) | |
| tree | aac72e4b4a3960fec4b60f7502ea2fd533d23a7c /lisp/gnus | |
| parent | 35d95a222d45ad79d5b22a9733bb044309ce02c5 (diff) | |
| download | emacs-shr-fontified.tar.gz | |
shr indentation fixesshr-fontified
* gnus/mm-decode.el (mm-shr): Only pass the fill column when not using
fonts, because limiting the width to what's appropriate for followups
doesn't really help when not using proportional fonts.
* net/shr.el (shr-fill-lines): Change name from "fold".
(shr-indent): Use spaces for indentation when not using fonts,
since `move-to-column' doesn't work with :width display specs.
Diffstat (limited to 'lisp/gnus')
| -rw-r--r-- | lisp/gnus/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/gnus/mm-decode.el | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 6b21888c27e..396ad2fd2a6 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,9 @@ +2015-02-10 Lars Ingebrigtsen <larsi@gnus.org> + + * mm-decode.el (mm-shr): Only pass the fill column when not using + fonts, because limiting the width to what's appropriate for followups + doesn't really help when not using proportional fonts. + 2015-02-09 Lars Ingebrigtsen <larsi@gnus.org> * mm-decode.el (mm-convert-shr-links): Don't overwrite the faces from diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el index 463d125a2b2..5a8375cf4e6 100644 --- a/lisp/gnus/mm-decode.el +++ b/lisp/gnus/mm-decode.el @@ -1815,6 +1815,7 @@ If RECURSIVE, search recursively." (start end &optional base-url)) (declare-function shr-insert-document "shr" (dom)) (defvar shr-blocked-images) +(defvar shr-use-fonts) (defvar gnus-inhibit-images) (autoload 'gnus-blocked-images "gnus-art") @@ -1822,7 +1823,10 @@ If RECURSIVE, search recursively." ;; Require since we bind its variables. (require 'shr) (let ((article-buffer (current-buffer)) - (shr-width (if shr-use-fonts nil fill-column)) + (shr-width (if (and (boundp 'shr-use-fonts) + shr-use-fonts) + nil + fill-column)) (shr-content-function (lambda (id) (let ((handle (mm-get-content-id id))) (when handle |