diff options
| author | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2013-06-27 11:01:08 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2013-06-27 11:01:08 +0200 |
| commit | 7f13406b7ab86bc497f9e81abc1eb832507ac46e (patch) | |
| tree | 966940eea4a6f6b30db7355cf0fa1ed15bd291d5 | |
| parent | d29bf51cef5ca60fe719d7614ffdfdd1339fc84d (diff) | |
| download | emacs-7f13406b7ab86bc497f9e81abc1eb832507ac46e.tar.gz | |
* net/shr.el (add-face-text-property): Removed compat definition.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/net/shr.el | 21 |
2 files changed, 4 insertions, 21 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7304c180115..4c0952f88f5 100644 --- 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 e1b1d4a93f7..f2db68b96d1 100644 --- 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: |