* configure.ac: Output doc/Makefile.

[riece] / lisp / riece-user.el

diff --git a/lisp/riece-user.el b/lisp/riece-user.el
index e584b74..f74f770 100644 (file)
--- a/lisp/riece-user.el
+++ b/lisp/riece-user.el
@@ -48,14 +48,16 @@
 
 (defun riece-rename-user (old-name new-name)
   (riece-with-server-buffer
-   (let ((symbol (intern-soft (downcase (riece-identity-prefix old-name))
-                             riece-obarray)))
-     (when symbol
-       (set (intern (downcase (riece-identity-prefix new-name))
-                   riece-obarray)
-           (symbol-value symbol))
-       (makunbound symbol)
-       (unintern (symbol-name symbol) riece-obarray)))))
+   (unless (equal (downcase (riece-identity-prefix old-name))
+                 (downcase (riece-identity-prefix new-name)))
+     (let ((symbol (intern-soft (downcase (riece-identity-prefix old-name))
+                               riece-obarray)))
+       (when symbol
+        (set (intern (downcase (riece-identity-prefix new-name))
+                     riece-obarray)
+             (symbol-value symbol))
+        (makunbound symbol)
+        (unintern (symbol-name symbol) riece-obarray))))))
 
 (defun riece-make-user (&optional channels user-at-host modes away)
   "Make an instance of user object.
@@ -125,7 +127,7 @@ away status, respectively."
   (let* ((user (riece-get-user (or name (riece-current-nickname))))
         (channels (riece-user-channels user)))
     (if flag
-       (unless (memq channel channels)
+       (unless (member channel channels)
          (riece-user-set-channels user (cons channel channels)))
       (if (setq channel (car (member channel channels)))
          (riece-user-set-channels user (delq channel channels))))))