Merge pull request #871 from dgtized/core-isearch-occur

isearch-occur is included in emacs core upstream
This commit is contained in:
Bozhidar Batsov 2015-07-06 11:20:14 +03:00
commit ef115319f7

View file

@ -89,12 +89,7 @@
(global-set-key [remap kill-whole-line] 'prelude-kill-whole-line) (global-set-key [remap kill-whole-line] 'prelude-kill-whole-line)
;; Activate occur easily inside isearch ;; Activate occur easily inside isearch
(define-key isearch-mode-map (kbd "C-o") (define-key isearch-mode-map (kbd "C-o") 'isearch-occur)
(lambda () (interactive)
(let ((case-fold-search isearch-case-fold-search))
(occur (if isearch-regexp
isearch-string
(regexp-quote isearch-string))))))
;; use hippie-expand instead of dabbrev ;; use hippie-expand instead of dabbrev
(global-set-key (kbd "M-/") 'hippie-expand) (global-set-key (kbd "M-/") 'hippie-expand)