Permalink
Browse files

Merge branch 'master' of github.com:catphive/emacs

  • Loading branch information...
catphive committed Nov 4, 2011
2 parents d1d48ca + 0725460 commit c6a0de96dfbcad1506b56db56b53900eb5b20967
Showing with 2 additions and 2 deletions.
  1. +2 −2 init.el
View
@@ -137,9 +137,9 @@
(add-to-list 'auto-mode-alist '("\\.m\\'" . octave-mode))
;; python.
-(require 'pymacs nil t)
+(load "/usr/share/emacs/site-lisp/pymacs" t)
(when (fboundp 'pymacs-load)
- (pymacs-load "ropemacs" "rope-"))
+ (pymacs-load "ropemacs" "rope-" t))
;; Global Key Bindings.
(global-set-key (kbd "C-c s") 'multi-occur-in-matching-buffers)

0 comments on commit c6a0de9

Please sign in to comment.