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

Merge branch 'master' of github.com:IvanMalison/.emacs.d

Browse Source 
* 'master' of github.com:IvanMalison/.emacs.d:
  Tweaks.
This commit is contained in:
Ivan Malison 2013-03-28 13:05:33 -07:00
commit 37a1a11904
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
init.el
View File

@ -83,7 +83,7 @@
(add-to-list 'flymake-allowed-file-name-masks '("\\.py\\'" flymake-pylint-init)) (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 (add-hook 'python-mode-hook
(lambda () (unless (eq buffer-file-name nil) (flymake-mode 1)))) (lambda () (unless (eq buffer-file-name nil) (flymake-mode 1))))
@ -127,8 +127,6 @@
(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-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 "\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))) (global-set-key (kbd "C-x O") (lambda () (interactive) (other-window -1)))
@ -159,7 +157,7 @@
;; (package-refresh-contents)) ;; (package-refresh-contents))
;; ;; Add in your own as you wish: ;; ;; 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.") ;; "A list of packages to ensure are installed at launch.")
;; (dolist (p my-packages) ;; (dolist (p my-packages)
@ -222,7 +220,7 @@
(load-file "~/.emacs.d/emacs-for-python/epy-init.el") (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 ;; Customize