aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2011-04-30 00:03:19 +0000
committerKatsumi Yamaoka2011-04-30 00:03:19 +0000
commit6eee2678174c757f405972cfedc804401cc59605 (patch)
treeea4ed8756990645c9578521f8514598bdbf6a38d
parent15cbd324fd48e47abd57b8d92c3406c866169d21 (diff)
downloademacs-6eee2678174c757f405972cfedc804401cc59605.tar.gz
emacs-6eee2678174c757f405972cfedc804401cc59605.zip
shr.el (shr-strike-through): New face.
(shr-tag-s): Use it to provide <s> support. (shr-tag-s): Remove duplicate definition.
-rw-r--r--lisp/gnus/ChangeLog6
-rw-r--r--lisp/gnus/shr.el10
2 files changed, 13 insertions, 3 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 99a08de633b..a4327337f87 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
12011-04-29 Lars Magne Ingebrigtsen <larsi@gnus.org>
2
3 * shr.el (shr-strike-through): New face.
4 (shr-tag-s): Use it to provide <s> support.
5 (shr-tag-s): Remove duplicate definition.
6
12011-04-25 Teodor Zlatanov <tzz@lifelogs.com> 72011-04-25 Teodor Zlatanov <tzz@lifelogs.com>
2 8
3 * gnus-registry.el (gnus-registry-ignore-group-p): Don't call 9 * gnus-registry.el (gnus-registry-ignore-group-p): Don't call
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index 1f6cb528c5d..20865bda5ac 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -87,6 +87,10 @@ used."
87This is used for cid: URLs, and the function is called with the 87This is used for cid: URLs, and the function is called with the
88cid: URL as the argument.") 88cid: URL as the argument.")
89 89
90(defface shr-strike-through '((t (:strike-through t)))
91 "Font for <s> elements."
92 :group 'shr)
93
90;;; Internal variables. 94;;; Internal variables.
91 95
92(defvar shr-folding-mode nil) 96(defvar shr-folding-mode nil)
@@ -760,6 +764,9 @@ ones, in case fg and bg are nil."
760 (shr-generic cont) 764 (shr-generic cont)
761 (shr-ensure-newline)) 765 (shr-ensure-newline))
762 766
767(defun shr-tag-s (cont)
768 (shr-fontize-cont cont 'shr-strike-through))
769
763(defun shr-tag-b (cont) 770(defun shr-tag-b (cont)
764 (shr-fontize-cont cont 'bold)) 771 (shr-fontize-cont cont 'bold))
765 772
@@ -775,9 +782,6 @@ ones, in case fg and bg are nil."
775(defun shr-tag-u (cont) 782(defun shr-tag-u (cont)
776 (shr-fontize-cont cont 'underline)) 783 (shr-fontize-cont cont 'underline))
777 784
778(defun shr-tag-s (cont)
779 (shr-fontize-cont cont 'strike-through))
780
781(defun shr-parse-style (style) 785(defun shr-parse-style (style)
782 (when style 786 (when style
783 (save-match-data 787 (save-match-data