[Emacs-diffs] Changes to emacs/lisp/erc/erc-track.el,v

[Michael W. Olson]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Michael W. Olson <mwolson>      08/02/23 18:58:56

Index: erc-track.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/erc/erc-track.el,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- erc-track.el        25 Jan 2008 03:28:09 -0000      1.16
+++ erc-track.el        23 Feb 2008 18:58:56 -0000      1.17
@@ -867,17 +867,16 @@
 
 (defun erc-track-find-face (faces)
   "Return the face to use in the modeline from the faces in FACES.
-If `erc-track-faces-priority-list' is set, the one from FACES who is
-first in that list will be used.
+If `erc-track-faces-priority-list' is set, the one from FACES who
+is first in that list will be used.  If nothing matches or if
+`erc-track-faces-priority-list' is not set, the default mode-line
+faces will be used.
 
 If `erc-track-faces-normal-list' is non-nil, use it to produce a
 blinking effect that indicates channel activity when the first
 element in FACES and the highest-ranking face among the rest of
 FACES are both members of `erc-track-faces-normal-list'.
 
-If `erc-track-faces-priority-list' is not set, the first element
-in FACES will be used.
-
 If one of the faces is a list, then it will be ranked according
 to its highest-tanking face member.  A list of faces including
 that member will take priority over just the single member
@@ -892,7 +891,7 @@
                           (when (member candidate (cdr faces))
                             (throw 'face candidate)))))))
     (cond ((null choice)
-          (car faces))
+          nil)
          ((and (member choice erc-track-faces-normal-list)
                (member no-first erc-track-faces-normal-list))
           no-first)