[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 f5f9583: Improve XPM load failure message (bug#33
From: |
Alan Third |
Subject: |
[Emacs-diffs] emacs-26 f5f9583: Improve XPM load failure message (bug#33126) |
Date: |
Thu, 25 Oct 2018 11:14:33 -0400 (EDT) |
branch: emacs-26
commit f5f95838bdac9a88ccc00886c6d59d9d5ac73647
Author: Alan Third <address@hidden>
Commit: Alan Third <address@hidden>
Improve XPM load failure message (bug#33126)
* src/image.c (xpm_load_image): Only XPM3 is supported, so make that
explicit.
---
etc/PROBLEMS | 7 +++++++
src/image.c | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 7dfafe0..29f87e2 100644
--- 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 address@hidden 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 767979e..a6b2d90 100644
--- 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);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-26 f5f9583: Improve XPM load failure message (bug#33126),
Alan Third <=