From: ueno <ueno>
Date: Sat, 30 Sep 2000 06:38:05 +0000 (+0000)
Subject: * liece-xemacs.el (liece-xemacs-modeline-glyph): Add 'xpm check.
X-Git-Tag: liece-1_4_7~45
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=90d9aae9d469a2e911b3ba7cd54739c3871046e1;p=elisp%2Fliece.git

* liece-xemacs.el (liece-xemacs-modeline-glyph): Add 'xpm check.
(liece-xemacs-create-nick-glyph): Ditto.
(liece-xemacs-unread-mark): Ditto.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fda1081..58286c4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2000-09-30   Daiki Ueno  <ueno@unixuser.org>
+
+	* liece-xemacs.el (liece-xemacs-modeline-glyph): Add 'xpm check.
+	(liece-xemacs-create-nick-glyph): Ditto.
+	(liece-xemacs-unread-mark): Ditto.
+
 2000-09-22   Daiki Ueno  <ueno@unixuser.org>
 
 	* liece-handle.el (liece-handle-kill-message): Call
diff --git a/lisp/liece-xemacs.el b/lisp/liece-xemacs.el
index c30b265..d3cf76c 100644
--- a/lisp/liece-xemacs.el
+++ b/lisp/liece-xemacs.el
@@ -240,11 +240,10 @@ 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 (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 +307,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)))))))
@@ -560,12 +560,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)