* textmodes/rst.el (rst-define-level-faces): Do not define face

symbol if it is already defined.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4af052c84e0134795c7816d2f480b24cd22f2429..9987237c6ef87d7bf1b1b849916182faa1cb7ee5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-25  Julien Danjou  <julien@danjou.info>
+
+       * textmodes/rst.el (rst-define-level-faces): Do not define face
+       symbol if it is already defined.
+
 2011-05-24  Vincent Belaïche  <vincentb1@users.sourceforge.net>
 
        * play/5x5.el (5x5-new-game, 5x5-randomize):

diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el
index b55146c2ff9399bc832c8294690e4d1751c5e9a9..9ed5309bb5311cc502392c74ee1f81199e3fba04 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 (boundp 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)