[Emacs-diffs] /srv/bzr/emacs/trunk r102980: 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.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 102980
author: Lars Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Wed 2011-01-26 10:25:18 +0000
message:
  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.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/shr.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-01-26 08:36:39 +0000
+++ b/lisp/gnus/ChangeLog       2011-01-26 10:25:18 +0000
@@ -1,3 +1,9 @@
+2011-01-26  Lars Ingebrigtsen  <address@hidden>
+
+       * 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  <address@hidden>
 
        * nnimap.el (nnimap-open-connection-1): Store the actual stream type

=== modified file 'lisp/gnus/shr.el'
--- a/lisp/gnus/shr.el  2011-01-25 10:36:00 +0000
+++ b/lisp/gnus/shr.el  2011-01-26 10:25:18 +0000
@@ -82,30 +82,6 @@
                 (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 @@
   (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)