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

This commit is contained in:
Ivan Malison 2013-04-11 10:40:30 -07:00
commit f93369aa52

10
init.el
View File

@ -89,16 +89,6 @@
;; Multi-lining for python. ;; Multi-lining for python.
(require 'multi-line-it) (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 () (defun python-tabs ()
(setq tab-width 4 (setq tab-width 4
indent-tabs-mode t indent-tabs-mode t