From 29799b74866babf3c918e642283de5024f37bb2e Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 28 Mar 2013 13:05:03 -0700 Subject: [PATCH 1/3] Added other direction split switching. --- init.el | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/init.el b/init.el index 9d092eed..12731fc7 100644 --- a/init.el +++ b/init.el @@ -123,9 +123,6 @@ (global-set-key (kbd "ESC ") (lambda () (interactive) (next-line 5))) (global-set-key (kbd "ESC ") (lambda () (interactive) (previous-line 5))) -;; Macros -(fset 'ipdb "import ipdb; ipdb.set_trace()") - ;; Miscellaneous (global-set-key "\C-x\C-b" 'buffer-menu) (global-set-key "\C-xw" 'whitespace-mode) @@ -134,10 +131,14 @@ (global-set-key "\C-x\C-d" 'decrease-left-margin) (global-set-key "\C-c\C-c" 'comment-region) (global-set-key (kbd "C-c w") 'tmux-copy) +(global-set-key (kbd "C-x O") (lambda () (interactive) (other-window -1))) ;; Something will occasionally override this binding. (global-set-key "\C-cg" 'rope-goto-definition) +;; Macros +(fset 'ipdb "import ipdb; ipdb.set_trace()") + ;; ============================================================================= ;; ELPA ;; ============================================================================= @@ -226,6 +227,7 @@ ;; ============================================================================= ;; Customize ;; ============================================================================= + (custom-set-variables ;; custom-set-variables was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. From d11f776e210a3564eda0ac55ebf7a5a7e3770546 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 28 Mar 2013 13:07:05 -0700 Subject: [PATCH 2/3] added backups to .gitignore. --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index b36739c1..2fe01e92 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ auto-save-list eproject.lst *.elc .smex-items -places \ No newline at end of file +places +backups \ No newline at end of file From 509397f9a2b06b4b1c26adde9daef05add3d7f1a Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 28 Mar 2013 13:08:02 -0700 Subject: [PATCH 3/3] No tabs in python in master. --- init.el | 3 --- 1 file changed, 3 deletions(-) diff --git a/init.el b/init.el index 917e5278..63ee9df8 100644 --- a/init.el +++ b/init.el @@ -110,9 +110,6 @@ python-indent-offset 4 (subword-mode t))) -;; Yelp always uses tabs. -(add-hook 'python-mode-hook 'python-tabs) - ;; ============================================================================= ;; Custom Key Bindings ;; =============================================================================