Merge branch 'master' into yelp

* master:
  Update emacs for python submodule.
  Added emacs-for-python.
This commit is contained in:
Ivan Malison 2013-03-20 10:28:31 -07:00
commit 92fa746aa3
3 changed files with 6 additions and 3 deletions

3
.gitmodules vendored
View File

@ -10,3 +10,6 @@
[submodule "themes/zenburn"]
path = themes/zenburn
url = https://github.com/bbatsov/zenburn-emacs
[submodule "emacs-for-python"]
path = emacs-for-python
url = git@github.com:IvanMalison/emacs-for-python.git

1
emacs-for-python Submodule

@ -0,0 +1 @@
Subproject commit 8e09525a0f2f38cf249a70896c9e3d8815268b26

View File

@ -34,9 +34,6 @@
(ido-mode t)
(setq ido-enable-flex-matching t)
;; Code Completion.
(require 'yasnippet-bundle)
;; Give duplicate open buffers better titles.
(require 'uniquify)
(setq uniquify-buffer-name-style 'forward)
@ -183,3 +180,5 @@
'(rainbow-delimiters-depth-7-face ((t (:foreground "blue"))))
'(rainbow-delimiters-depth-8-face ((t (:foreground "yellow"))))
'(rainbow-delimiters-depth-9-face ((t (:foreground "magenta")))))
(load-file "~/.emacs.d/emacs-for-python/epy-init.el")