From: ueno <ueno>
Date: Mon, 11 Sep 2000 15:37:19 +0000 (+0000)
Subject: liece-xemacs.el (liece-xemacs-splash-at-point): Don't check `console-type'.
X-Git-Tag: liece-1_4_4-1~17
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=197f5ebd837b6c41af315373a11ec4f5a2cb1630;p=elisp%2Fliece.git

liece-xemacs.el (liece-xemacs-splash-at-point): Don't check `console-type'.
(liece-x-face-insert-with-xemacs): Ditto.

liece-hilit.el (liece-replace-space-in-buffer-name): Add comment.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 10cbc97..863270f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-11   Daiki Ueno  <ueno@unixuser.org>
+
+	* liece-xemacs.el (liece-xemacs-splash-at-point): Don't check `console-type'.
+	(liece-x-face-insert-with-xemacs): Ditto.
+
 2000-09-11  Akira Ohashi  <bg66@luck.gr.jp>
 
 	* liece-emacs.el (liece-emacs-unread-character): Abolish.
@@ -5,7 +10,7 @@
 	* liece-vars.el (liece-channel-unread-character): New variable.
 
 	* liece-xemacs.el (liece-xemacs-unread-mark): Simplify; Don't use
- 	`featurep' and `console-type'.
+	`featurep' and `console-type'.
 	(toplevel): Ditto.
 
 2000-09-11   Daiki Ueno  <ueno@unixuser.org>
diff --git a/lisp/liece-hilit.el b/lisp/liece-hilit.el
index dea3e80..b9ed847 100644
--- a/lisp/liece-hilit.el
+++ b/lisp/liece-hilit.el
@@ -345,6 +345,8 @@
 (put 'liece-dialogue-mode 'font-lock-defaults
      '(liece-highlight-font-lock-keywords t))
 
+;;; This is a kludge for fontifying buffer whose name starts with a space.
+;;; Font-lock isn't responsible for (maybe) invisible buffers.
 (defadvice font-lock-mode
   (around liece-replace-space-in-buffer-name activate)
   (if (char-equal (aref (buffer-name) 0) ? )
diff --git a/lisp/liece-xemacs.el b/lisp/liece-xemacs.el
index 5685451..c5e73bf 100644
--- a/lisp/liece-xemacs.el
+++ b/lisp/liece-xemacs.el
@@ -440,11 +440,8 @@ Always two arguments are passed, OBJECT and NICK."
       (let ((glyph (cdr-safe (assoc nick liece-glyph-cache))))
 	(unless glyph
 	  (setq glyph (make-glyph
-		       (cond
-			((and (featurep 'xface)
-			      (memq (console-type) '(x mswindows)))
-			 `[xface :data ,str])
-			(t `[string :data ,str]))))
+		       (list (vector 'xface :data str)
+			     (vector 'string :data str))))
 	  (when glyph
 	    (push (cons nick glyph) liece-glyph-cache)
 	    (set-glyph-face glyph 'default)))
@@ -501,7 +498,9 @@ Always two arguments are passed, OBJECT and NICK."
   "Display splash logo in HEIGHT."
   (or (bolp) (insert "\n"))
   (let ((bow (point))
-	(glyph (make-glyph `[xpm :data ,liece-xemacs-logo]))
+	(glyph (make-glyph
+		(list (vector 'xpm :data liece-xemacs-logo)
+		      [nothing])))
 	(lh (/ (window-pixel-height) (window-height)))
 	(lw (/ (window-pixel-width) (window-width)))
 	(liece-insert-environment-version nil)
@@ -513,10 +512,9 @@ Always two arguments are passed, OBJECT and NICK."
     (insert-char ?\  (max 0 (/ (- (window-width)
 				  (/ (glyph-width glyph) lw))
 			       2)))
-    (when (and (featurep 'xpm) (memq (console-type) '(x mswindows)))
-      (set-extent-end-glyph
-       (make-extent (point) (point))
-       glyph))
+    (set-extent-end-glyph
+     (make-extent (point) (point))
+     glyph)
     (insert "\n")
     (insert-char ?\  (max 0 (/ (- (window-width) (length (liece-version))) 2)))
     (setq bov (point))