aboutsummaryrefslogtreecommitdiff
path: root/generic/proof-splash.el
diff options
context:
space:
mode:
authorDavid Aspinall1998-11-06 15:50:03 +0000
committerDavid Aspinall1998-11-06 15:50:03 +0000
commit7551e2199a7eb05a4968fdd6f4d599d42ad520ab (patch)
tree2b7ca1f28297dc6f34821b1ef45d5acf5480ea72 /generic/proof-splash.el
parent58dac20ec5ce08ca07ab225f34e9f26f53964aa0 (diff)
(Failed) Attempt to recognize XEmacs with broken jpeg support
Diffstat (limited to 'generic/proof-splash.el')
-rw-r--r--generic/proof-splash.el14
1 files changed, 10 insertions, 4 deletions
diff --git a/generic/proof-splash.el b/generic/proof-splash.el
index 80b03432..d628ed2a 100644
--- a/generic/proof-splash.el
+++ b/generic/proof-splash.el
@@ -22,10 +22,16 @@
Different formats are chosen from according to what can be displayed.
Unless NOJPEG is set, try jpeg first. Then try gif.
Gif filename depends on colour depth of display."
+ (let ((jpg (vector 'jpeg :file
+ (concat proof-images-directory name ".jpg"))))
(cond
- ((and window-system (featurep 'jpeg) (not nojpeg))
- (vector 'jpeg :file
- (concat proof-images-directory name ".jpg")))
+ ((and window-system (featurep 'jpeg) (not nojpeg)
+ ;; Actually, jpeg can fail even if it is compiled in.
+ ;; FIXME: this test doesn't work, though: still gives
+ ;; t when visiting the file displays failure message.
+ ;; What's the correct test?
+ (valid-instantiator-p jpg 'image))
+ jpg)
((and window-system (featurep 'gif))
(vector 'gif :file
(concat proof-images-directory
@@ -37,7 +43,7 @@ Gif filename depends on colour depth of display."
;; Low colour gif for poor displays
".8bit.gif")))))
(t
- (concat "[ image " name " ]"))))
+ (concat "[ image " name " ]")))))
(defcustom proof-splash-inhibit
nil