@@ -1,8 +1,8 @@
 #!/usr/local/bin/tclsh
-# FILE: "/diska/home/joze/src/tclreadline/tclreadlineSetup.tcl.in"
-# LAST MODIFICATION: "Fri Aug 20 15:23:15 1999 (joze)"
+# FILE: "/home/joze/src/tclreadline/tclreadlineSetup.tcl.in"
+# LAST MODIFICATION: "Sat Aug 21 00:19:39 1999 (joze)"
 # (C) 1998, 1999 by Johannes Zellner, <johannes@zellner.org>
 # $Id$
 # ---
 #
 # tclreadline -- gnu readline for tcl
@@ -44,15 +44,15 @@
     if ![info exists auto_noload] {
         #
         # Make sure we're not trying to load the same proc twice.
         #
         if [info exists unknown_pending($name)] {
-            return -code error "self-referential recursion in \"unknown\" for command \"$name\"";
+            return -code error "self-referential recursion in \"unknown\" for command \"$name\""
         }
-        set unknown_pending($name) pending;
+        set unknown_pending($name) pending
         set ret [catch {auto_load $name [uplevel 1 {namespace current}]} msg]
-        unset unknown_pending($name);
+        unset unknown_pending($name)
         if {$ret != 0} {
             return -code $ret -errorcode $errorCode \
                 "error while autoloading \"$name\": $msg"
         }
         if ![array size unknown_pending] {
@@ -164,21 +164,23 @@
                     set prompt_string "
\[0;91m$base
\[0m"
                 }
 
             }
 
-            proc ::tclreadline::prompt1 {} {
-                variable prompt_string
-                global env
-                if {[catch {set pwd [pwd]} tmp]} {
-                    set pwd "unable to get pwd"
-                }
-
-                if [info exists env(HOME)] {
-                    regsub $env(HOME) $pwd "~" pwd
-                }
-                return "$prompt_string \[$pwd\]"
+            if {"" == [info procs ::tclreadline::prompt1]} {
+                proc ::tclreadline::prompt1 {} {
+                    variable prompt_string
+                    global env
+                    if {[catch {set pwd [pwd]} tmp]} {
+                        set pwd "unable to get pwd"
+                    }
+
+                    if [info exists env(HOME)] {
+                        regsub $env(HOME) $pwd "~" pwd
+                    }
+                    return "$prompt_string \[$pwd\]"
+                }
             }
         }
 
         proc ls {args} {
             if {[exec uname -s] == "Linux"} {
@@ -291,11 +293,11 @@
             } else {
                 set ::tclreadline::LINE [::tclreadline::readline read %]
             }
 
             while {![::tclreadline::readline complete $::tclreadline::LINE]} {
-                append ::tclreadline::LINE ";"
+                append ::tclreadline::LINE "\n"
                 append ::tclreadline::LINE [::tclreadline::readline read \
                     ${::tclreadline::prompt2}]
             }
 
             # Magnus Eriksson <magnus.eriksson@netinsight.se> proposed