Move helm and search key bindings

Key bindings should not be choosen given a package name, some helm
key bindings are under `SPC h` which are corrected the following way:

SPC h l for helm-resume to SPC r l (resume last completion)
SPC s l for last-search to SPC r s (resume search) (SPC s l is still
available)
SPC h L for helm-locate-library to SPC s L

Resolve #4592
This commit is contained in:
syl20bnr 2016-01-13 08:07:27 -05:00
parent 8c0a4452b0
commit 052e8dfc08
5 changed files with 22 additions and 16 deletions

View File

@ -18,6 +18,11 @@ This file containes the change log for the next major version of Spacemacs.
- ~SPC j h~ and ~SPC j l~ have been moved to ~SPC j 0~ and ~SPC j $~
respectively.
- ~SPC J~ to split a string or sexp has been moved to ~SPC j s~
- All helm related key bindings under ~SPC h~ that are not about help have
moved to different key bindings:
- ~SPC h b~ for =helm-filetered-bookmarks~is now ~SPC f b~
- ~SPC h l~ for =helm-resume= is now ~SPC r l~
- ~SPC h L~ for =helm-locate-library= is now ~SPC s L~
*** Hot new features
- Support for Ivy, add the =spacemacs-ivy= layer to your dotfile and
restart to replace =Helm= by =Ivy=.

View File

@ -1290,7 +1290,6 @@ Other help key bindings:
| ~SPC h SPC~ | discover Spacemacs documentation, layers and packages using =helm= |
| ~SPC h i~ | search in info pages with the symbol at point |
| ~SPC h k~ | show top-level bindings with =which-key= |
| ~SPC h L~ | go to library a implementation |
| ~SPC h m~ | search available man pages |
| ~SPC h n~ | browse emacs news |
@ -1952,13 +1951,14 @@ file with =ag=.
called =pt=.
**** Useful key bindings
| Key Binding | Description |
|-----------------+--------------------------------------------------------------------------|
| ~SPC h l~ | resume the last =helm= buffer |
| ~F3~ | in a =helm= buffer, convert a =helm= search buffer into a regular buffer |
| ~SPC s `~ | go back to the previous place reached with =helm-ag= |
| ~SPC s l~ | focus the last converted search buffer |
| Prefix argument | will ask for file extensions |
| Key Binding | Description |
|------------------------+--------------------------------------------------------------------------|
| ~F3~ | in a =helm= buffer, convert a =helm= search buffer into a regular buffer |
| ~SPC r l~ | resume the last =completion= buffer |
| ~SPC r s~ or ~SPC s l~ | resume search buffer (completion or converted search buffer) |
| ~SPC s `~ | go back to the previous place reached with =helm-ag= |
| ~SPC s L~ | search for library implementation |
| Prefix argument | will ask for file extensions |
**** Searching in current file
| Key Binding | Description |

View File

@ -22,7 +22,7 @@ Ensure that helm is required before calling FUNC."
(require 'helm)
(call-interactively ',func))
(spacemacs/set-leader-keys ,keys ',func-name))))
(spacemacs||set-helm-key "hL" helm-locate-library)
(spacemacs||set-helm-key "sl" helm-locate-library)
(spacemacs||set-helm-key "hdm" describe-mode)
;; search functions -----------------------------------------------------------
(spacemacs||set-helm-key "sww" helm-wikipedia-suggest)

View File

@ -140,7 +140,7 @@
collect (buffer-file-name buffer))))
(spacemacs//helm-do-grep-region-or-symbol buffers t)))
(defun spacemacs/last-search-buffer ()
(defun spacemacs/resume-last-completion-buffer ()
"open last helm-ag or hgrep buffer."
(interactive)
(cond ((get-buffer "*helm ag results*")
@ -176,14 +176,15 @@
"fb" 'helm-filtered-bookmarks
"hdF" 'spacemacs/helm-faces
"hi" 'helm-info-at-point
"hl" 'helm-resume
"hm" 'helm-man-woman
"iu" 'helm-ucs
"jI" 'helm-imenu-in-all-buffers
"ry" 'helm-show-kill-ring
"rr" 'helm-register
"rm" 'helm-all-mark-rings
"sl" 'spacemacs/last-search-buffer
"rl" 'helm-resume
"rr" 'helm-register
"rs" 'spacemacs/resume-last-completion-buffer
"ry" 'helm-show-kill-ring
"sl" 'spacemacs/resume-last-completion-buffer
"sj" 'spacemacs/jump-in-buffer)
;; search with grep

View File

@ -27,7 +27,7 @@
("fe" "emacs(spacemacs)")
("fv" "variables")
("g" "git/versions-control")
("h" "helm/help/highlight")
("h" "help")
("hd" "help-describe")
("i" "insertion")
("j" "jump/join/split")
@ -39,7 +39,7 @@
("p" "projects")
("p$" "projects/shell")
("q" "quit")
("r" "registers/rings")
("r" "registers/rings/resume")
("Re" "elisp")
("Rp" "pcre")
("s" "search/symbol")