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 dcf6a3243516605ac9c244a2249f67262a36c7c0..aeada705c4a249ec66010a920f2f6343c6b420ae 100644 (file)
--- 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))