Merge XEmacs changes.

[elisp/liece.git] / lisp / liece-nick.el

diff --git a/lisp/liece-nick.el b/lisp/liece-nick.el
index bcf82c3..538dc77 100644 (file)
--- a/lisp/liece-nick.el
+++ b/lisp/liece-nick.el
@@ -29,11 +29,14 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'liece-inlines))
+
 (require 'liece-hilit)
 
 (defalias 'liece-nick-set-operator 'liece-channel-set-operator)
 (defalias 'liece-nick-set-voice 'liece-channel-set-voice)
-(defalias 'liece-nick-equal 'string-equal-ignore-case)
+(defun liece-nick-equal (n1 n2)
+  (string-equal-ignore-case n1 n2))
 
 (defun liece-nick-member (nick nicks)
   "Return non-nil if NICK is member of NICKS."
@@ -185,12 +188,12 @@ Otherwise they are removed from the user."
     (setq liece-nick-buffer-mode (not liece-nick-buffer-mode)))
   (liece-configure-windows))
 
-(defmacro liece-nick-buffer-create (chnl)
-  `(with-current-buffer
-       (liece-get-buffer-create (format liece-nick-buffer-format ,chnl))
+(defun liece-nick-buffer-create (chnl)
+  (with-current-buffer
+       (liece-get-buffer-create (format liece-nick-buffer-format chnl))
      (unless (eq major-mode 'liece-nick-mode)
        (liece-nick-mode))
-     (set-alist 'liece-nick-buffer-alist ,chnl (current-buffer))
+     (set-alist 'liece-nick-buffer-alist chnl (current-buffer))
      (current-buffer)))
 
 (defun liece-change-nick-of-1 (old new nicks)