diff options
Diffstat (limited to '.emacs')
| -rw-r--r-- | .emacs | 23 |
1 files changed, 8 insertions, 15 deletions
| @@ -1,13 +1,6 @@ | |||
| 1 | ;; Set up the keyboard so the delete key on both the regular keyboard | 1 | ;; Set up the keyboard so the delete key on both the regular keyboard |
| 2 | ;; and the keypad delete the character under the cursor and to the right | 2 | ;; and the keypad delete the character under the cursor and to the right |
| 3 | ;; under X, instead of the default, backspace behavior. | 3 | ;; under X, instead of the default, backspace behavior. |
| 4 | |||
| 5 | ;; Added by Package.el. This must come before configurations of | ||
| 6 | ;; installed packages. Don't delete this line. If you don't want it, | ||
| 7 | ;; just comment it out by adding a semicolon to the start of the line. | ||
| 8 | ;; You may delete these explanatory comments. | ||
| 9 | ;;(package-initialize) | ||
| 10 | |||
| 11 | (global-set-key [delete] 'delete-char) | 4 | (global-set-key [delete] 'delete-char) |
| 12 | (global-set-key [kp-delete] 'delete-char) | 5 | (global-set-key [kp-delete] 'delete-char) |
| 13 | 6 | ||
| @@ -77,6 +70,14 @@ | |||
| 77 | (setq which-func-modes '(c-mode c++-mode java-mode python-mode)) | 70 | (setq which-func-modes '(c-mode c++-mode java-mode python-mode)) |
| 78 | (which-function-mode t) | 71 | (which-function-mode t) |
| 79 | 72 | ||
| 73 | ;; Python | ||
| 74 | (require 'whitespace) | ||
| 75 | (add-hook 'python-mode-hook | ||
| 76 | (lambda () | ||
| 77 | (progn | ||
| 78 | (setq whitespace-line-column 79) | ||
| 79 | (setq whitespace-style '(face empty tabs lines-tail trailing)) | ||
| 80 | (whitespace-mode)))) | ||
| 80 | 81 | ||
| 81 | ;; Custom plugins | 82 | ;; Custom plugins |
| 82 | (add-to-list 'load-path "~/.emacs.d/lisp/") | 83 | (add-to-list 'load-path "~/.emacs.d/lisp/") |
| @@ -94,14 +95,6 @@ | |||
| 94 | (require 'yaml-mode) | 95 | (require 'yaml-mode) |
| 95 | (add-to-list 'auto-mode-alist '("\\.yml$" . yaml-mode)) | 96 | (add-to-list 'auto-mode-alist '("\\.yml$" . yaml-mode)) |
| 96 | 97 | ||
| 97 | ;; Python | ||
| 98 | (require 'whitespace) | ||
| 99 | (add-hook 'python-mode-hook | ||
| 100 | (lambda () | ||
| 101 | (progn | ||
| 102 | (setq whitespace-line-column 79) | ||
| 103 | (setq whitespace-style '(face empty tabs lines-tail trailing)) | ||
| 104 | (whitespace-mode)))) | ||
| 105 | 98 | ||
| 106 | ;; yasnippet | 99 | ;; yasnippet |
| 107 | (require 'yasnippet) | 100 | (require 'yasnippet) |
