Commits

Anonymous committed b242545

small changes

Comments (0)

Files changed (3)

elisp/jane/jane-cr.el

   ;; appends /dev/null to the command line even though we have this
   ;; variable set to false.  Perhaps setting it to false in this weird
   ;; manner will make it "more false".
-  (grep-apply-setting 'grep-use-null-device nil)
+  ;; (grep-apply-setting 'grep-use-null-device nil)
   (grep (concat cr-command " todo " id " -fullpath -local")))
 
 (defun cr-grep ()
+;; CR cfalls: Why isn't this in elisp/?
+
 ;; jane-common.el
 ;;
 ;; Path setup and unobjectionable customizations.
 ;; Every emacs user should load this file.
 
+;; so we can enable or disable bits of this file for individual users
+(defun i-am (users)
+  "returns true if user-login-name is passed"
+  (if (listp users)
+      (member (user-login-name) users)
+    (string= users (user-login-name))))
+
 ;;----------------------------------------------------------------------------;;
 ;; Set site lisp dir for everyone and add load paths                          ;;
 ;;----------------------------------------------------------------------------;;
 (require 'jane-micro-features)
 (require 'jane-ocaml)
 (require 'jane-cr)
-(require 'omake)
+;; cfalls: I don't like that this binds C-cC-g, usually C-g means quit
+(unless (i-am "cfalls") (require 'omake))
 
 ;; omake server executable
 (custom-set-variables
 (add-hook 'c-mode-common-hook
           (lambda () (local-set-key "\C-c\C-a" 'ff-find-other-file)))
 
-;; so we can enable or disable bits of this file for individual users
-(defun i-am (users)
-  "returns true if user-login-name is passed"
-  (if (listp users)
-      (member (user-login-name) users)
-    (string= users (user-login-name))))
-
 ;; CR cfalls for sweeks: Things that aren't optional probably
 ;; shouldn't be in microfeatures.  I find that confusing.
 
 ;;(Jane.faces-light)
 ;;(Jane.faces-subtle) ;; depends on Jane.faces-dark
 ;;(Jane.filladapt)
+;; CR cfalls: This is pointless -- it's already in jane-common.el
 (Jane.find)
 (Jane.flyspell)
 (Jane.frame)