From 1a902e231b83c00399242cd61838ba0c5f6770de Mon Sep 17 00:00:00 2001 From: David Aspinall Date: Fri, 27 Oct 2006 17:33:04 +0000 Subject: Rationalise testing for different values of window-system, to/and support more Emacs ports easily --- generic/proof-splash.el | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'generic/proof-splash.el') diff --git a/generic/proof-splash.el b/generic/proof-splash.el index df4c9cbb..fd4ca491 100644 --- a/generic/proof-splash.el +++ b/generic/proof-splash.el @@ -108,17 +108,20 @@ DEFAULT gives return value in case image not valid." (file-readable-p (aref inst 2))))) img) (cond - ((and window-system proof-running-on-XEmacs (featurep 'jpeg) (not nojpeg) + ((and proof-running-on-XEmacs (pg-window-system) + (featurep 'jpeg) (not nojpeg) (funcall validfn jpg)) jpg) - ((and window-system proof-running-on-XEmacs (featurep 'gif) (funcall validfn gif)) + ((and proof-running-on-XEmacs (pg-window-system) + (featurep 'gif) (funcall validfn gif)) gif) - ((and window-system proof-running-on-XEmacs (featurep 'xpm) (funcall validfn xpm)) + ((and proof-running-on-XEmacs (pg-window-system) + (featurep 'xpm) (funcall validfn xpm)) xpm) ;; Support GNU Emacs 21 ((and proof-running-on-Emacs21 - window-system + (pg-window-system) (setq img (find-image (list -- cgit v1.2.3