diff options
| author | Ivan | 2026-03-21 20:01:15 +0100 |
|---|---|---|
| committer | F. Jason Park | 2026-03-23 18:14:57 -0700 |
| commit | 52e5dbd2da295e7a67e66920a67423a6ca355e7c (patch) | |
| tree | 8a3c1b0945adc3dda6f8d6c244026ff90dd3427b /lisp | |
| parent | bb3c10396885cb1334fb56eaf4c7a0fdada65e73 (diff) | |
| download | emacs-52e5dbd2da295e7a67e66920a67423a6ca355e7c.tar.gz emacs-52e5dbd2da295e7a67e66920a67423a6ca355e7c.zip | |
Fix erc-track-faces-normal-list regression
* lisp/erc/erc-track.el (erc-track--select-mode-line-face): Check
whether ranked faces in the message appear in the value of the option
`erc-track-faces-normal-list' rather than repeatedly checking if the
current nominee does, usually the highest ranked face in the message.
Failure to do so caused ERC to treat faces absent from the option's
value as being present and thus eligible to replace ranked faces in the
mode line segment. This bug was introduced in ERC 5.6 and is also part
of 5.6.1. (Bug#80659)
Copyright-paperwork-exempt: yes
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/erc/erc-track.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el index f5ea63ae764..6306df3fa2a 100644 --- a/lisp/erc/erc-track.el +++ b/lisp/erc/erc-track.el | |||
| @@ -1006,7 +1006,7 @@ Failing that, choose the first face in both NEW-FACES and NORMALS." | |||
| 1006 | (dolist (candidate (cdr ranks)) | 1006 | (dolist (candidate (cdr ranks)) |
| 1007 | (when (and (not (equal candidate choice)) | 1007 | (when (and (not (equal candidate choice)) |
| 1008 | (gethash candidate (car new-faces)) | 1008 | (gethash candidate (car new-faces)) |
| 1009 | (gethash choice normals)) | 1009 | (gethash candidate normals)) |
| 1010 | (throw 'face candidate))) | 1010 | (throw 'face candidate))) |
| 1011 | ;; Otherwise, go with any "normal" face other than | 1011 | ;; Otherwise, go with any "normal" face other than |
| 1012 | ;; `choice' in the region. | 1012 | ;; `choice' in the region. |