master c113f2626e: Make recent nicknames erc change more backwards-compatible

[Lars Ingebrigtsen]

branch: master
commit c113f2626e58a1d3b98bdf364902f53caa2dc3a8
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    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).
---
 lisp/erc/erc-button.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el
index dcf6a32435..aeada705c4 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))