aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVibhav Pant2016-09-24 11:41:44 +0530
committerVibhav Pant2016-09-24 11:41:44 +0530
commiteb81a83abb7074e84bd63d219b7097b1b576bf0a (patch)
treee129372fb1ad4019384b7b47a281475408a4af05
parent65dc67c87553bec4c8b36432246b13f09d653118 (diff)
downloademacs-eb81a83abb7074e84bd63d219b7097b1b576bf0a.tar.gz
emacs-eb81a83abb7074e84bd63d219b7097b1b576bf0a.zip
Use correct TYPE value for displaying error messages in (erc-display-message)
-rw-r--r--lisp/erc/erc-backend.el2
-rw-r--r--lisp/erc/erc-dcc.el2
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index bbb7ccbc99d..54c17bf73d9 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -2002,7 +2002,7 @@ See `erc-display-server-message'." nil
2002 "You need to be a channel operator to do that." nil 2002 "You need to be a channel operator to do that." nil
2003 (let ((channel (cadr (erc-response.command-args parsed))) 2003 (let ((channel (cadr (erc-response.command-args parsed)))
2004 (message (erc-response.contents parsed))) 2004 (message (erc-response.contents parsed)))
2005 (erc-display-message parsed '(error notice) 'active 's482 2005 (erc-display-message parsed '(notice error) 'active 's482
2006 ?c channel ?m message))) 2006 ?c channel ?m message)))
2007 2007
2008(define-erc-response-handler (671) 2008(define-erc-response-handler (671)
diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el
index 9152527d4be..1b9b8ac679a 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."
1005 ((and (> (plist-get erc-dcc-entry-data :size) 0) 1005 ((and (> (plist-get erc-dcc-entry-data :size) 0)
1006 (> received-bytes (plist-get erc-dcc-entry-data :size))) 1006 (> received-bytes (plist-get erc-dcc-entry-data :size)))
1007 (erc-display-message 1007 (erc-display-message
1008 nil '(error notice) 'active 1008 nil '(notice error) 'active
1009 'dcc-get-file-too-long 1009 'dcc-get-file-too-long
1010 ?f (file-name-nondirectory buffer-file-name)) 1010 ?f (file-name-nondirectory buffer-file-name))
1011 (delete-process proc)) 1011 (delete-process proc))