From 489c25f12e2145eadad8f274d09f87734188e7ff Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Tue, 19 Mar 2013 19:59:41 -0700 Subject: [PATCH 1/2] Added emacs-for-python. --- .gitmodules | 3 +++ emacs-for-python | 1 + init.el | 5 ++--- 3 files changed, 6 insertions(+), 3 deletions(-) create mode 160000 emacs-for-python diff --git a/.gitmodules b/.gitmodules index 3292963d..78f9282e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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:gabrielelanaro/emacs-for-python.git diff --git a/emacs-for-python b/emacs-for-python new file mode 160000 index 00000000..50c3b1e9 --- /dev/null +++ b/emacs-for-python @@ -0,0 +1 @@ +Subproject commit 50c3b1e9bb1afe561666ec9c9b627763c313e910 diff --git a/init.el b/init.el index 7a22a390..682973e5 100644 --- a/init.el +++ b/init.el @@ -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) @@ -180,3 +177,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") From ad26b3428f89f0be3f25cf2f0956d703bee05f21 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Tue, 19 Mar 2013 20:18:24 -0700 Subject: [PATCH 2/2] Update emacs for python submodule. --- .gitmodules | 2 +- emacs-for-python | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 78f9282e..85bf4e10 100644 --- a/.gitmodules +++ b/.gitmodules @@ -12,4 +12,4 @@ url = https://github.com/bbatsov/zenburn-emacs [submodule "emacs-for-python"] path = emacs-for-python - url = git@github.com:gabrielelanaro/emacs-for-python.git + url = git@github.com:IvanMalison/emacs-for-python.git diff --git a/emacs-for-python b/emacs-for-python index 50c3b1e9..8e09525a 160000 --- a/emacs-for-python +++ b/emacs-for-python @@ -1 +1 @@ -Subproject commit 50c3b1e9bb1afe561666ec9c9b627763c313e910 +Subproject commit 8e09525a0f2f38cf249a70896c9e3d8815268b26