1.1 --- a/NEWS	Sun Nov 30 12:58:20 2008 +0100
     1.2 +++ b/NEWS	Sun Nov 30 14:03:45 2008 +0100
     1.3 @@ -15,17 +15,18 @@
     1.4    - The former "isabelle" alias for "isabelle-process" has been
     1.5      removed (should rarely occur to regular users).
     1.6  
     1.7 -  - The "Isabelle" alias for "isabelle-interface" has been removed.
     1.8 +  - The former "isabelle-interface" and its alias "Isabelle" have been
     1.9 +    removed (interfaces are now regular Isabelle tools).
    1.10  
    1.11  Within scripts and make files, the Isabelle environment variables
    1.12  ISABELLE_TOOL and ISABELLE_PROCESS replace old ISATOOL and ISABELLE,
    1.13  respectively.  (The latter are still available as legacy feature.)
    1.14  
    1.15 -Also note that user interfaces are now better wrapped as regular
    1.16 -Isabelle tools instead of using the special isabelle-interface wrapper
    1.17 -(which can be confusing if the interface is uninstalled or changed
    1.18 -otherwise).  See "isabelle tty" and "isabelle emacs" for contemporary
    1.19 -examples.
    1.20 +The old isabelle-interface wrapper could react in confusing ways if
    1.21 +the interface was uninstalled or changed otherwise.  Individual
    1.22 +interface tool configuration is now more explicit, see also the
    1.23 +Isabelle system manual.  In particular, Proof General is now available
    1.24 +via "isabelle emacs".
    1.25  
    1.26  INCOMPATIBILITY, need to adapt derivative scripts.  Users may need to
    1.27  purge installed copies of Isabelle executables and re-run "isabelle

     2.1 --- a/bin/isabelle-interface	Sun Nov 30 12:58:20 2008 +0100
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,44 +0,0 @@
     2.4 -#!/usr/bin/env bash
     2.5 -#
     2.6 -# $Id$
     2.7 -# Author: Markus Wenzel, TU Muenchen
     2.8 -#
     2.9 -# Isabelle interface startup script.
    2.10 -
    2.11 -if [ -L "$0" ]; then
    2.12 -  TARGET="$(LC_ALL=C ls -l "$0" | sed 's/.* -> //')"
    2.13 -  exec "$(cd "$(dirname "$0")"; cd "$(pwd -P)"; cd "$(dirname "$TARGET")"; pwd)/$(basename "$TARGET")" "$@"
    2.14 -fi
    2.15 -
    2.16 -
    2.17 -## settings
    2.18 -
    2.19 -PRG="$(basename "$0")"
    2.20 -
    2.21 -ISABELLE_HOME="$(cd "$(dirname "$0")"; cd "$(pwd -P)"; cd ..; pwd)"
    2.22 -source "$ISABELLE_HOME/lib/scripts/getsettings" || exit 2
    2.23 -
    2.24 -
    2.25 -## diagnostics
    2.26 -
    2.27 -function fail()
    2.28 -{
    2.29 -  echo "$1" >&2
    2.30 -  exit 2
    2.31 -}
    2.32 -
    2.33 -
    2.34 -## main
    2.35 -
    2.36 -case "$ISABELLE_INTERFACE" in
    2.37 -  none)
    2.38 -    INTERFACE="$ISABELLE_PROCESS"
    2.39 -    ;;
    2.40 -  */*)
    2.41 -    INTERFACE="$ISABELLE_INTERFACE"
    2.42 -    ;;
    2.43 -esac
    2.44 -
    2.45 -[ ! -x "$INTERFACE" ] && fail "Bad Isabelle interface: \"$ISABELLE_INTERFACE\""
    2.46 -
    2.47 -exec "$INTERFACE" "$@"

     3.1 --- a/etc/settings	Sun Nov 30 12:58:20 2008 +0100
     3.2 +++ b/etc/settings	Sun Nov 30 14:03:45 2008 +0100
     3.3 @@ -187,23 +187,6 @@
     3.4  
     3.5  
     3.6  ###
     3.7 -### Interfaces
     3.8 -###
     3.9 -
    3.10 -# Fallback: the null interface (pass-through to raw isabelle process).
    3.11 -ISABELLE_INTERFACE=none
    3.12 -
    3.13 -ISABELLE_INTERFACE=$(choosefrom \
    3.14 -  "$ISABELLE_HOME/contrib/ProofGeneral/isar/interface" \
    3.15 -  "$ISABELLE_HOME/../ProofGeneral/isar/interface" \
    3.16 -  "/usr/local/ProofGeneral/isar/interface" \
    3.17 -  "/usr/share/ProofGeneral/isar/interface" \
    3.18 -  "/opt/ProofGeneral/isar/interface" \
    3.19 -  "/usr/share/emacs/ProofGeneral/isar/interface" \
    3.20 -  "$ISABELLE_INTERFACE")
    3.21 -
    3.22 -
    3.23 -###
    3.24  ### Proof General / Emacs
    3.25  ###
    3.26  

     4.1 --- a/lib/Tools/install	Sun Nov 30 12:58:20 2008 +0100
     4.2 +++ b/lib/Tools/install	Sun Nov 30 14:03:45 2008 +0100
     4.3 @@ -74,7 +74,7 @@
     4.4  if [ -n "$BINDIR" ]; then
     4.5    mkdir -p "$BINDIR" || fail "Bad directory: $BINDIR"
     4.6  
     4.7 -  for NAME in isabelle isabelle-process isabelle-interface
     4.8 +  for NAME in isabelle isabelle-process
     4.9    do
    4.10      BIN="$BINDIR/$NAME"
    4.11      DIST="$DISTDIR/bin/$NAME"