[Emacs-diffs] Changes to emacs/src/xterm.c

[Chong Yidong]

Index: emacs/src/xterm.c
diff -c emacs/src/xterm.c:1.888 emacs/src/xterm.c:1.889
*** emacs/src/xterm.c:1.888     Mon Oct 24 14:59:42 2005
--- emacs/src/xterm.c   Wed Nov 16 05:49:18 2005
***************
*** 7362,7370 ****
--- 7362,7375 ----
        /* Create the GNU bitmap and mask if necessary.  */
        if (FRAME_X_DISPLAY_INFO (f)->icon_bitmap_id < 0)
        {
+ #if defined (HAVE_XPM) && defined (HAVE_X_WINDOWS)
+         FRAME_X_DISPLAY_INFO (f)->icon_bitmap_id
+           = x_create_bitmap_from_xpm_data (f, gnu_bits);
+ #else
          FRAME_X_DISPLAY_INFO (f)->icon_bitmap_id
            = x_create_bitmap_from_data (f, gnu_bits,
                                         gnu_width, gnu_height);
+ #endif /*  (HAVE_XPM) && defined (HAVE_X_WINDOWS) */
          x_create_bitmap_mask (f, FRAME_X_DISPLAY_INFO (f)->icon_bitmap_id);
        }