[Erc-commit] [commit][master] erc-track: Fix bug where no new faces would take priority.

[mwolson]

commit c84fcfbcb3c6c10b748b01a947606ac1fd270a46
Author: Michael W. Olson <address@hidden>
Date:   Sun Jan 20 22:46:48 2008 -0500

    erc-track: Fix bug where no new faces would take priority.

diff --git a/ChangeLog b/ChangeLog
index a47117d..d92fbee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,10 +17,8 @@
        * erc-track.el (erc-track-faces-priority-list): Replace erc-button
        with '(erc-button erc-default-face) so that we only care about
        buttons that are part of normal text.  Adjust customization type
-       to handle this case.
+       to handle this case.  Make erc-nick-default-face a list.
        (erc-track-find-face): Simplify.  Adapt for list of faces case.
-       (erc-track-modified-channels): Use a list, not a cons, when
-       constructing the list of faces.
        (erc-faces-in): Don't deflate lists of faces.  Add them as-is.
        (erc-track-face-priority): Use equal instead of eq.
 
diff --git a/erc-track.el b/erc-track.el
index b486709..3587771 100644
--- a/erc-track.el
+++ b/erc-track.el
@@ -178,8 +178,8 @@ The faces used are the same as used for text in the buffers.
   '(erc-error-face erc-current-nick-face erc-keyword-face erc-pal-face
     erc-nick-msg-face erc-direct-msg-face (erc-button erc-default-face)
     erc-dangerous-host-face erc-default-face erc-action-face
-    erc-nick-default-face erc-fool-face erc-notice-face erc-input-face
-    erc-prompt-face)
+    (erc-nick-default-face erc-default-face) erc-fool-face
+    erc-notice-face erc-input-face erc-prompt-face)
   "A list of faces used to highlight active buffer names in the modeline.
 If a message contains one of the faces in this list, the buffer name will
 be highlighted using that face.  The first matching face is used."
@@ -889,7 +889,7 @@ is in `erc-mode'."
                       (old-face (cddr cell))
                       (new-face (erc-track-find-face
                                  (if old-face
-                                     (list old-face faces)
+                                     (cons old-face faces)
                                    faces))))
                  (setcdr cell (cons (1+ (cadr cell)) new-face)))))
            ;; And display it