--- a/.emacs
+++ b/.emacs
@@ -10,8 +10,10 @@
 (setq ido-enable-flex-matching t)
 (ido-mode t)
 
+(require 'python-mode)
+(require 'ipython)
+
 (require 'show-wspace)
-(require 'doctest-mode)
 
 (require 'mercurial)
 
@@ -55,25 +57,12 @@ point."
   (make-variable-buffer-local 'font-lock-mode-hook)
   (add-hook 'font-lock-mode-hook 'show-ws-highlight-tabs)
   (make-variable-buffer-local 'python-indent)
-  (if (string-match "melange" buffer-file-name)
-      (set-variable 'python-indent 2))
+  (if (and buffer-file-name (string-match "melange" buffer-file-name))
+     (set-variable 'python-indent 2))
   (af-tab-fix)
 )
 (add-hook 'python-mode-hook 'af-python-mode-hook)
 
-;;pymacs
-(if (string-match "unixSoft/lib/python" (getenv "PATH"))
-    (setenv "PYTHONPATH" (concat (getenv "HOME") "/unixSoft/lib/python"))
-  )
-(autoload 'pymacs-apply "pymacs")
-(autoload 'pymacs-call "pymacs")
-(autoload 'pymacs-eval "pymacs" nil t)
-(autoload 'pymacs-exec "pymacs" nil t)
-(autoload 'pymacs-load "pymacs" nil t)
-(eval-after-load "pymacs"
-  '(add-to-list 'pymacs-load-path "~/unixSoft/lib/python"))
-;(pymacs-load "ropemacs" "rope-")
-;(setq ropemacs-enable-autoimport t)
 
 ; text-mode tries to use M-s for something other than my save shortcut.
 ; That's evil. Stop it from doing that.