diff options
| -rw-r--r-- | generic/pg-pgip.el | 17 | ||||
| -rw-r--r-- | lib/proof-compat.el | 11 | ||||
| -rw-r--r-- | mmm/README.mmm-for-ProofGeneral | 5 | ||||
| -rw-r--r-- | mmm/mmm-vars.el | 5 |
4 files changed, 25 insertions, 13 deletions
diff --git a/generic/pg-pgip.el b/generic/pg-pgip.el index dad49539..0c60ddd2 100644 --- a/generic/pg-pgip.el +++ b/generic/pg-pgip.el @@ -1,4 +1,4 @@ -;; pg-pgip.el --- Functions for processing PGIP for Proof General +;; pg-pgip.el --- Functions for g PGIP for Proof General ;; ;; Copyright (C) 2000-2002 LFCS Edinburgh. ;; Author: David Aspinall <David.Aspinall@ed.ac.uk> @@ -330,18 +330,23 @@ Return a symbol representing the PGIP command processed, or nil." ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +(defun pg-pgip-file-of-url (urlstr) + (save-match-data + (if (string-match "^file:///\\(.*\\)$" urlstr) + (match-string 1 urlstr)))) + (defun pg-pgip-process-informfileloaded (node) (let* ((thyname (pg-pgip-get-thyname node)) (url (pg-pgip-get-url node)) - (filename (pg-pgip-get-url-filename url))) ;; FIXME: unimplemented! + (filename (pg-pgip-file-of-url url))) (proof-register-possibly-new-processed-file filename))) (defun pg-pgip-process-informfileretracted (node) (let* ((thyname (pg-pgip-get-thyname node)) (url (pg-pgip-get-url node)) - (filename (pg-pgip-get-url-filename url))) ;; FIXME: unimplemented! - (proof-unregister-possibly-processed-file filename))) ;; FIXME: unimplemented! - + (filename (pg-pgip-get-url-filename url))) + ;(proof-unregister-possibly-processed-file filename))) ;; unimplemented! + )) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; @@ -521,7 +526,7 @@ Also sets local proverid and srcid variables for buffer." (cond ((and (eq (car-safe type) 'const) (string-equal value (cadr type))) - (setq res (pg-pgip-interpret-const value 'const))) + (setq res (pg-pgip-interpret-value value 'const))) ((and (eq type 'integer) (string-match "[+-]?[0-9]+$" value)) (setq res (pg-pgip-interpret-value value 'integer))) diff --git a/lib/proof-compat.el b/lib/proof-compat.el index 483e5834..12114f58 100644 --- a/lib/proof-compat.el +++ b/lib/proof-compat.el @@ -37,9 +37,10 @@ ;; Menu presses query this variable, but it's not bound unless ;; mode engaged. Not noticeable in normal use, but it is as soon ;; as debug-on-error is engaged. -(if (and (boundp 'carbon-emacs-package-version) - (not (boundp 'mac-key-mode))) - (setq mac-key-mode nil)) +(with-no-warnings + (if (and (boundp 'carbon-emacs-package-version) + (not (boundp 'mac-key-mode))) + (setq mac-key-mode nil))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; @@ -52,7 +53,7 @@ (defun pg-custom-undeclare-variable (symbol) "Remove a custom setting SYMBOL. Done by `makunbound' and removing all properties mentioned by custom library." - (mapcar (lambda (prop) (remprop symbol prop)) + (mapc (lambda (prop) (remprop symbol prop)) '(default standard-value force-value @@ -169,7 +170,7 @@ The returned value is one of the following symbols: (or (fboundp 'characterp) (defun characterp (obj) - (char-valid-p obj))) + (with-no-warnings (char-valid-p obj)))) ;; End of proof-compat.el (provide 'proof-compat) diff --git a/mmm/README.mmm-for-ProofGeneral b/mmm/README.mmm-for-ProofGeneral index a79c84c7..346e407b 100644 --- a/mmm/README.mmm-for-ProofGeneral +++ b/mmm/README.mmm-for-ProofGeneral @@ -3,7 +3,10 @@ The code in this directory is taken from http://mmm-mode.sourceforge.net/ This is version 0.4.8. -No changes have been made for Proof General. + +Some minor changes have been made for Proof General to +remove compilation warnings. + Some files have not be included here. diff --git a/mmm/mmm-vars.el b/mmm/mmm-vars.el index 80e92ef2..fda8e61d 100644 --- a/mmm/mmm-vars.el +++ b/mmm/mmm-vars.el @@ -32,7 +32,9 @@ ;;; Code: +(require 'cl) (require 'mmm-compat) +(require 'mmm-utils) ;; MISCELLANEOUS ;;{{{ Shut up the Byte Compiler @@ -40,6 +42,7 @@ ;; Otherwise it complains about undefined variables. (eval-when-compile (defvar mmm-current-submode) + (defvar mmm-current-overlay) (defvar mmm-save-local-variables) (defvar mmm-mode-string) (defvar mmm-submode-mode-line-format) @@ -48,7 +51,7 @@ (defvar mmm-global-mode) (defvar mmm-primary-mode) (defvar mmm-classes-alist)) - + (defvar mmm-current-submode) ;;}}} ;;{{{ Error Conditions |