diff --git a/init.el b/init.el index 440e5c09..aca0ee2a 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) @@ -75,7 +83,7 @@ (add-to-list 'flymake-allowed-file-name-masks '("\\.py\\'" flymake-pylint-init)) -; Load flymake on non-temp buffers +;; Load flymake on non-temp buffers (add-hook 'python-mode-hook (lambda () (unless (eq buffer-file-name nil) (flymake-mode 1)))) @@ -101,8 +109,6 @@ indent-tabs-mode t python-indent-offset 4)) -;; Yelp always uses tabs. -(add-hook 'python-mode-hook 'python-tabs) (add-hook 'python-mode-hook 'subword-mode) ;; Yelp always uses tabs. @@ -125,9 +131,11 @@ (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-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 @@ -149,7 +157,7 @@ ;; (package-refresh-contents)) ;; ;; Add in your own as you wish: -;; (defvar my-packages '(starter-kit starter-kit-lisp starter-kit-bindings) +;; (defvar my-packages '(starter-kit starter-starter-kit-bindings) ;; "A list of packages to ensure are installed at launch.") ;; (dolist (p my-packages) @@ -212,11 +220,12 @@ (load-file "~/.emacs.d/emacs-for-python/epy-init.el") -(setq skeleton-pair nil) ;; This stuff sucks. +(setq skeleton-pair nil) ;; This breaks pasting from os clipboard ;; ============================================================================= ;; 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.