1.1 --- a/src/rlm/rlm_commands.clj	Thu Mar 01 05:47:37 2012 -0700
     1.2 +++ b/src/rlm/rlm_commands.clj	Thu Mar 01 05:55:59 2012 -0700
     1.3 @@ -1,27 +1,22 @@
     1.4  (ns rlm.rlm-commands
     1.5 -  (:require  [rlm ns-rlm shell-write]
     1.6 -	     [clojure.contrib [duck-streams :as ds]])
     1.7 -  (:use [clojure.contrib java-utils])
     1.8 -  (:require clojure.java.javadoc))
     1.9 +  (:use rlm.ns-rlm)
    1.10 +  (:use clojure.java.javadoc))
    1.11  
    1.12 +;; (defn current-directory [] (ds/file-str "/home/r/mobius"))
    1.13  
    1.14 -(defn current-directory [] (ds/file-str "/home/r/mobius"))
    1.15 -
    1.16 -(defn file-re [regex & {:keys [dir recurse] :or
    1.17 -			{dir (current-directory) recurse false}}]
    1.18 -  (let [dir (ds/file-str dir)]
    1.19 -    (filter (fn [file] (re-matches regex (.getName file)))
    1.20 -	    (if recurse
    1.21 -	      (file-seq dir)
    1.22 -	      (seq (.listFiles dir))))))
    1.23 +;; (defn file-re [regex & {:keys [dir recurse] :or
    1.24 +;; 			{dir (current-directory) recurse false}}]
    1.25 +;;   (let [dir (ds/file-str dir)]
    1.26 +;;     (filter (fn [file] (re-matches regex (.getName file)))
    1.27 +;; 	    (if recurse
    1.28 +;; 	      (file-seq dir)
    1.29 +;; 	      (seq (.listFiles dir))))))
    1.30  
    1.31  (defmacro undef
    1.32    "removes symbol from the current namespace"
    1.33    [& symbols]
    1.34 - 
    1.35    `(dorun (map (partial ns-unmap *ns*) (quote ~symbols))))
    1.36  
    1.37 -
    1.38  (defn ns-reset-fn
    1.39    "unmaps all interned symbols from the current namespace (except in-ns and ns)"
    1.40    ([ns-name]
    1.41 @@ -55,11 +50,6 @@
    1.42  
    1.43  (defmacro reload []
    1.44    `(do
    1.45 -     (rlm.ns-rlm/ns-clear)
    1.46 -     (use :reload-all (quote ~(symbol (str *ns*))))))
    1.47 -
    1.48 -(defmacro reload []
    1.49 -  `(do
    1.50       (rlm.rlm-commands/ns-nuke)
    1.51       (clojure.core/use
    1.52        :reload-all
    1.53 @@ -72,16 +62,11 @@
    1.54       (clojure.core/use :reload
    1.55        (clojure.core/symbol (clojure.core/str clojure.core/*ns*)))))
    1.56  
    1.57 -(defn keymap-clojure []
    1.58 -  (rlm.shell-write/sw "xmodmap" "/home/r/.xmodmap.clojure"))
    1.59 +;; (defn keymap-clojure []
    1.60 +;;   (rlm.shell-write/sw "xmodmap" "/home/r/.xmodmap.clojure"))
    1.61  
    1.62 -(defn keymap-normal []
    1.63 -  (rlm.shell-write/sw "xmodmap" "/home/r/.xmodmap.normal"))
    1.64 -
    1.65 -
    1.66 -(defn rlm []
    1.67 -  (clojure.core/require 'rlm.light-base)
    1.68 -  (rlm.ns-rlm/ns-clone rlm.light-base))
    1.69 +;; (defn keymap-normal []
    1.70 +;;   (rlm.shell-write/sw "xmodmap" "/home/r/.xmodmap.normal"))
    1.71  
    1.72  (defn javadoc [target]
    1.73    (binding
    1.74 @@ -89,31 +74,27 @@
    1.75         "/home/r/proj/repl/get-webpage.pl"]
    1.76      (clojure.java.javadoc/javadoc target)))
    1.77       
    1.78 -
    1.79  (defn help
    1.80    "load a bunch of really useful help functions"
    1.81    []
    1.82    (use
    1.83     '[rlm
    1.84       [function-utils :only [race race-pred defmix]]
    1.85 -     [rlm-commands :only [undef ns-reset ns-nuke reload keymap-clojure
    1.86 -                          keymap-normal rlm javadoc]]
    1.87 -     [ns-rlm :only [ns-clear ns-clone ls]]
    1.88 -     [play-all :only [play-all-music]]
    1.89 +     [rlm-commands :only
    1.90 +      [undef ns-reset ns-nuke reload re]]
    1.91 +     [ns-rlm :only [ls]]
    1.92 +     ;;[play-all :only [play-all-music]]
    1.93       [shell-inspect :only [command-line?]]
    1.94 -     [shell-write :only [sw]]
    1.95 -     [classpath-utils :only [classpath add-to-classpath]]
    1.96 +     ;;[shell-write :only [sw]]
    1.97 +     ;;[classpath-utils :only [classpath add-to-classpath]]
    1.98       [dreams :only [megadef silence]]
    1.99       [map-utils :only [map-keys filter-keys filter-vals]]
   1.100       [visualize :only [visual]]
   1.101       [identify :only [identify]]]
   1.102 -   '[abomination.no-parens :only [quit]]
   1.103 +
   1.104 +   ;;'[abomination.no-parens :only [quit]]
   1.105     
   1.106 -   
   1.107 -   '[clojure.contrib
   1.108 -     [duck-streams :only [file-str read-lines]]
   1.109 -     [str-utils :only [re-split re-gsub str-join]]
   1.110 -     [repl-utils :only [show expression-info]]]
   1.111 +   ;; TODO find replacement for show
   1.112      '[clojure
   1.113        [repl :only [source]]])
   1.114    (clojure.java.javadoc/add-local-javadoc
   1.115 @@ -128,8 +109,6 @@
   1.116     "/home/r/proj/jmeCapture/docs")
   1.117    (clojure.java.javadoc/add-local-javadoc
   1.118     "/home/r/java/tritonus.sourceforge.net/apidoc")
   1.119 -
   1.120 -
   1.121    nil)
   1.122  
   1.123