aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Aspinall2001-12-11 00:51:06 +0000
committerDavid Aspinall2001-12-11 00:51:06 +0000
commitd75ebf1ab7e1ec256265581e20aa5eaf4fb4b4f9 (patch)
treed6abd2023aa23c6e09b6fd4d2720f044f6dcdfd3
parentd98e849d6ae79d50b4fa8d5d73b79864d2b9149a (diff)
Allow toolbar toggle for GNU Emacs 21.
-rw-r--r--generic/proof-menu.el8
1 files changed, 6 insertions, 2 deletions
diff --git a/generic/proof-menu.el b/generic/proof-menu.el
index 9dd86f79..fd338240 100644
--- a/generic/proof-menu.el
+++ b/generic/proof-menu.el
@@ -8,7 +8,7 @@
;; $Id$
;;
-(require 'proof-toolbar) ; needed for proof-toolbar-scripting-menu
+(require 'proof-toolbar) ; needed for proof-toolbar-scripting-menu
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;
@@ -231,8 +231,12 @@ If in three window or multiple frame mode, display both buffers."
:style toggle
:selected proof-output-fontify-enable]
["Toolbar" proof-toolbar-toggle
- :active (and (featurep 'toolbar)
+ :active (and (or (featurep 'toolbar) (featurep 'tool-bar))
(boundp 'proof-buffer-type)
+ ;; only allow toggling of toolbar enable in one
+ ;; buffer to avoid strange effects because we
+ ;; only keep one flag. (Strange effects because
+ ;; we only turn it off in one buffer at a time)
(eq proof-buffer-type 'script))
:style toggle
:selected proof-toolbar-enable]