X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fliece-xemacs.el;h=e12aec40cb7f31f7be602b1f919e52bf5ec7bedc;hb=398a88ef30d07c103e133a5f549b9c780b96bbd3;hp=bdc114f059682b1f05286183bf4ce44c996c8473;hpb=22ea72ad425f4d819ca0686bab60aa449bb3aaf5;p=elisp%2Fliece.git

diff --git a/lisp/liece-xemacs.el b/lisp/liece-xemacs.el
index bdc114f..e12aec4 100644
--- a/lisp/liece-xemacs.el
+++ b/lisp/liece-xemacs.el
@@ -240,11 +240,11 @@ If optional argument FORCE is non-nil, always update toolbar."
 	 (let (file)
 	   (make-glyph
 	    (nconc
-	     (if (setq file (liece-locate-icon-file
-			     "liece-pointer.xpm"))
+	     (if (and (featurep 'xpm)
+		      (setq file (liece-locate-icon-file "liece-pointer.xpm")))
 		 (list (vector 'xpm :file file)))
-	     (if (setq file (liece-locate-icon-file
-			     "liece-pointer.xbm"))
+	     (if (and (featurep 'xbm)
+		      (setq file (liece-locate-icon-file "liece-pointer.xbm")))
 		 (list (vector 'xbm :file file)))
 	     '([string :data "Liece:"]))))))
     (set-glyph-face glyph 'modeline-buffer-id)
@@ -308,7 +308,8 @@ Modify whole identification by side effect."
    (let ((glyph
 	  (make-glyph
 	   (nconc
-	    (if (setq file (liece-locate-icon-file file))
+	    (if (and (featurep 'xpm)
+		     (setq file (liece-locate-icon-file file)))
 		(list (vector 'xpm :file file)))
 	    (if string
 		(list (vector 'string :data string)))))))
@@ -422,15 +423,6 @@ Always two arguments are passed, OBJECT and NICK."
       (let ((filename (match-string 1 (cdr object))))
 	(liece-command-dcc-send filename nick))))
 
-(defadvice easy-menu-add-item
-  (around liece-fix-menu-path-switch-buffer activate)
-  "Advice for XEmacs 20.4 or earlier."
-  (save-excursion
-    (set-buffer liece-command-buffer)
-    (add-menu-button
-     (cons (car (ad-get-arg 0)) (ad-get-arg 1))
-     (ad-get-arg 2) (ad-get-arg 3))))
-
 (eval-and-compile
   (setq liece-x-face-insert-function
 	(function liece-x-face-insert-with-xemacs))
@@ -560,12 +552,13 @@ If ARG is given, don't hide splash buffer."
   (if liece-display-unread-mark
       (with-current-buffer liece-channel-list-buffer
         (let* ((buffer-read-only nil)
-	       (file (liece-xemacs-icon-path
-		      liece-xemacs-unread-icon))
-	       (glyph (make-glyph
-		       (list (vector 'xpm :file file)
-			     (vector 'string
-				     :data liece-channel-unread-character))))
+	       (file (liece-locate-icon-file liece-xemacs-unread-icon))
+	       (glyph
+		(make-glyph
+		 (nconc (if (and (featurep 'xpm) file)
+			    (list (vector 'xpm :file file)))
+			(list (vector 'string
+				      :data liece-channel-unread-character)))))
 	       ext)
 	  (goto-char (point-min))
 	  (when (re-search-forward (concat "^ ?[0-9]+: " chnl "$") nil t)
@@ -622,8 +615,8 @@ If ARG is given, don't hide splash buffer."
 (add-hook 'liece-nick-replace-hook 'liece-xemacs-set-drop-functions)
 
 (fset 'liece-redisplay-unread-mark 'liece-xemacs-redisplay-unread-mark)
-(add-hook 'liece-channel-unread-hook 'liece-xemacs-unread-mark)
-(add-hook 'liece-channel-read-hook 'liece-xemacs-read-mark)
+(add-hook 'liece-channel-unread-functions 'liece-xemacs-unread-mark)
+(add-hook 'liece-channel-read-functions 'liece-xemacs-read-mark)
 
 (provide 'liece-xemacs)