diff options
| -rw-r--r-- | lisp/init-git.el | 20 | ||||
| -rw-r--r-- | lisp/init-go-mode.el | 6 | ||||
| -rw-r--r-- | lisp/init-ibuffer.el | 16 | ||||
| -rw-r--r-- | lisp/init-javascript.el | 7 | ||||
| -rw-r--r-- | lisp/init-yaml-mode.el | 3 |
5 files changed, 25 insertions, 27 deletions
diff --git a/lisp/init-git.el b/lisp/init-git.el index eee2168..1c58f82 100644 --- a/lisp/init-git.el +++ b/lisp/init-git.el @@ -59,6 +59,14 @@ (use-package grep :ensure nil ;; package is bundled with emacs + :bind (:map grep-mode-map + ;; make C-o and o behave as in dired + ("o" . grep-visit-buffer-other-window) + ("C-o" . grep-visit-buffer-other-window-noselect) + ;; n and p changes line as in ag-mode + ("n" . compilation-next-error) + ("p" . compilation-previous-error)) + :config (defun grep-visit-buffer-other-window (&optional event noselect) "Visit grep result in another window." @@ -76,16 +84,6 @@ (add-hook 'grep-mode-hook (lambda () ;; wrap lines - (setq truncate-lines nil) - ;; make C-o and o behave as in dired - (define-key grep-mode-map (kbd "C-o") - 'grep-visit-buffer-other-window-noselect) - (define-key grep-mode-map (kbd "o") - 'grep-visit-buffer-other-window) - ;; n and p changes line as in ag-mode - (define-key grep-mode-map (kbd "n") - 'compilation-next-error) - (define-key grep-mode-map (kbd "p") - 'compilation-previous-error)))) + (setq-local truncate-lines nil)))) (provide 'init-git) diff --git a/lisp/init-go-mode.el b/lisp/init-go-mode.el index 1b9a67e..7544879 100644 --- a/lisp/init-go-mode.el +++ b/lisp/init-go-mode.el @@ -4,6 +4,10 @@ (when (executable-find "goimports") (setq gofmt-command "goimports")) + :bind (:map go-mode-map + ;; C-c p runs gofmt on the buffer + ("C-c p" . gofmt)) + :config ;; run gofmt before saving file (add-hook 'before-save-hook 'gofmt-before-save) @@ -40,8 +44,6 @@ items follow a style that is consistent with other prog-modes." (when (and (featurep 'company) (featurep 'company-go)) (setq-local company-backends '(company-go)) (company-mode 1)) - ;; C-c p runs gofmt on the buffer - (define-key go-mode-map (kbd "C-c p") 'gofmt) ;; adjust fill-column (setq-local fill-column 120) ;; use flat imenu index diff --git a/lisp/init-ibuffer.el b/lisp/init-ibuffer.el index 2f194a4..fc29fd6 100644 --- a/lisp/init-ibuffer.el +++ b/lisp/init-ibuffer.el @@ -1,4 +1,6 @@ (use-package ibuffer + :ensure nil ;; package is bundled with emacs + :init ;; disable confirmation for killing unmodified buffers (setq ibuffer-expert t) @@ -10,19 +12,19 @@ (setq ibuffer-show-empty-filter-groups nil) ;; use ibuffer - :bind ("C-x C-b" . ibuffer-other-window) + + :bind (("C-x C-b" . ibuffer-other-window) + :map ibuffer-mode-map + ;; make C-o and o behave as in dired + ("o" . ibuffer-visit-buffer-other-window) + ("C-o" . ibuffer-visit-buffer-other-window-noselect)) :config ;; keep buffer list up to date and group ibuffer by repository root (add-hook 'ibuffer-hook (lambda () (ibuffer-auto-mode 1) - (ibuffer-vc-set-filter-groups-by-vc-root) - ;; make C-o and o behave as in dired - (define-key ibuffer-mode-map (kbd "o") - 'ibuffer-visit-buffer-other-window) - (define-key ibuffer-mode-map (kbd "C-o") - 'ibuffer-visit-buffer-other-window-noselect)))) + (ibuffer-vc-set-filter-groups-by-vc-root)))) (use-package ibuffer-vc) diff --git a/lisp/init-javascript.el b/lisp/init-javascript.el index 401a5d9..0571c85 100644 --- a/lisp/init-javascript.el +++ b/lisp/init-javascript.el @@ -9,10 +9,9 @@ ;; use js-mode for json and jshint ("\\.\\(json\\|jshintrc\\)\\'" . js-mode) - :config - (add-hook 'js-mode-hook - (lambda () - (define-key js-mode-map (kbd "C-c p") 'jq-reformat)))) + :bind (:map js-mode-map + ;; C-c p runs formats json with jq + ("C-c p" . jq-reformat))) ;; use jq for reformatting json (defun jq-reformat-region (begin end) diff --git a/lisp/init-yaml-mode.el b/lisp/init-yaml-mode.el index 4168179..4f5d88e 100644 --- a/lisp/init-yaml-mode.el +++ b/lisp/init-yaml-mode.el @@ -4,9 +4,6 @@ ("/\\(group\\|host\\)_vars/" . yaml-mode) :config - ;; don't override C-j - (define-key yaml-mode-map (kbd "C-j") nil) - ;; disable electric indent (add-hook 'yaml-mode-hook (lambda () (setq-local electric-indent-mode nil)))) |