diff options
| author | David Aspinall | 2000-01-12 14:06:20 +0000 |
|---|---|---|
| committer | David Aspinall | 2000-01-12 14:06:20 +0000 |
| commit | d96ce78a6a0d14a6761712e7fb015dff009c8685 (patch) | |
| tree | eb7bb981ee2abb5952c1d0ce50254140946c4580 /generic | |
| parent | 319f79246e3886bea6a4ae6636372d3d8c456e27 (diff) | |
Attempted fix for thy-mode X-Symbol problems. Still buggy.
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/proof-x-symbol.el | 16 | ||||
| -rw-r--r-- | generic/proof.el | 5 |
2 files changed, 16 insertions, 5 deletions
diff --git a/generic/proof-x-symbol.el b/generic/proof-x-symbol.el index a0be2a24..bdc1175a 100644 --- a/generic/proof-x-symbol.el +++ b/generic/proof-x-symbol.el @@ -113,10 +113,18 @@ The package is available at http://www.fmi.uni-passau.de/~wedler/x-symbol")) ;; turn on/off cleanly in proof-x-symbol-mode-all-buffers. ;; (if xs-xtra-modes (push am-entry x-symbol-auto-mode-alist)) ;; Okay, let's be less rash and put it on a hook list. - (dolist (mode proof-xsym-extra-modes) - (add-hook - (intern (concat (symbol-name mode) "-hook")) - 'proof-x-symbol-mode)) + ;; 12.1.00: Nope, there's a problem here! + ;; Results in thy-mode invoking + ;; proof-x-symbol-mode twice, first via hook, then + ;; from proof-config-done-related, which blasts + ;; font-lock-keywords (whilst font-lock is turned on!) + ;; . Temporarily disable this, + ;; and consider what to do for other extra modes + ;; (isa-latex). +; (dolist (mode proof-xsym-extra-modes) +; (add-hook +; (intern (concat (symbol-name mode) "-hook")) +; 'proof-x-symbol-mode)) ;; Font lock support is optional (if flks (put symmode 'font-lock-defaults (list flks))) diff --git a/generic/proof.el b/generic/proof.el index 056d53f8..4bdfb9e4 100644 --- a/generic/proof.el +++ b/generic/proof.el @@ -293,7 +293,10 @@ with extra patterns (in non-mule mode).") ;; 20.4's version of font-lock in any case. (make-local-variable 'font-lock-defaults) ; not needed in XEmacs, FSF? (setq font-lock-defaults `(proof-font-lock-keywords nil ,case-fold)) - ;; FIXME: font-lock turned on somewhere, where? + ;; 12.1.99: testing: For XEmacs, we must also set the property. + ;; This is needed for buffers which are put into font-lock-mode + ;; (rather than fontified by hand). + (put major-mode 'font-lock-defaults font-lock-defaults) (setq font-lock-keywords nil)) (defun proof-fontify-region (start end) |