* net/shr.el (add-face-text-property): Removed compat definition.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7304c1801153b75727552d61200dc5ef7a0971e1..4c0952f88f583084ffdd13f7c4fec85b4de5cdb1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-27  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * net/shr.el (add-face-text-property): Removed compat definition.
+
 2013-06-27  Stephen Berman  <stephen.berman@gmx.net>
 
        * obsolete/otodo-mode.el: Add obsolescence info to file header.

diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index e1b1d4a93f71574161082f2a65829e10ed721864..f2db68b96d17a9abde018751fa1dd69de2ac3350 100644 (file)
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -1606,27 +1606,6 @@ ones, in case fg and bg are nil."
                              (shr-count (cdr row) 'th))))))
     max))
 
-;; Emacs less than 24.3
-(unless (fboundp 'add-face-text-property)
-  (defun add-face-text-property (beg end face &optional appendp object)
-    "Combine FACE BEG and END."
-    (let ((b beg))
-      (while (< b end)
-       (let ((oldval (get-text-property b 'face)))
-         (put-text-property
-          b (setq b (next-single-property-change b 'face nil end))
-          'face (cond ((null oldval)
-                       face)
-                      ((and (consp oldval)
-                            (not (keywordp (car oldval))))
-                       (if appendp
-                           (nconc oldval (list face))
-                         (cons face oldval)))
-                      (t
-                       (if appendp
-                           (list oldval face)
-                         (list face oldval))))))))))
-
 (provide 'shr)
 
 ;; Local Variables: