From e4dbdb099213f183db9b46fa93f998319dfb64cd Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Wed, 26 Jan 2011 10:25:18 +0000 Subject: [PATCH] shr.el: Revert change that made headings use different-sized faces. The Emacs display engine isn't advanced enough that, for instance, tables can comfortably use differntly-sized faces. --- lisp/gnus/ChangeLog | 6 ++++++ lisp/gnus/shr.el | 36 ++++++------------------------------ 2 files changed, 12 insertions(+), 30 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index cbaf4244e32..27ffd6dba39 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,9 @@ +2011-01-26 Lars Ingebrigtsen + + * shr.el: Revert change that made headings use different-sized faces. + The Emacs display engine isn't advanced enough that, for instance, + tables can comfortably use differntly-sized faces. + 2011-01-25 Lars Ingebrigtsen * nnimap.el (nnimap-open-connection-1): Store the actual stream type diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el index 48aee4004db..2f475857b3f 100644 --- a/lisp/gnus/shr.el +++ b/lisp/gnus/shr.el @@ -82,30 +82,6 @@ used." (const :tag "Use the width of the window" nil)) :group 'shr) -(defface shr-tag-h1 '((t (:bold t :height 2.2))) - "Face used for H1 tags." - :group 'shr) - -(defface shr-tag-h2 '((t (:bold t :height 2.0))) - "Face used for H2 tags." - :group 'shr) - -(defface shr-tag-h3 '((t (:bold t :height 1.8))) - "Face used for H3 tags." - :group 'shr) - -(defface shr-tag-h4 '((t (:bold t :height 1.6))) - "Face used for H4 tags." - :group 'shr) - -(defface shr-tag-h5 '((t (:bold t :height 1.4))) - "Face used for H5 tags." - :group 'shr) - -(defface shr-tag-h6 '((t (:bold t :height 1.2))) - "Face used for H6 tags." - :group 'shr) - (defvar shr-content-function nil "If bound, this should be a function that will return the content. This is used for cid: URLs, and the function is called with the @@ -906,22 +882,22 @@ ones, in case fg and bg are nil." (shr-generic cont)) (defun shr-tag-h1 (cont) - (shr-heading cont 'shr-tag-h1)) + (shr-heading cont 'bold 'underline)) (defun shr-tag-h2 (cont) - (shr-heading cont 'shr-tag-h2)) + (shr-heading cont 'bold)) (defun shr-tag-h3 (cont) - (shr-heading cont 'shr-tag-h3)) + (shr-heading cont 'italic)) (defun shr-tag-h4 (cont) - (shr-heading cont 'shr-tag-h4)) + (shr-heading cont)) (defun shr-tag-h5 (cont) - (shr-heading cont 'shr-tag-h5)) + (shr-heading cont)) (defun shr-tag-h6 (cont) - (shr-heading cont 'shr-tag-h6)) + (shr-heading cont)) (defun shr-tag-hr (cont) (shr-ensure-newline) -- 2.39.2