From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Wed, 11 May 2022 13:02:08 +0000 (+0200)
Subject: Make recent nicknames erc change more backwards-compatible
X-Git-Tag: emacs-29.0.90~1910^2~803
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c113f2626e58a1d3b98bdf364902f53caa2dc3a8;p=emacs.git

Make recent nicknames erc change more backwards-compatible

* lisp/erc/erc-button.el (erc-button-add-buttons): Make the
nicknames change more backwards-compatible (bug#16271).
---

diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el
index dcf6a324351..aeada705c4a 100644
--- a/lisp/erc/erc-button.el
+++ b/lisp/erc/erc-button.el
@@ -254,7 +254,9 @@ specified by `erc-button-alist'."
             regexp)
         (erc-button-remove-old-buttons)
         (dolist (entry alist)
-          (if (eq (car entry) 'nicknames)
+          (if (or (eq (car entry) 'nicknames)
+                  ;; Old form retained for backward compatibility.
+                  (equal (car entry) (quote 'nicknames)))
               (erc-button-add-nickname-buttons entry)
             (progn
               (setq regexp (or (and (stringp (car entry)) (car entry))