diff options
| author | David Aspinall | 1999-08-23 17:03:46 +0000 |
|---|---|---|
| committer | David Aspinall | 1999-08-23 17:03:46 +0000 |
| commit | 724ea98df1ff15725c5e275ecf65779d950f5ed6 (patch) | |
| tree | 902fe467d52ebc48e1e7c0ed2340869641f6658a | |
| parent | 0826a2d7341a47768d17947ec0e81037af13c6f6 (diff) | |
Fix for toolbar disable for FSF Emacs.
| -rw-r--r-- | generic/proof-config.el | 6 | ||||
| -rw-r--r-- | generic/proof.el | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/generic/proof-config.el b/generic/proof-config.el index 39d46862..d05d0696 100644 --- a/generic/proof-config.el +++ b/generic/proof-config.el @@ -77,11 +77,11 @@ This option is compatible with proof-prog-name-ask." :type 'boolean :group 'proof-general) -(and (featurep 'toolbar) (defcustom proof-toolbar-inhibit nil - "*Non-nil prevents toolbar being used for script buffers." + "*Non-nil prevents toolbar being used for script buffers. +NB: the toolbar is only available with XEmacs." :type 'boolean - :group 'proof-general)) + :group 'proof-general) (defcustom proof-toolbar-follow-mode 'locked "*Choice of how point moves with toolbar commands. diff --git a/generic/proof.el b/generic/proof.el index 7f39dd39..de3c912a 100644 --- a/generic/proof.el +++ b/generic/proof.el @@ -52,8 +52,11 @@ (autoload 'proof-shell-mode "proof-shell" "Proof General shell mode class for proof assistant processes") -(autoload 'proof-toolbar-setup "proof-toolbar" - "Initialize Proof General toolbar and enable it for the current buffer" t) +(if (featurep 'toolbar) + ;; toolbar code is only loaded for XEmacs + (autoload 'proof-toolbar-setup "proof-toolbar" + "Initialize Proof General toolbar and enable it for the current buffer" t) + (defun proof-toolbar-setup ())) ;;; ;;; More autoloads to help define interface between files |