Mercurial > hg > xemacs-beta

diff lisp/glyphs.el @ 4833:4dd2389173fc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Ben Wing <ben@xemacs.org>
date Sun, 10 Jan 2010 01:06:15 -0600
parents 1360b0c147c1
children 308d34e9f07d
line wrap: on
line diff
--- a/lisp/glyphs.el	Sun Jan 10 00:49:30 2010 -0600
+++ b/lisp/glyphs.el	Sun Jan 10 01:06:15 2010 -0600
@@ -1142,7 +1142,8 @@
   (if (featurep 'x)
     (set-console-type-image-conversion-list 'x
      `(,@(if (featurep 'xpm) '(("\\.xpm\\'" [xpm :file nil] 2)))
-	 ("\\.xbm\\'" [xbm :file nil] 2)
+       ("\\.xbm\\'" [xbm :file nil] 2)
+       ("/bitmaps/" [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)
@@ -1164,6 +1165,7 @@
 	 'tty
          '(("\\.xpm\\'" [string :data nil] 2)
            ("\\.xbm\\'" [string :data nil] 2)
+	   ("/bitmaps/" [string :data nil] 2)
            ;; #define could also mean a bitmap as well as a version 1 XPM. Who
            ;; cares.
            ("^#define" [string :data "[xpm]"])