colonelpanic/dotfiles
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* 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-03-28 13:08:42 -07:00
commit 1801e8e766
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
init.el
View File

@ -111,9 +111,6 @@
(add-hook 'python-mode-hook 'subword-mode) (add-hook 'python-mode-hook 'subword-mode)
;; Yelp always uses tabs.
(add-hook 'python-mode-hook 'python-tabs)
;; ============================================================================= ;; =============================================================================
;; Custom Key Bindings ;; Custom Key Bindings
;; ============================================================================= ;; =============================================================================
@ -124,19 +121,20 @@
(global-set-key (kbd "ESC <down>") (lambda () (interactive) (next-line 5))) (global-set-key (kbd "ESC <down>") (lambda () (interactive) (next-line 5)))
(global-set-key (kbd "ESC <up>") (lambda () (interactive) (previous-line 5))) (global-set-key (kbd "ESC <up>") (lambda () (interactive) (previous-line 5)))
;; Macros
(fset 'ipdb "import ipdb; ipdb.set_trace()")
;; Miscellaneous ;; Miscellaneous
(global-set-key "\C-x\C-b" 'buffer-menu) (global-set-key "\C-x\C-b" 'buffer-menu)
(global-set-key "\C-xw" 'whitespace-mode) (global-set-key "\C-xw" 'whitespace-mode)
(global-set-key "\C-x\C-r" (lambda () (interactive) (revert-buffer t t))) (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 "\C-c\C-c" 'comment-region)
(global-set-key (kbd "C-c w") 'tmux-copy) (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. ;; Something will occasionally override this binding.
(global-set-key "\C-cg" 'rope-goto-definition) (global-set-key "\C-cg" 'rope-goto-definition)
;; Macros
(fset 'ipdb "import ipdb; ipdb.set_trace()")
;; ============================================================================= ;; =============================================================================
;; ELPA ;; ELPA
;; ============================================================================= ;; =============================================================================