2 files changed, 11 insertions, 9 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 39a2f3eb9fe..3c8cbbdf1af 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-20  Jesper Harder  <harder@ifa.au.dk>
+
+        * progmodes/tcl.el (inferior-tcl): Use pop-to-buffer.
+
 2004-09-21  Luc Teirlinck  <teirllm@auburn.edu>
 
         * subr.el (after-change-major-mode-hook): Doc fix.
diff --git a/lisp/progmodes/tcl.el b/lisp/progmodes/tcl.el
index ac370cc1030..6965dea9fc1 100644
--- a/lisp/progmodes/tcl.el
+++ b/lisp/progmodes/tcl.el
@@ -1,6 +1,6 @@
 ;;; tcl.el --- Tcl code editing commands for Emacs
 
-;; Copyright (C) 1994,98,1999,2000,01,02,2003  Free Software Foundation, Inc.
+;; Copyright (C) 1994,98,1999,2000,01,02,2003,2004  Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Author: Tom Tromey <tromey@redhat.com>
@@ -1104,15 +1104,13 @@ See documentation for function `inferior-tcl-mode' for more information."
    (list (if current-prefix-arg
              (read-string "Run Tcl: " tcl-application)
            tcl-application)))
-  (if (not (comint-check-proc "*inferior-tcl*"))
-      (progn
-        (set-buffer (apply (function make-comint) "inferior-tcl" cmd nil
-                           tcl-command-switches))
-        (inferior-tcl-mode)))
-  (make-local-variable 'tcl-application)
-  (setq tcl-application cmd)
+  (unless (comint-check-proc "*inferior-tcl*")
+    (set-buffer (apply (function make-comint) "inferior-tcl" cmd nil
+                       tcl-command-switches))
+    (inferior-tcl-mode))
+  (set (make-local-variable 'tcl-application) cmd)
   (setq inferior-tcl-buffer "*inferior-tcl*")
-  (switch-to-buffer "*inferior-tcl*"))
+  (pop-to-buffer "*inferior-tcl*"))
 
 (defalias 'run-tcl 'inferior-tcl)