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

* origin/master:
  No tabs in python in master.
  added backups to .gitignore.
  Added other direction split switching.
This commit is contained in:
Ivan Malison 2013-04-01 01:17:57 +00:00
commit 7cec3f8db3
2 changed files with 6 additions and 4 deletions

3
.gitignore vendored
View File

@ -3,4 +3,5 @@ auto-save-list
eproject.lst
*.elc
.smex-items
places
places
backups

View File

@ -110,19 +110,20 @@
(global-set-key (kbd "ESC <down>") (lambda () (interactive) (next-line 5)))
(global-set-key (kbd "ESC <up>") (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)
(global-set-key "\C-x\C-r" (lambda () (interactive) (revert-buffer t t)))
(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
;; =============================================================================