Don't install gnu-emacs-user-config.

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

diff --git a/lisp/liece-misc.el b/lisp/liece-misc.el
index e479e43..d69f011 100644 (file)
--- a/lisp/liece-misc.el
+++ b/lisp/liece-misc.el
@@ -30,8 +30,6 @@
 ;;; Code:
 
 (eval-and-compile
-  (require 'broken)
-  (require 'pccl)
   (require 'invisible)
   (require 'liece-inlines)
   (require 'liece-coding))
@@ -292,25 +290,25 @@
         (concat "[" ,hostname "]")
        ,hostname)))
 
-(defmacro liece-current-nickname ()
-  "Our current nickname."
-  'liece-real-nickname)
+(defun liece-current-nickname ()
+  "Return the current nickname."
+  liece-real-nickname)
 
-(defmacro liece-current-channel ()
-  "Out current channel."
-  'liece-current-channel)
+(defun liece-current-channel ()
+  "Return the current channel."
+  liece-current-channel)
 
-(defmacro liece-current-channels ()
-  "Out current channels."
-  'liece-current-channels)
+(defun liece-current-channels ()
+  "Return the current channels."
+  liece-current-channels)
 
-(defmacro liece-current-chat-partner ()
-  "Out current chat partner."
-  'liece-current-chat-partner)
+(defun liece-current-chat-partner ()
+  "Return the current chat partner."
+  liece-current-chat-partner)
 
-(defmacro liece-current-chat-partners ()
-  "Out current chat partners."
-  'liece-current-chat-partners)
+(defun liece-current-chat-partners ()
+  "Return the current chat partners."
+  liece-current-chat-partners)
 
 (defmacro liece-scroll-if-visible (window)
   `(if ,window (set-window-point ,window (point-max))))