From af25444cf837d43a512c2c03b3f25efae80fa6ea Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Wed, 27 Mar 2013 18:25:41 -0700 Subject: [PATCH] Updates from work. --- .gitignore | 3 +-- init.el | 20 +++++++++++++++++--- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 2fe01e92..b36739c1 100644 --- a/.gitignore +++ b/.gitignore @@ -3,5 +3,4 @@ auto-save-list eproject.lst *.elc .smex-items -places -backups \ No newline at end of file +places \ No newline at end of file diff --git a/init.el b/init.el index 1b959227..9d092eed 100644 --- a/init.el +++ b/init.el @@ -59,9 +59,17 @@ (menu-bar-mode -1) ;; ============================================================================= -;; Flymake +;; tmux ;; ============================================================================= +(defun tmux-copy (&optional b e) + (interactive "r") + (shell-command-on-region b e "cat | tmux loadb -")) + +;; ;; ============================================================================= +;; ;; Flymake +;; ;; ============================================================================= + (require 'flymake) (require 'flymake-cursor) @@ -99,9 +107,11 @@ (defun python-tabs () (setq tab-width 4 indent-tabs-mode t - python-indent-offset 4)) + python-indent-offset 4 + (subword-mode t))) -(add-hook 'python-mode-hook 'subword-mode) +;; Yelp always uses tabs. +(add-hook 'python-mode-hook 'python-tabs) ;; ============================================================================= ;; Custom Key Bindings @@ -123,6 +133,10 @@ (global-set-key "\C-x\C-i" 'increase-left-margin) (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) + +;; Something will occasionally override this binding. +(global-set-key "\C-cg" 'rope-goto-definition) ;; ============================================================================= ;; ELPA