X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;ds=sidebyside;f=emacs.d%2Fconfig.org;h=690bbe655e33caaa182f6753a6bfd32e4386355e;hb=6536132c3d7943e7d0c79263144f487a4a05d4d8;hp=1ef2c2fa046080239c324c40f01282b28a0d4c25;hpb=9c7736edc78553c98856850be44a2f0db393cae7;p=dotfiles.git diff --git a/emacs.d/config.org b/emacs.d/config.org index 1ef2c2f..690bbe6 100644 --- a/emacs.d/config.org +++ b/emacs.d/config.org @@ -781,39 +781,6 @@ Some global bindings on =Super=, on Mac, it is =Command= #+END_SRC ** Search Replace and highlight -*** Occur -Occur search key bindings -#+BEGIN_SRC emacs-lisp :tangle yes :results silent - (add-hook 'occur-hook (lambda () - (switch-to-buffer-other-window "*Occur*") - (define-key occur-mode-map (kbd "C-o") nil))) - ;; auto select occur window - - (define-key occur-mode-map (kbd "C-n") - (lambda () - (interactive) - (occur-next) - (occur-mode-goto-occurrence-other-window) - (recenter) - (other-window 1))) - - (define-key occur-mode-map (kbd "C-p") - (lambda () - (interactive) - (occur-prev) - (occur-mode-goto-occurrence-other-window) - (recenter) - (other-window 1))) - - (use-package color-moccur - :ensure t - :commands (isearch-moccur isearch-all) - :init - (setq isearch-lazy-highlight t) - :config - (use-package moccur-edit)) -#+END_SRC - *** swiper #+BEGIN_SRC emacs-lisp :tangle yes :results silent (use-package swiper @@ -2345,8 +2312,7 @@ Use =Avy= for motion (use-package avy :ensure t :config - (avy-setup-default) - ) + (avy-setup-default)) (global-set-key (kbd "C-M-j") 'avy-goto-line-below) (global-set-key (kbd "C-M-n") 'avy-goto-line-below) @@ -2403,6 +2369,38 @@ Use =Avy= for motion ;; (setq-default indicate-empty-lines t) #+END_SRC +*** Occur +Occur search key bindings +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + (defun sd/occur-keys () + "My key bindings in occur-mode" + (interactive) + (switch-to-buffer-other-window "*Occur*") + (define-key occur-mode-map (kbd "C-o") nil) + (define-key occur-mode-map (kbd "C-n") (lambda () + (interactive) + (occur-next) + (occur-mode-goto-occurrence-other-window) + (recenter) + (other-window 1))) + (define-key occur-mode-map (kbd "C-p") (lambda () + (interactive) + (occur-prev) + (occur-mode-goto-occurrence-other-window) + (recenter) + (other-window 1)))) + + (add-hook 'occur-hook #'sd/occur-keys) + + (use-package color-moccur + :ensure t + :commands (isearch-moccur isearch-all) + :init + (setq isearch-lazy-highlight t) + :config + (use-package moccur-edit)) +#+END_SRC + * test #+BEGIN_SRC ditaa :file temp/hello-world.png :cmdline -r +--------------+