[Emacs-diffs] /srv/bzr/emacs/trunk r104365: * textmodes/rst.el (rst-define-level-faces): Do not define face

[Julien Danjou]

------------------------------------------------------------
revno: 104365
committer: Julien Danjou <address@hidden>
branch nick: trunk
timestamp: Wed 2011-05-25 11:03:59 +0200
message:
  * textmodes/rst.el (rst-define-level-faces): Do not define face
  symbol if it is already defined.
modified:
  lisp/ChangeLog
  lisp/textmodes/rst.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-05-24 18:22:09 +0000
+++ b/lisp/ChangeLog    2011-05-25 09:03:59 +0000
@@ -1,3 +1,8 @@
+2011-05-25  Julien Danjou  <address@hidden>
+
+       * textmodes/rst.el (rst-define-level-faces): Do not define face
+       symbol if it is already defined.
+
 2011-05-24  Vincent Belaïche  <address@hidden>
 
        * play/5x5.el (5x5-new-game, 5x5-randomize):

=== modified file 'lisp/textmodes/rst.el'
--- a/lisp/textmodes/rst.el     2011-01-26 08:36:39 +0000
+++ b/lisp/textmodes/rst.el     2011-05-25 09:03:59 +0000
@@ -2800,11 +2800,12 @@
                         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)