summaryrefslogtreecommitdiff
path: root/lisp/gnus/gnus-salt.el
diff options
context:
space:
mode:
authorChong Yidong <cyd@gnu.org>2012-09-07 12:07:00 +0800
committerChong Yidong <cyd@gnu.org>2012-09-07 12:07:00 +0800
commit1d43a35f49f7403f7f50f36dddf88167a7c81f11 (patch)
treefb223a87c6616013d7074f3b0673016c882db7b1 /lisp/gnus/gnus-salt.el
parent2fe282993cf9c84f5be424dc93d03f9705a7edd8 (diff)
downloademacs-1d43a35f49f7403f7f50f36dddf88167a7c81f11.tar.gz
emacs-1d43a35f49f7403f7f50f36dddf88167a7c81f11.tar.bz2
emacs-1d43a35f49f7403f7f50f36dddf88167a7c81f11.zip
Partially revert last Gnus merge.
The add-face function has been added gnus-compat.el, but is not in Emacs; this leaves Gnus in an unusable state. * lisp/gnus/gnus-salt.el (gnus-tree-highlight-node): * lisp/gnus/gnus-sum.el (gnus-summary-highlight-line): * lisp/gnus/gnus-group.el (gnus-group-highlight-line): Revert use of add-face. * lisp/gnus/gnus-util.el (gnus-put-text-property-excluding-characters-with-faces): Restore.
Diffstat (limited to 'lisp/gnus/gnus-salt.el')
-rw-r--r--lisp/gnus/gnus-salt.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/gnus/gnus-salt.el b/lisp/gnus/gnus-salt.el
index 87a120279bc..760a7a0942e 100644
--- a/lisp/gnus/gnus-salt.el
+++ b/lisp/gnus/gnus-salt.el
@@ -660,7 +660,9 @@ Two predefined functions are available:
(not (eval (caar list))))
(setq list (cdr list)))))
(unless (eq (setq face (cdar list)) (get-text-property beg 'face))
- (add-face beg end (if (boundp face) (symbol-value face) face)))))
+ (gnus-put-text-property-excluding-characters-with-faces
+ beg end 'face
+ (if (boundp face) (symbol-value face) face)))))
(defun gnus-tree-indent (level)
(insert (make-string (1- (* (1+ gnus-tree-node-length) level)) ? )))