Improve XPM load failure message (bug#33126)

* src/image.c (xpm_load_image): Only XPM3 is supported, so make that
explicit.

diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 7dfafe04deb13c7285ea2ebd73902fb26be3f22e..29f87e2eaf5670bb2eac5925f8f6c441d50cdd5a 100644 (file)
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -2616,6 +2616,13 @@ please call support for your X-server and see if you can get a fix.
 If you do, please send it to bug-gnu-emacs@gnu.org so we can list it here.
 
 
+* Runtime problems specific to macOS
+
+** macOS doesn't come with libxpm, so only XPM3 is supported.
+
+Libxpm is available for macOS as part of the XQuartz project.
+
+
 * Build-time problems
 
 ** Configuration

diff --git a/src/image.c b/src/image.c
index 767979e63bd294841e87536c5981ab678a3dc17b..a6b2d9060b10fe3e6ca2cc5c828dfbeb4185eeb8 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -4308,7 +4308,7 @@ xpm_load_image (struct frame *f,
   return 1;
 
  failure:
-  image_error ("Invalid XPM file (%s)", img->spec);
+  image_error ("Invalid XPM3 file (%s)", img->spec);
   x_destroy_x_image (ximg);
   x_destroy_x_image (mask_img);
   x_clear_image (f, img);