[Emacs-diffs] trunk r113200: * net/shr.el (add-face-text-property): Removed compat definition.

[Lars Ingebrigtsen]

------------------------------------------------------------
revno: 113200
revision-id: address@hidden
parent: address@hidden
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Thu 2013-06-27 11:01:08 +0200
message:
  * net/shr.el (add-face-text-property): Removed compat definition.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/shr.el                shr.el-20101002102929-yfzewk55rsg0mn93-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-06-27 08:33:43 +0000
+++ b/lisp/ChangeLog    2013-06-27 09:01:08 +0000
@@ -1,3 +1,7 @@
+2013-06-27  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * net/shr.el (add-face-text-property): Removed compat definition.
+
 2013-06-27  Stephen Berman  <address@hidden>
 
        * obsolete/otodo-mode.el: Add obsolescence info to file header.

=== modified file 'lisp/net/shr.el'
--- a/lisp/net/shr.el   2013-06-25 19:25:14 +0000
+++ b/lisp/net/shr.el   2013-06-27 09:01:08 +0000
@@ -1606,27 +1606,6 @@
                              (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: