* liece-misc.el: Don't require pccl and broken.

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

diff --git a/lisp/liece-menu.el b/lisp/liece-menu.el
index a46969e..69f04c3 100644 (file)
--- a/lisp/liece-menu.el
+++ b/lisp/liece-menu.el
@@ -92,22 +92,22 @@
   
 (defvar liece-menu-ctcp-menu
   '("CTCP"
-    ["ACTION" liece-command-client-action
+    ["ACTION" liece-command-ctcp-action
      liece-current-channel]
-    ["VERSION" liece-command-client-version
+    ["VERSION" liece-command-ctcp-version
      liece-current-channel]
-    ["USERINFO" liece-command-client-userinfo
+    ["USERINFO" liece-command-ctcp-userinfo
      liece-current-channel]
-    ["HELP" liece-command-client-help
+    ["HELP" liece-command-ctcp-help
      liece-current-channel]
-    ["CLIENTINFO" liece-command-client-clientinfo
+    ["CLIENTINFO" liece-command-ctcp-clientinfo
      liece-current-channel]
-    ["PING" liece-command-client-ping
+    ["PING" liece-command-ctcp-ping
      liece-current-channel]
     "----"
-    ["Request X-Face" liece-command-client-x-face
+    ["Request X-Face" liece-command-ctcp-x-face
      liece-current-channel]
-    ["Set my X-Face" liece-command-client-x-face-from-xbm-file
+    ["Set my X-Face" liece-command-ctcp-x-face-from-xbm-file
      liece-current-channel]))
 
 (defvar liece-menu-channel-menu
@@ -248,9 +248,10 @@
 
 (defun liece-menu-add-url (url)
   (when (boundp 'liece-menu-url-menu-map)
-    (easy-menu-add-item
-     liece-menu-url-menu-map nil
-     (vector url (list 'liece-command-browse-url url) t))))
+    (with-current-buffer liece-command-buffer
+      (easy-menu-add-item
+       nil (list (car liece-menu-url-menu))
+       (vector url (list 'liece-command-browse-url url) t)))))
 
 ;;; @ menu callbacks
 ;;;