Fixed to compile correctly on macosx 10.3, 10.4 and Windows.

svn path=/trunk/; revision=5566

1 files changed, 4 insertions, 14 deletions

diff --git a/pd/src/u_main.tk b/pd/src/u_main.tk
index 62ddf836..177e1171 100644
--- a/pd/src/u_main.tk
+++ b/pd/src/u_main.tk
@@ -1783,13 +1783,8 @@ proc gatom_escape {sym} {
         set ret [string replace $sym 0 0 "--"]
 #       puts stderr [concat escape $sym $ret]
         } else {
-            if {[string equal -length 1 $sym "$"]} {
-                set ret [string replace $sym 0 0 "#"]
-#               puts stderr [concat unescape $sym $ret]
-            } else {
-                set ret $sym
-#               puts stderr [concat escape $sym "no change"]
-            }
+            set ret [string map {"$" "#"} $sym]
+#            puts stderr [concat unescape $sym $ret]
         }
     }
     pdtk_unspace $ret
@@ -1800,13 +1795,8 @@ proc gatom_unescape {sym} {
         set ret [string replace $sym 0 0 ""]
 #       puts stderr [concat unescape $sym $ret]
     } else {
-        if {[string equal -length 1 $sym "#"]} {
-            set ret [string replace $sym 0 0 "$"]
-#           puts stderr [concat unescape $sym $ret]
-        } else {
-            set ret $sym
-#           puts stderr [concat unescape $sym "no change"]
-        }
+        set ret [string map {"#" "$"} $sym]
+#        puts stderr [concat unescape $sym $ret]
     }
     concat $ret
 }