Commit 87ef312e authored by Makarius's avatar Makarius Committed by Stefan Berghofer
Browse files

clarified Isabelle editor configuration: prefer asynchronous server by default

parent acffc69c
......@@ -70,13 +70,22 @@ fi
if [ "$BATCH" = true ]; then
$ISABELLE_PROCESS -e "use_thy \"$NAME\";" -rq Why3
elif [ "$INTERACTIVE" = true ]; then
if [ "$INTERFACE" = emacs ]; then
LOGIC="-L"
else
LOGIC="-l"
fi
make_theory "$NAME"
$ISABELLE_TOOL $INTERFACE $LOGIC Why3 "$NAME.thy"
case "$INTERFACE" in
emacs)
"$ISABELLE_TOOL" emacs -L Why3 "$NAME.thy"
;;
jedit)
"$ISABELLE_TOOL" jedit -l Why3 "$NAME.thy"
;;
jedit-server)
if [ -f "$JEDIT_SETTINGS/server-Why3" ]; then
"$ISABELLE_TOOL" jedit -j-server=server-Why3 -l Pure "$NAME.thy"
else
"$ISABELLE_TOOL" jedit -j-server=server-Why3 -l Why3 "$NAME.thy" &
fi
;;
esac
else
usage
fi
......@@ -451,7 +451,7 @@ version_ok = "2013-2"
command = "%l/why3-cpulimit 0 0 -s %e why3 -b %f"
driver = "drivers/isabelle.drv"
in_place = true
editor = "jedit-isabelle"
editor = "isabelle-jedit-server"
[editor pvs]
name = "PVS"
......@@ -466,10 +466,14 @@ name = "Emacs/ProofGeneral/Coq"
command = "emacs23 --eval \"(setq coq-load-path '(\\\"%l/coq-tactic\\\" \
(\\\"%l/coq\\\" \\\"Why3\\\")))\" %f"
[editor jedit-isabelle]
[editor isabelle-jedit]
name = "Isabelle/jEdit"
command = "isabelle why3 -i jedit %f"
[editor isabelle-jedit-server]
name = "Isabelle/jEdit (server)"
command = "isabelle why3 -i jedit-server %f"
[editor proofgeneral-isabelle]
name = "Emacs/ProofGeneral/Isabelle"
command = "isabelle why3 -i emacs %f"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment