# HG changeset patch
# User wenzelm
# Date 911999242 -3600
# Node ID f91212fd2c7c4cde9652bfbcb54adb47a55ace6d
# Parent  a825c5929f4f52f775a5793a7a594030cca407c4
eliminated ISABELLE_INTERFACE_OPTIONS;

diff -r a825c5929f4f -r f91212fd2c7c lib/scripts/isa-emacs
--- a/lib/scripts/isa-emacs	Wed Nov 25 14:06:13 1998 +0100
+++ b/lib/scripts/isa-emacs	Wed Nov 25 14:07:22 1998 +0100
@@ -15,8 +15,9 @@
   echo "Usage: $PRG [OPTIONS]"
   echo
   echo "  Options are:"
-# echo "    -g GEOM      main window geometry (default 80x20)"
-  echo "  (currently none)"
+  echo "    -g GEOM      main window geometry (default none)"
+  echo "    -p NAME      Emacs program name (default xemacs)"
+  echo "    -u BOOL      use .emacs file (default false)"
   echo
   echo "Starts Emacs and Isamode."
   exit 1
@@ -33,21 +34,36 @@
 
 # options
 
-#MAINGEOM="80x20"
+MAINGEOM=""
+PROGNAME=xemacs
+INITFILE=false
 
-#while getopts "g:" OPT
-#do
-#  case "$OPT" in
-#    g)
-#      MAINGEOM="$OPTARG"
-#      ;;
-#    \?)
-#      usage
-#      ;;
-#  esac
-#done
+function getoptions()
+{
+  OPTIND=1
+  while getopts "g:p:u:" OPT
+  do
+    case "$OPT" in
+      g)
+        MAINGEOM="$OPTARG"
+        ;;
+      p)
+        PROGNAME="$OPTARG"
+        ;;
+      u)
+        INITFILE="$OPTARG"
+        ;;
+      \?)
+        usage
+        ;;
+    esac
+  done
+}
 
-#shift $(($OPTIND - 1))
+getoptions $ISAMODE_OPTIONS
+
+getoptions "$@"
+shift $(($OPTIND - 1))
 
 
 # args
@@ -57,16 +73,21 @@
 
 ## main
 
-CMDS="-l $ISAMODE_HOME/elisp/isa-site.el"
+ARGS=""
+
+[ -n "$MAINGEOM" ] && ARGS="$ARGS -geometry $MAINGEOM"
+[ "$INITFILE" = false ] && ARGS="$ARGS -q"
+
+
+ARGS="$ARGS -l $ISAMODE_HOME/elisp/isa-site.el"
 
 for FILE in "$ISABELLE_HOME/etc/isa-settings.el" \
     "$ISABELLE_HOME_USER/etc/isa-settings.el"
 do
-  [ -f "$FILE" ] && CMDS="$CMDS -l $FILE"
+  [ -f "$FILE" ] && ARGS="$ARGS -l $FILE"
 done
 
-CMDS="$CMDS -f isabelle"
+ARGS="$ARGS -f isabelle"
 
 
- exec $ISAMODE_EMACS -T "Isabelle" $CMDS
-#exec $ISAMODE_EMACS -T "Isabelle" -geometry $MAINGEOM $CMDS
+exec $PROGNAME -T "Isabelle" -geometry $MAINGEOM $ARGS
diff -r a825c5929f4f -r f91212fd2c7c lib/scripts/isa-xterm
--- a/lib/scripts/isa-xterm	Wed Nov 25 14:06:13 1998 +0100
+++ b/lib/scripts/isa-xterm	Wed Nov 25 14:07:22 1998 +0100
@@ -42,27 +42,34 @@
 PASS=""
 SYMBOLS="true"
 
-while getopts "g:h:p:s:" OPT
-do
-  case "$OPT" in
-    g)
-      MAINGEOM="$OPTARG"
-      ;;
-    h)
-      HILITE="$OPTARG"
-      ;;
-    p)
-      PASS="$PASS $OPTARG"
-      ;;
-    s)
-      SYMBOLS="$OPTARG"
-      ;;
-    \?)
-      usage
-      ;;
-  esac
-done
+function getoptions()
+{
+  OPTIND=1
+  while getopts "g:h:p:s:" OPT
+  do
+    case "$OPT" in
+      g)
+        MAINGEOM="$OPTARG"
+        ;;
+      h)
+        HILITE="$OPTARG"
+        ;;
+      p)
+        PASS="$PASS $OPTARG"
+        ;;
+      s)
+        SYMBOLS="$OPTARG"
+        ;;
+      \?)
+        usage
+        ;;
+    esac
+  done
+}
 
+getoptions $ISABELLE_XTERM_OPTIONS
+
+getoptions "$@"
 shift $(($OPTIND - 1))