Mercurial > hg > xemacs-beta

diff src/glyphs-x.c @ 223:2c611d1463a6 r20-4b10

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-4b10
author cvs
date Mon, 13 Aug 2007 10:10:54 +0200
parents 6c0ae1f9357f
children 12579d965149
line wrap: on
line diff
--- a/src/glyphs-x.c	Mon Aug 13 10:10:03 2007 +0200
+++ b/src/glyphs-x.c	Mon Aug 13 10:10:54 2007 +0200
@@ -57,9 +57,16 @@
 #include "sysfile.h"
 
 #ifdef HAVE_IMAGEMAGICK
+#ifdef SOLARIS2 /* Try to trick magick.h into not including Xos.h */
+#define _XOS_H_
+#endif
+#ifdef MAGICK_HEADERS_ARE_UNDER_X11
+#include <X11/magick/magick.h>
+#else
 #include <magick/magick.h>
+#endif
 /*#include <image.h>*/
-#include <assert.h>
+/*#include <assert.h>*/
 
 #define OLDCOMPAT /* allow lisp code using the old names to still function */
 #endif
@@ -1099,7 +1106,7 @@
 
       specbind (Qinhibit_quit, Qt);
       set_buffer_internal (XBUFFER (temp_buffer));
-      Ferase_buffer (Fcurrent_buffer ());
+      Ferase_buffer (Qnil);
 
       buffer_insert_c_string (current_buffer, "/* XPM */\r");
       buffer_insert_c_string (current_buffer, "static char *pixmap[] = {\r");
@@ -1116,7 +1123,7 @@
 	    buffer_insert_c_string (current_buffer, "\"};\r");
 	}
 
-      retval = Fbuffer_substring (Qnil, Qnil, Fcurrent_buffer ());
+      retval = Fbuffer_substring (Qnil, Qnil, Qnil);
       XpmFree (data);
 
       set_buffer_internal (old_buffer);