From 00f5f52bdd584ae8d38cd9a783be53c995a0c768 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 23 Dec 2016 19:40:59 +0100 Subject: [PATCH] Emacs: Use native Helm option instead of helm-fuzzy-find --- .emacs.d/init.el | 6 ------ .emacs.d/lisp/tool-helm.el | 5 +---- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 9769b281..3e2b82eb 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -159,7 +159,6 @@ To view where the bindings are set in your config files, lookup (add-to-list 'package-selected-packages 'helm) (add-to-list 'package-selected-packages 'helm-descbinds) -(add-to-list 'package-selected-packages 'helm-fuzzy-find) (add-to-list 'package-selected-packages 'helm-ls-git) ;; (add-to-list 'package-selected-packages 'helm-pt) ; No need? (add-to-list 'package-selected-packages 'wgrep-helm) @@ -173,11 +172,6 @@ To view where the bindings are set in your config files, lookup (when (require 'powerline nil t) (powerline-default-theme)) -;; fzf and helm-fuzzy-find are in direct competition. -;; helm-fuzzy-find has better integration, but does not print anything -;; initially. -(require 'fzf nil t) - (add-to-list 'package-selected-packages 'company) (add-to-list 'package-selected-packages 'helm-company) (when (require 'company nil t) diff --git a/.emacs.d/lisp/tool-helm.el b/.emacs.d/lisp/tool-helm.el index 25ca4105..8d149694 100644 --- a/.emacs.d/lisp/tool-helm.el +++ b/.emacs.d/lisp/tool-helm.el @@ -10,6 +10,7 @@ (add-to-list 'helm-sources-using-default-as-input 'helm-source-man-pages) ;; (setq helm-split-window-default-side 'right) (setq helm-reuse-last-window-split-state t) +(setq helm-findutils-search-full-path t) (setq helm-apropos-fuzzy-match t) (setq helm-buffers-fuzzy-matching t) @@ -42,9 +43,6 @@ Requires `call-process-to-string' from `functions'." (define-key mickey-minor-mode-map (kbd "M-x") 'helm-M-x) (define-key mickey-minor-mode-map (kbd "C-x M-f") 'helm-semantic-or-imenu) -(define-key mickey-minor-mode-map (kbd "C-x C-/") 'helm-find) -(when (require 'helm-fuzzy-find nil t) - (define-key mickey-minor-mode-map (kbd "C-c C-/") 'helm-fuzzy-find)) (define-key mickey-minor-mode-map (kbd "C-x C-f") 'helm-find-files) (define-key mickey-minor-mode-map (kbd "C-x C-d") 'helm-browse-project) (define-key mickey-minor-mode-map (kbd "C-x b") 'helm-buffers-list) @@ -69,7 +67,6 @@ Requires `call-process-to-string' from `functions'." (set-face-attribute 'helm-buffer-directory nil :background 'unspecified :foreground "#1e90ff" :weight 'bold) (set-face-attribute 'helm-ff-directory nil :background 'unspecified :foreground 'unspecified :weight 'unspecified :inherit 'helm-buffer-directory) (set-face-attribute 'helm-ff-file nil :background 'unspecified :foreground 'unspecified :weight 'unspecified :inherit 'helm-buffer-file) -;; Helm color for unsaved buffers? Dim special *buffers*? (setq helm-source-names-using-follow '("Occur" "Git-Grep" "PT"))