From 013919ff7563c430d2555c05208c960e5ef28b79 Mon Sep 17 00:00:00 2001 From: toctan Date: Thu, 4 Sep 2014 22:36:13 +0800 Subject: [PATCH 1/4] Do not mess up with Ido's option in helm module --- modules/prelude-helm.el | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/prelude-helm.el b/modules/prelude-helm.el index 92797f0..6b67966 100644 --- a/modules/prelude-helm.el +++ b/modules/prelude-helm.el @@ -69,7 +69,6 @@ helm-ff-file-name-history-use-recentf t helm-move-to-line-cycle-in-source t ; move to end or beginning of source ; when reaching top or bottom of source. - ido-use-virtual-buffers t ; Needed in helm-buffers-list helm-buffers-fuzzy-matching t ; fuzzy matching buffer names when non-nil ; useful in helm-mini that lists buffers ) From 8f028ffb89e0b06ae8144ad8826bdac5167cbd10 Mon Sep 17 00:00:00 2001 From: toctan Date: Thu, 4 Sep 2014 22:39:40 +0800 Subject: [PATCH 2/4] Remove unnecessary helm configuration code There options are already the default. --- modules/prelude-helm.el | 6 ------ 1 file changed, 6 deletions(-) diff --git a/modules/prelude-helm.el b/modules/prelude-helm.el index 6b67966..cc9fc14 100644 --- a/modules/prelude-helm.el +++ b/modules/prelude-helm.el @@ -57,15 +57,12 @@ helm-google-suggest-use-curl-p t helm-scroll-amount 4 ; scroll 4 lines other window using M-/M- helm-quick-update t ; do not display invisible candidates - helm-idle-delay 0.01 ; be idle for this many seconds, before updating in delayed sources. - helm-input-idle-delay 0.01 ; be idle for this many seconds, before updating candidate buffer helm-ff-search-library-in-sexp t ; search for library in `require' and `declare-function' sexp. helm-split-window-default-side 'other ;; open helm buffer in another window helm-split-window-in-side-p t ;; open helm buffer inside current window, not occupy whole other window helm-buffers-favorite-modes (append helm-buffers-favorite-modes '(picture-mode artist-mode)) helm-candidate-number-limit 500 ; limit the number of displayed canidates - helm-M-x-requires-pattern 0 ; show all candidates when set to 0 helm-ff-file-name-history-use-recentf t helm-move-to-line-cycle-in-source t ; move to end or beginning of source ; when reaching top or bottom of source. @@ -79,9 +76,6 @@ (global-set-key (kbd "C-c h x") 'helm-register) (global-set-key (kbd "C-c h SPC") 'helm-all-mark-rings) -;;; Save current position to mark ring -(add-hook 'helm-goto-line-before-hook 'helm-save-current-pos-to-mark-ring) - ;; PACKAGE: helm-projectile (require 'helm-projectile) (push "Press to navigate a project in Helm." prelude-tips) From 0f1f82fc8655e8b669ac716a13e99490dc982936 Mon Sep 17 00:00:00 2001 From: toctan Date: Thu, 4 Sep 2014 22:42:05 +0800 Subject: [PATCH 3/4] Check if curl is available --- modules/prelude-helm.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/prelude-helm.el b/modules/prelude-helm.el index cc9fc14..1645bd9 100644 --- a/modules/prelude-helm.el +++ b/modules/prelude-helm.el @@ -53,8 +53,10 @@ (define-key helm-grep-mode-map (kbd "n") 'helm-grep-mode-jump-other-window-forward) (define-key helm-grep-mode-map (kbd "p") 'helm-grep-mode-jump-other-window-backward) +(when (executable-find "curl") + (setq helm-google-suggest-use-curl-p t)) + (setq - helm-google-suggest-use-curl-p t helm-scroll-amount 4 ; scroll 4 lines other window using M-/M- helm-quick-update t ; do not display invisible candidates helm-ff-search-library-in-sexp t ; search for library in `require' and `declare-function' sexp. From 343ea5bc7457be7e59a3d395d01b4b7d1aaa66dd Mon Sep 17 00:00:00 2001 From: toctan Date: Thu, 4 Sep 2014 22:44:56 +0800 Subject: [PATCH 4/4] Typo & Code style --- modules/prelude-helm.el | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/prelude-helm.el b/modules/prelude-helm.el index 1645bd9..dc5fe8c 100644 --- a/modules/prelude-helm.el +++ b/modules/prelude-helm.el @@ -11,7 +11,7 @@ ;;; Commentary: -;; Some config for Helm that follows thiks guide: http://tuhdo.github.io/helm-intro.html +;; Some config for Helm that follows this guide: http://tuhdo.github.io/helm-intro.html ;;; License: @@ -36,9 +36,9 @@ (require 'helm) -;; must set before helm-config, otherwise helm use default +;; must set before helm-config, otherwise helm use default ;; prefix "C-x c", which is inconvenient because you can -;; accidentially pressed "C-x C-c" +;; accidentally pressed "C-x C-c" (setq helm-command-prefix-key "C-c h") (require 'helm-config) @@ -47,11 +47,11 @@ (define-key helm-map (kbd "") 'helm-execute-persistent-action) ; rebihnd tab to do persistent action (define-key helm-map (kbd "C-i") 'helm-execute-persistent-action) ; make TAB works in terminal -(define-key helm-map (kbd "C-z") 'helm-select-action) ; list actions using C-z +(define-key helm-map (kbd "C-z") 'helm-select-action) ; list actions using C-z -(define-key helm-grep-mode-map (kbd "") 'helm-grep-mode-jump-other-window) -(define-key helm-grep-mode-map (kbd "n") 'helm-grep-mode-jump-other-window-forward) -(define-key helm-grep-mode-map (kbd "p") 'helm-grep-mode-jump-other-window-backward) +(define-key helm-grep-mode-map (kbd "") 'helm-grep-mode-jump-other-window) +(define-key helm-grep-mode-map (kbd "n") 'helm-grep-mode-jump-other-window-forward) +(define-key helm-grep-mode-map (kbd "p") 'helm-grep-mode-jump-other-window-backward) (when (executable-find "curl") (setq helm-google-suggest-use-curl-p t)) @@ -64,7 +64,7 @@ helm-split-window-in-side-p t ;; open helm buffer inside current window, not occupy whole other window helm-buffers-favorite-modes (append helm-buffers-favorite-modes '(picture-mode artist-mode)) - helm-candidate-number-limit 500 ; limit the number of displayed canidates + helm-candidate-number-limit 500 ; limit the number of displayed candidates helm-ff-file-name-history-use-recentf t helm-move-to-line-cycle-in-source t ; move to end or beginning of source ; when reaching top or bottom of source.