Merge remote-tracking branch 'origin/master' into yelp

2013-04-11 10:40:30 -07:00
parent a74a7c7ef7 7cec3f8db3
commit f93369aa52
1 changed files with 0 additions and 10 deletions
--- a/init.el
+++ b/init.el
@@ -89,16 +89,6 @@
 ;; Multi-lining for python.
 (require 'multi-line-it)

-
-(require 'pymacs)
-(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)
-(autoload 'pymacs-autoload "pymacs")
-(pymacs-load "ropemacs" "rope-")
-
 (defun python-tabs ()
  (setq tab-width 4
        indent-tabs-mode t