From 1d43a35f49f7403f7f50f36dddf88167a7c81f11 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Fri, 7 Sep 2012 12:07:00 +0800 Subject: 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. --- lisp/gnus/gnus-salt.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lisp/gnus/gnus-salt.el') 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)) ? ))) -- cgit v1.2.3