commit eb81a83abb7074e84bd63d219b7097b1b576bf0a (HEAD, refs/remotes/origin/master)
Author: Vibhav Pant <vibhavp@gmail.com>
Date:   Sat Sep 24 11:41:44 2016 +0530

    Use correct TYPE value for displaying error messages in (erc-display-message)

diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index bbb7ccb..54c17bf 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -2002,7 +2002,7 @@ See `erc-display-server-message'." nil
   "You need to be a channel operator to do that." nil
   (let ((channel (cadr (erc-response.command-args parsed)))
         (message (erc-response.contents parsed)))
-    (erc-display-message parsed '(error notice) 'active 's482
+    (erc-display-message parsed '(notice error) 'active 's482
                          ?c channel ?m message)))
 
 (define-erc-response-handler (671)
diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el
index 9152527..1b9b8ac 100644
--- a/lisp/erc/erc-dcc.el
+++ b/lisp/erc/erc-dcc.el
@@ -1005,7 +1005,7 @@ rather than every 1024 byte block, but nobody seems to care."
        ((and (> (plist-get erc-dcc-entry-data :size) 0)
              (> received-bytes (plist-get erc-dcc-entry-data :size)))
         (erc-display-message
-         nil '(error notice) 'active
+         nil '(notice error) 'active
          'dcc-get-file-too-long
          ?f (file-name-nondirectory buffer-file-name))
         (delete-process proc))