branch: master commit d40bdab4aa185676db5d2898b463f21fb6c6f8c4 Author: Oleh Krehel <ohwoeo...@gmail.com> Commit: Oleh Krehel <ohwoeo...@gmail.com>
doc/ivy.org: Fix typo --- doc/ivy.org | 2 +- doc/ivy.texi | 88 +++++++++++++++++++++++++++++----------------------------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/doc/ivy.org b/doc/ivy.org index af9afd5..d74ff5c 100644 --- a/doc/ivy.org +++ b/doc/ivy.org @@ -89,7 +89,7 @@ discoverability. - Minimalism :: Uncluttered minibuffer is minimalism. Ivy shows the completion defaults, the number of matches, and 10 candidate matches below - the input line. Customize =ivy-length= to adjust the number of + the input line. Customize =ivy-height= to adjust the number of candidate matches displayed in the minibuffer. - Simplicity :: diff --git a/doc/ivy.texi b/doc/ivy.texi index 6f15469..c88257b 100644 --- a/doc/ivy.texi +++ b/doc/ivy.texi @@ -89,8 +89,8 @@ Key bindings Minibuffer key bindings * Key bindings for navigation:: -* Key bindings for single selection, action, then exit minibuffer: Key bindings for single selection action then exit minibuffer. -* Key bindings for multiple selections and actions, keep minibuffer open: Key bindings for multiple selections and actions keep minibuffer open. +* Key bindings for single selection, action, then exit minibuffer: Key bindings for single selection action then exit minibuffer. +* Key bindings for multiple selections and actions, keep minibuffer open: Key bindings for multiple selections and actions keep minibuffer open. * Key bindings that alter the minibuffer input:: * Other key bindings:: * Hydra in the minibuffer:: @@ -154,7 +154,7 @@ discoverability. @indentedblock Uncluttered minibuffer is minimalism. Ivy shows the completion defaults, the number of matches, and 10 candidate matches below -the input line. Customize @code{ivy-length} to adjust the number of +the input line. Customize @code{ivy-height} to adjust the number of candidate matches displayed in the minibuffer. @end indentedblock @subsubheading Simplicity @@ -250,22 +250,22 @@ Contribute to Ivy's development; send patches; pull requests First clone the Swiper repository with: @example -cd ~/git && git clone https://github.com/abo-abo/swiper -cd swiper && make compile + cd ~/git && git clone https://github.com/abo-abo/swiper + cd swiper && make compile @end example Second, add these lines to the Emacs init file: @lisp -(add-to-list 'load-path "~/git/swiper/") -(require 'ivy) + (add-to-list 'load-path "~/git/swiper/") + (require 'ivy) @end lisp Then, update the code with: @example -git pull -make + git pull + make @end example @end indentedblock @@ -318,24 +318,24 @@ The recommended key bindings are: @subsubheading Ivy-based interface to standard commands @indentedblock @lisp -(global-set-key (kbd "C-s") 'swiper) -(global-set-key (kbd "M-x") 'counsel-M-x) -(global-set-key (kbd "C-x C-f") 'counsel-find-file) -(global-set-key (kbd "<f1> f") 'counsel-describe-function) -(global-set-key (kbd "<f1> v") 'counsel-describe-variable) -(global-set-key (kbd "<f1> l") 'counsel-load-library) -(global-set-key (kbd "<f2> i") 'counsel-info-lookup-symbol) -(global-set-key (kbd "<f2> u") 'counsel-unicode-char) + (global-set-key (kbd "C-s") 'swiper) + (global-set-key (kbd "M-x") 'counsel-M-x) + (global-set-key (kbd "C-x C-f") 'counsel-find-file) + (global-set-key (kbd "<f1> f") 'counsel-describe-function) + (global-set-key (kbd "<f1> v") 'counsel-describe-variable) + (global-set-key (kbd "<f1> l") 'counsel-load-library) + (global-set-key (kbd "<f2> i") 'counsel-info-lookup-symbol) + (global-set-key (kbd "<f2> u") 'counsel-unicode-char) @end lisp @end indentedblock @subsubheading Ivy-based interface to shell and system tools @indentedblock @lisp -(global-set-key (kbd "C-c g") 'counsel-git) -(global-set-key (kbd "C-c j") 'counsel-git-grep) -(global-set-key (kbd "C-c k") 'counsel-ag) -(global-set-key (kbd "C-x l") 'counsel-locate) -(global-set-key (kbd "C-S-o") 'counsel-rhythmbox) + (global-set-key (kbd "C-c g") 'counsel-git) + (global-set-key (kbd "C-c j") 'counsel-git-grep) + (global-set-key (kbd "C-c k") 'counsel-ag) + (global-set-key (kbd "C-x l") 'counsel-locate) + (global-set-key (kbd "C-S-o") 'counsel-rhythmbox) @end lisp @end indentedblock @subsubheading Ivy-resume and other commands @@ -343,7 +343,7 @@ The recommended key bindings are: @code{ivy-resume} resumes the last Ivy-based completion. @lisp -(global-set-key (kbd "C-c C-r") 'ivy-resume) + (global-set-key (kbd "C-c C-r") 'ivy-resume) @end lisp @end indentedblock @@ -364,8 +364,8 @@ where the familiar @kbd{C-a}, @kbd{C-f}, @kbd{M-d}, @kbd{M-DEL}, @kbd{M-b}, @kbd @kbd{C-y} key bindings work the same as in @code{fundamental-mode}. @menu * Key bindings for navigation:: -* Key bindings for single selection, action, then exit minibuffer: Key bindings for single selection action then exit minibuffer. -* Key bindings for multiple selections and actions, keep minibuffer open: Key bindings for multiple selections and actions keep minibuffer open. +* Key bindings for single selection, action, then exit minibuffer: Key bindings for single selection action then exit minibuffer. +* Key bindings for multiple selections and actions, keep minibuffer open: Key bindings for multiple selections and actions keep minibuffer open. * Key bindings that alter the minibuffer input:: * Other key bindings:: * Hydra in the minibuffer:: @@ -451,13 +451,13 @@ possible. @kbd{TAB TAB} is the same as @kbd{C-j} (@code{ivy-alt-done}). Example ERT test: @lisp -(should - (equal (ivy-with - '(progn - (ivy-read "Test: " '("can do" "can't, sorry" "other")) - ivy-text) - "c <tab>") - "can")) + (should + (equal (ivy-with + '(progn + (ivy-read "Test: " '("can do" "can't, sorry" "other")) + ivy-text) + "c <tab>") + "can")) @end lisp @end indentedblock @subsubheading @kbd{C-M-j} (@code{ivy-immediate-done}) @@ -952,7 +952,7 @@ The confirmation prompt will use this face. For example: @lisp -(setq confirm-nonexistent-file-or-buffer t) + (setq confirm-nonexistent-file-or-buffer t) @end lisp Then call @code{find-file}, enter "eldorado" and press @kbd{RET} - the @@ -993,7 +993,7 @@ Virtual buffers correspond to bookmarks and recent files list, Enable virtual buffers with: @lisp -(setq ivy-use-virtual-buffers t) + (setq ivy-use-virtual-buffers t) @end lisp @end indentedblock @@ -1010,13 +1010,13 @@ padded integer value. To disable showing the number of candidates: @lisp -(setq ivy-count-format "") + (setq ivy-count-format "") @end lisp To also display the current candidate: @lisp -(setq ivy-count-format "(%d/%d) ") + (setq ivy-count-format "(%d/%d) ") @end lisp The @code{format}-style switches this variable uses are described @@ -1068,9 +1068,9 @@ which the completion started, use the @code{with-ivy-window} wrapper macro. @lisp -(defun ivy-insert-action (x) - (with-ivy-window - (insert x))) + (defun ivy-insert-action (x) + (with-ivy-window + (insert x))) @end lisp @end indentedblock @@ -1222,7 +1222,7 @@ headings with similar names to appreciate @code{ivy-mode}. Magit requries this setting for ivy completion: @lisp -(setq magit-completing-read-function 'ivy-completing-read) + (setq magit-completing-read-function 'ivy-completing-read) @end lisp @end indentedblock @subsubheading @code{find-file-in-project} @@ -1234,7 +1234,7 @@ It uses ivy by default if Ivy is installed. Projectile requires this seeting for ivy completion: @lisp -(setq projectile-completion-system 'ivy) + (setq projectile-completion-system 'ivy) @end lisp @end indentedblock @subsubheading @code{helm-make} @@ -1242,7 +1242,7 @@ Projectile requires this seeting for ivy completion: Helm-make requires this seeting for ivy completion. @lisp -(setq helm-make-completion-method 'ivy) + (setq helm-make-completion-method 'ivy) @end lisp @end indentedblock @@ -1341,7 +1341,7 @@ When non-nil, add @code{recentf-mode} and bookmarks to Adding this to Emacs init file: @lisp -(setq ivy-use-virtual-buffers t) + (setq ivy-use-virtual-buffers t) @end lisp will add additional virual buffers to the buffers list for recent files. Selecting such virtual buffers, which are highlighted with @@ -1667,4 +1667,4 @@ we want to kill the running process created by @printindex ky -@bye \ No newline at end of file +@bye