Merge from trunk.

[bpt/emacs.git] / lisp / textmodes / rst.el

diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el
index b55146c..c1ce950 100644 (file)
--- a/lisp/textmodes/rst.el
+++ b/lisp/textmodes/rst.el
@@ -2800,11 +2800,12 @@ details check the Rst Faces Defaults group."
                         rst-level-face-base-color
                         (+ (* (1- i) rst-level-face-step-light)
                            rst-level-face-base-light))))
-       (make-empty-face sym)
-       (set-face-doc-string sym doc)
-       (set-face-background sym col)
-       (set sym sym)
-       (setq i (1+ i))))))
+        (unless (facep sym)
+          (make-empty-face sym)
+          (set-face-doc-string sym doc)
+          (set-face-background sym col)
+          (set sym sym))
+        (setq i (1+ i))))))
 
 (rst-define-level-faces)