X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Friece-irc.el;h=5b569936147b1d8936b6b8444a3d75bf741a23e1;hb=4e7d94f9c055bad351eb2f33ac2cafa281ea7a62;hp=b79dea125e3eebd01d0deb5c7aaf44540306290f;hpb=2e7c1cd5aa0d1ee7c54463ff2151cf547f71af76;p=riece

diff --git a/lisp/riece-irc.el b/lisp/riece-irc.el
index b79dea1..5b56993 100644
--- a/lisp/riece-irc.el
+++ b/lisp/riece-irc.el
@@ -1,4 +1,4 @@
-;;; riece-irc.el --- IRC protocol
+;;; riece-irc.el --- IRC protocol -*- lexical-binding: t -*-
 ;; Copyright (C) 1998-2004 Daiki Ueno
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
@@ -83,14 +83,18 @@
 	    (riece-process-send-string process
 				       (format "PASS %s\r\n" password)))
 	(riece-process-send-string process (format "NICK %s\r\n" nickname))
+	(unless realname
+	  (setq realname (riece-mcat "No information given")))
+	(if coding
+	    (setq realname (encode-coding-string realname
+						 (if (consp coding)
+						     (cdr coding)
+						   coding))))
 	(riece-process-send-string process
 				   (format "USER %s * * :%s\r\n"
 					   (or username
 					       (user-real-login-name))
-					   (encode-coding-string
-					    (or realname
-						"No information given")
-					    coding)))
+					   realname))
 	(with-current-buffer (process-buffer process)
 	  (setq riece-last-nickname riece-real-nickname
 		riece-nick-accepted 'sent