Revert.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6f6eff7..74d6b41 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -7,14 +7,6 @@
        * riece-emacs.el (riece-normalize-modeline-string): Don't
        concatenate elements in modeline string.
 
-2004-12-13  Daiki Ueno  <ueno@unixuser.org>
-
-       * riece-irc.el (riece-irc-open-server): Send USER command with
-       riece-username if set.
-       * riece-server.el (riece-server-keyword-map): Bind :realname.
-       * riece-options.el (riece-realname): Rename from riece-username.
-       (riece-username): New user option.
-
 2004-12-13  Daiki Ueno  <ueno@unixuser.org>
 
        * riece-display.el (riece-update-channel-list-indicator):

diff --git a/lisp/riece-irc.el b/lisp/riece-irc.el
index 77de700..4126e7d 100644 (file)
--- a/lisp/riece-irc.el
+++ b/lisp/riece-irc.el
@@ -80,14 +80,8 @@
                                       (format "PASS %s\r\n" password)))
        (riece-process-send-string process
                                   (format "USER %s * * :%s\r\n"
-                                          (if (and username
-                                                   (not (string-match
-                                                         "[\0\r\n @]"
-                                                         username)))
-                                              username
-                                            (user-real-login-name))
-                                          (or realname
-                                              username
+                                          (user-real-login-name)
+                                          (or username
                                               "No information given")))
        (riece-process-send-string process (format "NICK %s\r\n" nickname))
        (with-current-buffer (process-buffer process)

diff --git a/lisp/riece-options.el b/lisp/riece-options.el
index 5d15c16..9982322 100644 (file)
--- a/lisp/riece-options.el
+++ b/lisp/riece-options.el
@@ -201,12 +201,6 @@ way is to put Riece variables on .emacs or file loaded from there."
   :type 'string
   :group 'riece-server)
 
-(defcustom riece-realname (or (getenv "IRCNAME")
-                             user-full-name)
-  "Your real name."
-  :type 'string
-  :group 'riece-server)
-
 (defcustom riece-nickname (or (getenv "IRCNICK")
                              (user-real-login-name))
   "Your nickname."

diff --git a/lisp/riece-server.el b/lisp/riece-server.el
index 2defd70..04ab199 100644 (file)
--- a/lisp/riece-server.el
+++ b/lisp/riece-server.el
@@ -36,7 +36,6 @@
       (:service 6667)
       (:nickname riece-nickname)
       (:username riece-username)
-      (:realname riece-realname)
       (:password)
       (:function riece-default-open-connection-function)
       (:coding riece-default-coding-system))