Many compatibility updates, bug fixes, rearrangements for compilation.

6 files changed, 19 insertions, 31 deletions

diff --git a/phox/phox-font.el b/phox/phox-font.el
index efd44420..37a6a910 100644
--- a/phox/phox-font.el
+++ b/phox/phox-font.el
@@ -58,7 +58,7 @@
 ;;                       phox-sym-lock tables
 ;;--------------------------------------------------------------------------;;
 
-(if proof-running-on-XEmacs (require 'phox-sym-lock))
+(if (featurep 'xemacs) (require 'phox-sym-lock))
 
 ;; to change this table, xfd -fn '-adobe-symbol-*--12-*' may be
 ;; used to determine the symbol character codes.
diff --git a/phox/phox-pbrpm.el b/phox/phox-pbrpm.el
index 9c06d319..f5d94362 100644
--- a/phox/phox-pbrpm.el
+++ b/phox/phox-pbrpm.el
@@ -289,7 +289,7 @@
 (defalias 'proof-pbrpm-right-paren-p 'phox-pbrpm-right-paren-p)
 
 ;;--------------------------------------------------------------------------;;
-(require 'pg-pbrpm)
+;(require 'pg-pbrpm)  da: causes compile error
 (require 'phox-lang)
 (provide 'phox-pbrpm)
 ;; phox-pbrpm ends here
diff --git a/phox/phox-sym-lock.el b/phox/phox-sym-lock.el
index e3ab2db0..e13f56a8 100644
--- a/phox/phox-sym-lock.el
+++ b/phox/phox-sym-lock.el
@@ -1,5 +1,4 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; phox-sym-lock.el - Extension of Font-Lock mode for symbol fontification.
+;; phox-sym-lock.el --- Extension of Font-Lock mode for symbol fontification.
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;        Copyright © 1997-1998 Albert Cohen, all rights reserved.
@@ -29,7 +28,7 @@
 ;; more about symbol font ? check out: xfd -fn '-adobe-symbol-*--12-*'
 
 (require 'font-lock)
-(if (string-match "XEmacs" emacs-version) 
+(if (featurep 'xemacs)
     (require 'atomic-extents))  ;; not available on GNU Emacs
 
 (defvar phox-sym-lock-sym-count 0
@@ -169,7 +168,11 @@
 		    (list 'registry "adobe-fontspecific"
 			  'dimension 1
 			  'chars 94
-			  'final 53
+;;			  'final 53
+;; DA PG 3.7: above line doesn't work on XEmacs 21.5b28, gives
+;; Character set already defined for this DIMENSION/CHARS/FINAL/DIRECTION combo (indian-is13194)
+;; DA: Will 55 work?  
+			  'final 55 
 			  'graphic 0))
       (make-charset 'phox-sym-lock-cset-right "Char set for symbol font"
 		    (list 'registry "adobe-fontspecific"
diff --git a/phox/phox-tags.el b/phox/phox-tags.el
index e24e6ce7..c62fe331 100644
--- a/phox/phox-tags.el
+++ b/phox/phox-tags.el
@@ -21,7 +21,7 @@
 (defun phox-tags-add-table(table)
   "add tags table"
   (interactive "D directory, location of a file named TAGS to add : ")
-  (if proof-running-on-XEmacs
+  (if (featurep 'xemacs)
       (let ((association (cons buffer-file-name table)))
 	(if (member association tag-table-alist)
 	    (message "%s already loaded." table)
@@ -39,7 +39,7 @@
   "Set tags-table-list to nil."
   (interactive)
 ;  (make-local-variable 'tags-table-list)
-  (if proof-running-on-XEmacs
+  (if (featurep 'xemacs)
       (progn
 	(setq tag-table-alist (remassoc buffer-file-name tag-table-alist)))
     (setq tags-table-list nil))
@@ -85,7 +85,7 @@
 ;; hook for that.
 ;; 
 (interactive)
-(if proof-running-on-XEmacs
+(if (featurep 'xemacs)
      (tag-complete-symbol)
   (complete-tag)
   )
diff --git a/phox/phox.el b/phox/phox.el
index 2c51e434..6edae61d 100644
--- a/phox/phox.el
+++ b/phox/phox.el
@@ -1,13 +1,13 @@
 ;; $State$ $Date$ $Revision$ 
 
 (require 'proof)			; load generic parts
-(require 'proof-config)
 
-;; Adjust toolbar entries.  (Must be done
-;; before proof-toolbar is loaded).
+;; Adjust toolbar entries.  (Must be done before proof-toolbar is
+;; loaded).
 
-(if proof-running-on-XEmacs (setq phox-toolbar-entries
-      (remassoc 'context phox-toolbar-entries)))
+(eval-after-load "pg-custom"
+  '(setq phox-toolbar-entries
+    (remassoc 'context phox-toolbar-entries)))
 
 
 ;; ======== User settings for PhoX ========
@@ -225,27 +225,10 @@
   (proof-goals-config-done))
 
 
-;; The response buffer and goals buffer modes defined above are
-;; trivial.  In fact, we don't need t²o define them at all -- they
-;; would simply default to "proof-response-mode" and "pg-goals-mode".
-
 ;; A more sophisticated instantiation might set font-lock-keywords to
 ;; add highlighting, or some of the proof by pointing markup
 ;; configuration for the goals buffer.
 
-;; The final piece of magic here is a hook which configures settings
-;; to get the proof shell running.  Proof General needs to know the
-;; name of the program to run, and the modes for the shell, response,
-;; and goals buffers.
-
-(add-hook 'proof-pre-shell-start-hook 'phox-pre-shell-start)
-
-(defun phox-pre-shell-start ()
-  (setq proof-prog-name		phox-prog-name)
-  (setq proof-mode-for-shell    'phox-shell-mode)
-  (setq proof-mode-for-response 'phox-response-mode)
-  (setq proof-mode-for-goals	'phox-goals-mode))
-
 ; completions
 ; dans completions.el
 ;(setq completion-min-length 6)
diff --git a/phox/x-symbol-phox.el b/phox/x-symbol-phox.el
index 038b6112..7acd776f 100644
--- a/phox/x-symbol-phox.el
+++ b/phox/x-symbol-phox.el
@@ -11,6 +11,8 @@
 ;; NB: Part of Proof General distribution.
 ;;
 
+(require 'proof-utils)
+
 (defvar x-symbol-phox-required-fonts nil)
 
 ;;;===========================================================================