diff options
| author |  Stefan Monnier <monnier@iro.umontreal.ca> | 2018-12-11 18:48:51 -0500 |
|---|---|---|
| committer |  Clément Pit-Claudel <clement.pitclaudel@live.com> | 2018-12-12 12:28:39 -0500 |
| commit | a921439a4eb5b0d96182748e779c78e2f6a41a5f (patch) | |
| tree | a887ed306e13a0bcf21a939166322819bf669281 /isar | |
| parent | 05df29f7ff065d8da45b81691c602b6cf075e4a0 (diff) | |
Cleanup patch; Moving defvar to toplevel
Move `defvar`s used to silence warnings outside of eval-when-compile.
Make sure they don't actually give a value to the var.
* pg-init.el: Simplify.
Use (if t ...) to avoid running `require` at compile-time.
Don't add subdirs to load-path here since this code is never used.
(pg-init--script-full-path, pg-init--pg-root):
Inline their definition into their sole user.
* generic/proof-utils.el (proof-resize-window-tofit):
Inline definitions of window-leftmost-p and window-rightmost-p previously
in proof-compat.el.
* lib/proof-compat.el (proof-running-on-win32): Remove, not used.
(mac-key-mode): Remove, there's no carbon-emacs-package-version in
Emacs≥24.3.
(pg-custom-undeclare-variable): Use dolist.
(save-selected-frame): Remove, save-selected-window also saves&restores
the selected frame at the same time. Update all users (which already
used save-selected-window around it).
(window-leftmost-p, window-rightmost-p, window-bottom-p)
(find-coding-system): Remove, unused.
* hol-light/hol-light.el (caml-font-lock-keywords): Don't try to defvar
it to a dummy value and...
(hol-light): ...check its existence before using it instead.
* coq/coq.el (coq-may-use-prettify): Simplify initialization.
Diffstat (limited to 'isar')
| -rw-r--r-- | isar/isabelle-system.el | 5 | ||||
| -rw-r--r-- | isar/isar.el | 9 |
2 files changed, 8 insertions, 6 deletions
diff --git a/isar/isabelle-system.el b/isar/isabelle-system.el index e399474b..0b61aab0 100644 --- a/isar/isabelle-system.el +++ b/isar/isabelle-system.el @@ -1,6 +1,7 @@ ;; isabelle-system.el --- Interface with Isabelle system ;; ;; Copyright (C) 2000 LFCS Edinburgh, David Aspinall. +;; Copyright (C) 2018 Free Software Foundation, Inc. ;; ;; Author: David Aspinall <da@dcs.ed.ac.uk> ;; Maintainer: Proof General maintainer <proofgen@dcs.ed.ac.uk> @@ -20,8 +21,8 @@ (require 'scomint) (require 'proof-site) (require 'proof-menu) - (require 'proof-syntax) - (defvar proof-assistant-menu)) + (require 'proof-syntax)) +(defvar proof-assistant-menu) (declare-function mapcan "cl-extra") ; spurious bytecomp warning diff --git a/isar/isar.el b/isar/isar.el index bb755d4f..917f8f6a 100644 --- a/isar/isar.el +++ b/isar/isar.el @@ -1,6 +1,7 @@ ;; isar.el --- Major mode for Isabelle/Isar proof assistant ;; ;; Copyright (C) 1994-2010 LFCS Edinburgh. +;; Copyright (C) 2018 Free Software Foundation, Inc. ;; ;; License: GPL (GNU GENERAL PUBLIC LICENSE) ;; @@ -24,10 +25,10 @@ (require 'proof-syntax) (require 'pg-goals) (require 'pg-vars) - (require 'outline) - (defvar comment-quote-nested) - (defvar isar-use-find-theorems-form) - (defvar isar-use-linear-undo)) + (require 'outline)) +(defvar comment-quote-nested) +(defvar isar-use-find-theorems-form) +(defvar isar-use-linear-undo) (require 'proof) (require 'isabelle-system) ; system code |