aboutsummaryrefslogtreecommitdiff
path: root/generic/proof-toolbar.el
diff options
context:
space:
mode:
authorDavid Aspinall2006-10-27 17:33:04 +0000
committerDavid Aspinall2006-10-27 17:33:04 +0000
commit1a902e231b83c00399242cd61838ba0c5f6770de (patch)
tree745516481959f1384c5487a0e8a7f3e0d4f88cfd /generic/proof-toolbar.el
parent40a7b597d4ac26214bd50bf1b0dc19391fd7f1ad (diff)
Rationalise testing for different values of window-system, to/and support more Emacs ports easily
Diffstat (limited to 'generic/proof-toolbar.el')
-rw-r--r--generic/proof-toolbar.el7
1 files changed, 3 insertions, 4 deletions
diff --git a/generic/proof-toolbar.el b/generic/proof-toolbar.el
index 7d7e7c8e..8825a66f 100644
--- a/generic/proof-toolbar.el
+++ b/generic/proof-toolbar.el
@@ -133,14 +133,13 @@ If `proof-toolbar-enable' is nil, change the current buffer toolbar
to the default toolbar."
(interactive)
(if
- (and ;; Check support in Emacs
+ (and ;; Check toolbar support in Emacs
(or (and (featurep 'tool-bar) ; GNU Emacs tool-bar library
(member 'xpm image-types)) ; and XPM support
(and (featurep 'toolbar) ; or XEmacs toolbar library
(featurep 'xpm))) ; and XPM support
- ;; Check support in Window system
- (memq (if proof-running-on-XEmacs (console-type) window-system)
- '(x mswindows gtk mac)))
+ ;; Check we're running in a windowing system
+ (pg-window-system))
;; Toolbar support is possible.
(progn