diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2014-02-01 16:27:10 -0500 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2014-02-01 16:27:10 -0500 |
| commit | ee7e5782333aced0070a2109185b3b6f1f303312 (patch) | |
| tree | 7f6b006ba7e15e25bc761d544407744337a29e12 /lisp | |
| parent | e38b769d324cc3ae56dff19689fdd7c47441b4fe (diff) | |
| download | emacs.d-ee7e5782333aced0070a2109185b3b6f1f303312.tar.gz | |
Move some settings from general to editing
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/init-editing.el | 16 | ||||
| -rw-r--r-- | lisp/init-general.el | 17 |
2 files changed, 16 insertions, 17 deletions
diff --git a/lisp/init-editing.el b/lisp/init-editing.el index f5e1f9b..48a7f1e 100644 --- a/lisp/init-editing.el +++ b/lisp/init-editing.el @@ -7,11 +7,27 @@ (key-chord-define-global ";a" 'ace-jump-mode) (key-chord-define-global ",v" 'view-mode) +(eval-after-load 'view + '(progn + (define-key view-mode-map "l" 'recenter-top-bottom) + (define-key view-mode-map "a" 'ace-jump-mode))) + ;; Overrides `suspend-emacs' (which is also bound to C-x C-z). (global-set-key (kbd "C-z") 'zap-to-char) +;; http://irreal.org/blog/?p=1536 +(autoload 'zap-up-to-char "misc" + "Kill up to, but not including ARGth occurrence of CHAR.") +(global-set-key (kbd "M-z") 'zap-up-to-char) (global-set-key (kbd "C-'") 'backward-kill-word) +(global-set-key (kbd "M-/") 'hippie-expand) +;; http://www.emacswiki.org/emacs/HippieExpand#toc9 +(defadvice he-substitute-string (after he-paredit-fix activate) + "Remove extra paren when expanding line in paredit." + (if (and paredit-mode (equal (substring str -1) ")")) + (progn (backward-delete-char 1) (forward-char)))) + ;; http://www.emacswiki.org/emacs/UnfillParagraph (defun unfill-paragraph () "Takes a multi-line paragraph and makes it into a single line of text." diff --git a/lisp/init-general.el b/lisp/init-general.el index 4b86b9b..91db147 100644 --- a/lisp/init-general.el +++ b/lisp/init-general.el @@ -36,23 +36,6 @@ (put 'narrow-to-region 'disabled nil) (put 'narrow-to-page 'disabled nil) -(global-set-key (kbd "M-/") 'hippie-expand) -;; http://www.emacswiki.org/emacs/HippieExpand#toc9 -(defadvice he-substitute-string (after he-paredit-fix activate) - "Remove extra paren when expanding line in paredit." - (if (and paredit-mode (equal (substring str -1) ")")) - (progn (backward-delete-char 1) (forward-char)))) - -(eval-after-load 'view - '(progn - (define-key view-mode-map "l" 'recenter-top-bottom) - (define-key view-mode-map "a" 'ace-jump-mode))) - -;; http://irreal.org/blog/?p=1536 -(autoload 'zap-up-to-char "misc" - "Kill up to, but not including ARGth occurrence of CHAR.") -(global-set-key (kbd "M-z") 'zap-up-to-char) - (require-package 'key-chord) (key-chord-mode 1) |