1.1 --- a/src/rlm/ns_rlm.clj	Tue Oct 18 00:57:08 2011 -0700
     1.2 +++ b/src/rlm/ns_rlm.clj	Tue Feb 28 13:26:34 2012 -0600
     1.3 @@ -1,6 +1,5 @@
     1.4  (ns rlm.ns-rlm
     1.5 -  "A few convienence functions for namespaces."
     1.6 -  (:use [clojure.contrib [ns-utils :only [get-ns]]]))
     1.7 +  "A few convienence functions for namespaces.")
     1.8  
     1.9  (defn ns-clear
    1.10    "completely removes all aliases, interns, and references from the namespace
    1.11 @@ -12,12 +11,13 @@
    1.12      ([] (ns-clear *ns*)))
    1.13  
    1.14  (defn ns-clone-fn
    1.15 -  "the calling namespace (*ns*) gets all the referenced vars as the target namespace
    1.16 -     anything that the target namespace doesn't have, ns won't have.  Anything it does
    1.17 -     have, *ns* will have."
    1.18 +  "the calling namespace (*ns*) gets all the referenced vars as the
    1.19 +   target namespace anything that the target namespace doesn't have,
    1.20 +   ns won't have.  Anything it does have, *ns* will have."
    1.21    [target-ns]
    1.22    (ns-clear *ns*)
    1.23 -  (doall (map (fn [[ns-alias ns]] (alias ns-alias (.name ns))) (ns-aliases target-ns)))
    1.24 +  (doall (map (fn [[ns-alias ns]]
    1.25 +                (alias ns-alias (.name  ns))) (ns-aliases target-ns)))
    1.26    (doall (map (fn [[sym var]]
    1.27  		(cond (var? var)
    1.28  		      (. *ns* (refer sym var))
    1.29 @@ -26,15 +26,15 @@
    1.30  		      ;;(eval `(clojure.core/import*  ~(.getName var)))))
    1.31  		  (ns-map target-ns))) nil)
    1.32  
    1.33 -(defmacro ns-clone
    1.34 - ([target-ns-name]
    1.35 -    `(do
    1.36 -       (require '~target-ns-name)
    1.37 -       (ns-clone-fn (get-ns '~target-ns-name)))))
    1.38 +;; (defmacro ns-clone
    1.39 +;;  ([target-ns-name]
    1.40 +;;     `(do
    1.41 +;;        (require '~target-ns-name)
    1.42 +;;        (ns-clone-fn (get-ns '~target-ns-name)))))
    1.43  
    1.44  (defn ls
    1.45    "lists all the vars defined in the namespace"
    1.46 -  ([ns] (doall (map println (keys (ns-map ns)))) nil)
    1.47 +  ([ns] (doall (map println (keys (ns-interns ns)))) nil)
    1.48    ([] (ls *ns*)))
    1.49  
    1.50