auto upstream

2 files changed, 6 insertions, 2 deletions

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 0366addacfc..3a625eb215e 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,7 @@
+2013-01-04  Glenn Morris  <rgm@gnu.org>
+
+        * erc-backend.el (312): Fix typo.  (Bug#13235)
+
 2012-11-30  Glenn Morris  <rgm@gnu.org>
 
         * erc.el (erc-accidental-paste-threshold-seconds): Add :version.
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index c8b7286c7dd..3d3ac791f08 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -1633,8 +1633,8 @@ See `erc-display-server-message'." nil
 
 (define-erc-response-handler (312)
   "Server name response in WHOIS." nil
-  (pcase-let ((`(,nick ,server-host))
-              (cdr (erc-response.command-args parsed)))
+  (pcase-let ((`(,nick ,server-host)
+              (cdr (erc-response.command-args parsed))))
     (erc-display-message
      parsed 'notice 'active 's312
      ?n nick ?s server-host ?c (erc-response.contents parsed))))