Disable X-Symbol on emacs >= 23. Internal interfaces have changed

there for x-complement-fontset-spec.  It may be possible to fix
without much work, but isn't immediately obvious.

1 files changed, 6 insertions, 19 deletions

diff --git a/generic/proof-menu.el b/generic/proof-menu.el
index 928d2fbe..1907f486 100644
--- a/generic/proof-menu.el
+++ b/generic/proof-menu.el
@@ -305,11 +305,6 @@ without adjusting window layout."
       :style toggle
       :selected proof-disappearing-proofs]
 
-;     ["Output Highlighting" proof-output-fontify-toggle
-;      :active t
-;      :style toggle
-;      :selected proof-output-fontify-enable]
-
      ["Strict Read Only" proof-strict-read-only-toggle
       :style toggle
       :selected proof-strict-read-only]
@@ -318,23 +313,15 @@ without adjusting window layout."
       (progn
 	(unless x-symbol-mode (proof-x-symbol-toggle 0))
 	(proof-x-symbol-toggle (if x-symbol-mode 0 1)))
-      :active (and (not (and (boundp 'unicode-tokens-mode) 
-			     unicode-tokens-mode))
-		   (proof-x-symbol-support-maybe-available))
+      :active (and 
+	       ;; X-Symbol breaks abruptly on recent 23 versions
+	       (not (>= emacs-major-version 23))
+	       (not (and (boundp 'unicode-tokens-mode) 
+			 unicode-tokens-mode))
+	       (proof-x-symbol-support-maybe-available))
       :style toggle
       :selected (and (boundp 'x-symbol-mode) x-symbol-mode)]
 
-;; too many options and not working anyway
-;;      ["X-Symbol Unicode"  
-;; 	      (progn
-;;  		(customize-set-variable 'x-symbol-use-unicode t)
-;; 		(proof-x-symbol-toggle (if x-symbol-mode 0 1)))
-;;       :active  (and (proof-x-symbol-support-maybe-available)
-;; 		    (not (and (featurep 'x-symbol) (not x-symbol-use-unicode))))
-;;       :style toggle
-;;       :selected (and (boundp 'x-symbol-mode) x-symbol-mode
-;; 		     x-symbol-use-unicode)]
-
      ["Unicode Tokens" 
       (progn
 	(unless unicode-tokens-mode (proof-x-symbol-toggle 0))