From 53a488989f19db8179cf9806c52d7daeddec6019 Mon Sep 17 00:00:00 2001
From: Tim Edwards <tim@opencircuitdesign.com>
Date: Thu, 28 May 2020 12:40:28 -0400
Subject: [PATCH] Moved the read-in of the readspice script from the wrapper to
 the startup file, since the script is not (and should not be) wrapper-
 dependent.

---
 tcltk/magic.tcl.in | 8 ++++++++
 tcltk/wrapper.tcl  | 4 ----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/tcltk/magic.tcl.in b/tcltk/magic.tcl.in
index acfa73d8..dfc9755c 100755
--- a/tcltk/magic.tcl.in
+++ b/tcltk/magic.tcl.in
@@ -263,6 +263,14 @@ if {[file exists ${CAD_ROOT}/magic/tcl/toolkit.tcl]} {
    set Opts(toolkit) 0
 }
 
+#----------------------------------------------------------------------
+# Check for presence of the readspice script and include it
+
+if {[file exists ${CAD_ROOT}/magic/tcl/readspice.tcl]} {
+   source ${CAD_ROOT}/magic/tcl/readspice.tcl
+   set Opts(readspice) 0
+}
+
 #----------------------------------------------------------------------
 # Magic start function drops back to interpreter after initialization & setup
 
diff --git a/tcltk/wrapper.tcl b/tcltk/wrapper.tcl
index 71e6530c..cacc5b27 100644
--- a/tcltk/wrapper.tcl
+++ b/tcltk/wrapper.tcl
@@ -392,10 +392,6 @@ catch {source ${CAD_ROOT}/magic/tcl/drcmgr.tcl}
 
 catch {source ${CAD_ROOT}/magic/tcl/texthelper.tcl}
 
-# Add the readspice command for port annotation
-
-catch {source ${CAD_ROOT}/magic/tcl/readspice.tcl}
-
 # Create or redisplay the technology manager
 
 proc magic::techmanager {{option "update"}} {