From xemacs-m  Wed Jun  4 15:42:03 1997
Received: from jagor.srce.hr (hniksic@jagor.srce.hr [161.53.2.130])
	by xemacs.org (8.8.5/8.8.5) with ESMTP id PAA23681
	for <xemacs-beta@xemacs.org>; Wed, 4 Jun 1997 15:42:00 -0500 (CDT)
Received: (from hniksic@localhost)
          by jagor.srce.hr (8.8.5/8.8.4)
	  id WAA14854; Wed, 4 Jun 1997 22:41:53 +0200 (MET DST)
To: XEmacs Developers <xemacs-beta@xemacs.org>
Subject: Re: Problems with bitmaps on NT.
References: <3.0.32.19700101120000.009244c0@wr.com.au> <kigpvu2beyb.fsf@jagor.srce.hr> <m2raeii224.fsf@altair.xemacs.org>
X-Attribution: Hrv
X-Face: Mie8:rOV<\c/~z{s.X4A{!?vY7{drJ([U]0O=W/<W*SMo/Mv:58:*_y~ki>xDi&N7XG
        KV^$k0m3Oe/)'e%3=$PCR&3ITUXH,cK>]bci&<qQ>Ff%x_>1`T(+M2Gg/fgndU%k*ft
        [(7._6e0n-V%|%'[c|q:;}td$#INd+;?!-V=c8Pqf}3J
From: Hrvoje Niksic <hniksic@srce.hr>
Date: 04 Jun 1997 22:41:51 +0200
In-Reply-To: Steven L Baur's message of 04 Jun 1997 12:46:27 -0700
Message-ID: <kigbu5mrtgw.fsf@jagor.srce.hr>
Lines: 44
X-Mailer: Gnus v5.4.52/XEmacs 20.3(beta3)

Steven L Baur <steve@xemacs.org> writes:

> Hrvoje Niksic <hniksic@srce.hr> writes:
> 
> > --- lisp/prim/glyphs.el.orig	Wed Jun  4 16:43:18 1997
> > +++ lisp/prim/glyphs.el	Wed Jun  4 16:44:44 1997
> > @@ -597,6 +597,7 @@
> >    (if (featurep 'x)
> >      (set-console-type-image-conversion-list 'x
> >       `(,@(if (featurep 'xpm) '(("\.xpm$" [xpm :file nil] 2)))
> > +       ,@(if (featurep 'xbm) '(("\\.xbm\\'" [xbm :file nil] 2)))
> >         ,@(if (featurep 'xpm) '(("^/\\* XPM \\*/" [xpm :data nil] 2)))
> >         ,@(if (featurep 'xface) '(("^X-Face:" [xface :data nil] 2)))
> >         ,@(if (featurep 'gif) '(("\.gif$" [gif :file nil] 2)))
> 
> This won't work.  xbm support is implied by X11 support and you cannot 
> make it go away.

Oh.  Suits me right for not testing my change. :-(

Since all of this is within (featurep 'x) (note that I still ramble
against support for X device under X device), it should be without the 
featurep part, I guess.

The correct patch is

--- glyphs.el.orig	Wed Jun  4 16:43:18 1997
+++ glyphs.el	Wed Jun  4 22:40:56 1997
@@ -597,6 +597,7 @@
   (if (featurep 'x)
     (set-console-type-image-conversion-list 'x
      `(,@(if (featurep 'xpm) '(("\.xpm$" [xpm :file nil] 2)))
+       ("\\.xbm\\'" [xbm :file nil] 2)
        ,@(if (featurep 'xpm) '(("^/\\* XPM \\*/" [xpm :data nil] 2)))
        ,@(if (featurep 'xface) '(("^X-Face:" [xface :data nil] 2)))
        ,@(if (featurep 'gif) '(("\.gif$" [gif :file nil] 2)))

This patch won't work with my (pre-)previous glyphs patch.

-- 
Hrvoje Niksic <hniksic@srce.hr> | Student at FER Zagreb, Croatia
--------------------------------+--------------------------------
* Q: What is an experienced Emacs user?
* A: A person who wishes that the terminal had pedals.

