diff options
| author |  David Aspinall <da@inf.ed.ac.uk> | 2010-08-11 19:51:39 +0000 |
|---|---|---|
| committer | David Aspinall <da@inf.ed.ac.uk> | 2010-08-11 19:51:39 +0000 |
| commit | d74ddc0eab1e4ed3b182bee4975ff4c2bfe0048f (patch) | |
| tree | c0b096abd398561b4d4d208cd1579bbf4cfc3646 | |
| parent | 050f49cfa0b35f604df30e8e16418866a56a830f (diff) | |
Move some var+macro to fix compilation
| -rw-r--r-- | generic/pg-pamacs.el | 14 | ||||
| -rw-r--r-- | generic/proof-utils.el | 15 |
2 files changed, 17 insertions, 12 deletions
diff --git a/generic/pg-pamacs.el b/generic/pg-pamacs.el index 87f54cfd..5e7d1830 100644 --- a/generic/pg-pamacs.el +++ b/generic/pg-pamacs.el @@ -34,6 +34,20 @@ ;;; Code: +(defmacro deflocal (var value &optional docstring) + "Define a buffer local variable VAR with default value VALUE." + `(progn + (defvar ,var nil ,docstring) + (make-variable-buffer-local (quote ,var)) + (setq-default ,var ,value))) + +(deflocal proof-buffer-type nil + "Symbol for the type of this buffer: 'script, 'shell, 'goals, or 'response.") + + +;; +;; Main macros +;; (defmacro proof-ass-sym (sym) "Return the symbol for SYM for the current prover. SYM not evaluated. diff --git a/generic/proof-utils.el b/generic/proof-utils.el index 209f2747..1d3932e9 100644 --- a/generic/proof-utils.el +++ b/generic/proof-utils.el @@ -45,24 +45,18 @@ (require 'proof-site) ; basic vars (require 'proof-compat) ; compatibility +(require 'pg-pamacs) ; macros for pa config (require 'proof-config) ; config vars (require 'bufhist) ; bufhist (require 'proof-syntax) ; syntax utils (require 'proof-autoloads) ; interface fns (require 'scomint) ; for proof-shell-live-buffer +;;; Code: -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;; Handy macros - -;;; Code: -(defmacro deflocal (var value &optional docstring) - "Define a buffer local variable VAR with default value VALUE." - `(progn - (defvar ,var nil ,docstring) - (make-variable-buffer-local (quote ,var)) - (setq-default ,var ,value))) +;; (defmacro proof-with-current-buffer-if-exists (buf &rest body) "As with-current-buffer if BUF exists and is live, otherwise nothing." @@ -70,9 +64,6 @@ (with-current-buffer ,buf ,@body))) -(deflocal proof-buffer-type nil - "Symbol for the type of this buffer: 'script, 'shell, 'goals, or 'response.") - ;; Slightly specialized version of above. This is used in commands ;; which work from different PG buffers (goals, response), typically ;; bound to toolbar commands. |