Merge branch 'master' of github.com:bbatsov/prelude
This commit is contained in:
commit
4236acd5b5
1 changed files with 1 additions and 6 deletions
|
@ -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)
|
||||||
|
|
Loading…
Reference in a new issue