# HG changeset patch
# User Jordi Gutiérrez Hermoso <jordigh@gmail.com>
# Date 1269292524 21600
# Node ID 04f1a90eca704a79468ba4e0a75c02e4c3d69e74
# Parent  2c6fced452acb7ea0655b475ad6d87949ff12724
Restore ipython mode, remove manual inclusion of cmake-mode

diff --git a/dotemacs b/dotemacs
--- a/dotemacs
+++ b/dotemacs
@@ -64,8 +64,7 @@
 
 (defalias 'perl-mode 'cperl-mode)
 
-;; Commented out for lenny due to a bug with ipython/python mode
-;(require 'ipython)
+(require 'ipython)
 
 (server-start)
 
@@ -169,8 +168,6 @@
 	   '(("\\.cmake\\'" . cmake-mode))
 	   auto-mode-alist))
 
-;(autoload 'cmake-mode "~/.emacs.d/plugins/cmake-mode.el" t)
-
 (defun set-tab-width (width)
   (interactive "nSet tab width: ")
   (setq tab-width width))