From: yamaoka <yamaoka>
Date: Thu, 7 Sep 2000 09:29:12 +0000 (+0000)
Subject: Sync with `t-gnus-6_14'.
X-Git-Tag: t-gnus-6_14-quimby-before-installer-changed-~109
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f49b6e4dfa0b6b8d88e12de4161c30613bc4410c;p=elisp%2Fgnus.git-

Sync with `t-gnus-6_14'.
---

diff --git a/ChangeLog b/ChangeLog
index 783ffc8..e9a69e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-07  Tadashi Watanabe  <watanabe@sigmaitec.co.jp>
+
+	* lisp/smiley.el (smiley-buffer, smiley-create-glyph): Work with
+	GTK XEmacs as well.
+
 2000-09-06  TSUCHIYA Masatoshi  <tsuchiya@pine.kuee.kyoto-u.ac.jp>
 
 	* lisp/nnshimbun.el (nnshimbun-header-xref): New function.
diff --git a/lisp/smiley.el b/lisp/smiley.el
index 0d5f710..7778567 100644
--- a/lisp/smiley.el
+++ b/lisp/smiley.el
@@ -181,7 +181,8 @@ above them."
 			 xpm-color-symbols)))
 	   (glyph (make-glyph
 		   (list
-		    (cons 'x (expand-file-name pixmap smiley-data-directory))
+		    (cons (if (featurep 'gtk) 'gtk 'x)
+			  (expand-file-name pixmap smiley-data-directory))
 		    (cons 'mswindows
 			  (expand-file-name pixmap smiley-data-directory))
 		    (cons 'tty smiley)))))
@@ -231,7 +232,7 @@ above them."
 ;;;###autoload
 (defun smiley-buffer (&optional buffer st nd)
   (interactive)
-  (when (featurep '(or x mswindows))
+  (when (featurep '(or x gtk mswindows))
     (save-excursion
       (when buffer
 	(set-buffer buffer))