[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/ivy 19d8694 3/3: Merge branch 'master' into externals/i
From: |
Basil L. Contovounesios |
Subject: |
[elpa] externals/ivy 19d8694 3/3: Merge branch 'master' into externals/ivy |
Date: |
Mon, 3 May 2021 08:19:58 -0400 (EDT) |
branch: externals/ivy
commit 19d86949437ab2bccbd6571ce29bfd7b5e38d9c0
Merge: 027a449 4ffee1c
Author: Basil L. Contovounesios <contovob@tcd.ie>
Commit: Basil L. Contovounesios <contovob@tcd.ie>
Merge branch 'master' into externals/ivy
---
doc/Makefile | 2 +-
doc/ivy.org | 10 +++----
doc/ivy.texi | 90 +++++++++++++++++++++++++++++-----------------------------
doc/scripts.el | 1 +
4 files changed, 52 insertions(+), 51 deletions(-)
diff --git a/doc/Makefile b/doc/Makefile
index 3b0f4a6..1d6964a 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,6 +1,6 @@
INFO_INSTALL_DIR="${HOME}/git/gnu-elpa/packages/ivy"
-ivy.texi: ivy.org
+ivy.texi: ivy.org ivy-ox.el scripts.el
emacs -batch -l ivy-ox.el -l scripts.el --eval "(org-to-texi
\"ivy.org\")"
ivy.info: ivy.texi
diff --git a/doc/ivy.org b/doc/ivy.org
index d8b2d20..bd4e14e 100644
--- a/doc/ivy.org
+++ b/doc/ivy.org
@@ -380,8 +380,8 @@ extends usability of lists in Emacs.
(should
(equal (ivy-with
'(progn
- (ivy-read "Test: " '("can do" "can't, sorry" "other"))
- ivy-text)
+ (ivy-read "Test: " '("can do" "can't, sorry" "other"))
+ ivy-text)
"c <tab>")
"can"))
#+end_src
@@ -540,7 +540,7 @@ Hydra menu offers these additional bindings:
Toggle calling the action after each candidate change. It
modifies ~j~ to ~jg~, ~k~ to ~kg~ etc.
-- ~m~ (=ivy-rotate-preferred-builders=) ::
+- ~M~ (=ivy-rotate-preferred-builders=) ::
Rotate the current regexp matcher.
- ~>~ (=ivy-minibuffer-grow=) ::
@@ -1376,8 +1376,8 @@ displayed strings.
(ivy-read "Find symbols: "
#'find-candidates-function
:action (lambda (x)
- (message "Value: %s" (get-text-property 0 'property x)
- ))))
+ (message "Value: %s"
+ (get-text-property 0 'property x)))))
#+END_SRC
Here are the interesting features of the above function:
diff --git a/doc/ivy.texi b/doc/ivy.texi
index dc697a6..9d068bf 100644
--- a/doc/ivy.texi
+++ b/doc/ivy.texi
@@ -486,11 +486,11 @@ Example ERT test:
@lisp
(should
(equal (ivy-with
- '(progn
- (ivy-read "Test: " '("can do" "can't, sorry" "other"))
- ivy-text)
- "c <tab>")
- "can"))
+ '(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})
@@ -711,9 +711,9 @@ Hydra menu offers these additional bindings:
Toggle calling the action after each candidate change. It
modifies @kbd{j} to @kbd{jg}, @kbd{k} to @kbd{kg} etc.
@end indentedblock
-@subsubheading @kbd{m} (@code{ivy-rotate-preferred-builders})
+@subsubheading @kbd{M} (@code{ivy-rotate-preferred-builders})
@vindex ivy-rotate-preferred-builders
-@kindex m
+@kindex M
@indentedblock
Rotate the current regexp matcher.
@end indentedblock
@@ -872,7 +872,7 @@ completion:
@lisp
(setq ivy-re-builders-alist
'((read-file-name-internal . ivy--regex-fuzzy)
- (t . ivy--regex-plus)))
+ (t . ivy--regex-plus)))
@end lisp
Here, @code{read-file-name-internal} is a function that is passed as the
@@ -1241,10 +1241,10 @@ Use the command name as the key:
(defun my-command-with-3-actions ()
(interactive)
(ivy-read "test: " '("foo" "bar" "baz")
- :action '(1
- ("o" my-action-1 "action 1")
- ("j" my-action-2 "action 2")
- ("k" my-action-3 "action 3"))))
+ :action '(1
+ ("o" my-action-1 "action 1")
+ ("j" my-action-2 "action 2")
+ ("k" my-action-3 "action 3"))))
@end lisp
The number 1 above is the index of the default action. Each
@@ -1644,20 +1644,20 @@ later use yourself. However, it's recommended that you
use the
"Forward to `describe-function'."
(interactive)
(ivy-read "Describe function: "
- (let (cands)
- (mapatoms
- (lambda (x)
- (when (fboundp x)
- (push (symbol-name x) cands))))
- cands)
- :keymap counsel-describe-map
- :preselect (ivy-thing-at-point)
- :history 'counsel-describe-symbol-history
- :require-match t
- :action (lambda (x)
- (describe-function
- (intern x)))
- :caller 'counsel-describe-function))
+ (let (cands)
+ (mapatoms
+ (lambda (x)
+ (when (fboundp x)
+ (push (symbol-name x) cands))))
+ cands)
+ :keymap counsel-describe-map
+ :preselect (ivy-thing-at-point)
+ :history 'counsel-describe-symbol-history
+ :require-match t
+ :action (lambda (x)
+ (describe-function
+ (intern x)))
+ :caller 'counsel-describe-function))
@end lisp
Here are the interesting features of the above function, in the order that
they appear:
@@ -1721,9 +1721,9 @@ narrowing) or select a candidate from the visible
collection.
(progn
(counsel--async-command
(format "locate %s '%s'"
- (mapconcat #'identity counsel-locate-options " ")
- (counsel--elisp-to-pcre
- (ivy--regex str))))
+ (mapconcat #'identity counsel-locate-options " ")
+ (counsel--elisp-to-pcre
+ (ivy--regex str))))
'("" "working..."))))
;;;###autoload
@@ -1732,15 +1732,15 @@ narrowing) or select a candidate from the visible
collection.
INITIAL-INPUT can be given as the initial minibuffer input."
(interactive)
(ivy-read "Locate: " #'counsel-locate-function
- :initial-input initial-input
- :dynamic-collection t
- :history 'counsel-locate-history
- :action (lambda (file)
- (with-ivy-window
- (when file
- (find-file file))))
- :unwind #'counsel-delete-process
- :caller 'counsel-locate))
+ :initial-input initial-input
+ :dynamic-collection t
+ :history 'counsel-locate-history
+ :action (lambda (file)
+ (with-ivy-window
+ (when file
+ (find-file file))))
+ :unwind #'counsel-delete-process
+ :caller 'counsel-locate))
@end lisp
Here are the interesting features of the above functions, in the order
@@ -1789,18 +1789,18 @@ displayed strings.
@lisp
(defun find-candidates-function (str pred _)
(let ((props '(1 2))
- (strs '("foo" "foo2")))
+ (strs '("foo" "foo2")))
(cl-mapcar (lambda (s p) (propertize s 'property p))
- strs
- props)))
+ strs
+ props)))
(defun find-candidates ()
(interactive)
(ivy-read "Find symbols: "
- #'find-candidates-function
- :action (lambda (x)
- (message "Value: %s" (get-text-property 0 'property x)
- ))))
+ #'find-candidates-function
+ :action (lambda (x)
+ (message "Value: %s"
+ (get-text-property 0 'property x)))))
@end lisp
Here are the interesting features of the above function:
diff --git a/doc/scripts.el b/doc/scripts.el
index 23bf461..00f85a6 100644
--- a/doc/scripts.el
+++ b/doc/scripts.el
@@ -2,4 +2,5 @@
(setq org-confirm-babel-evaluate nil)
(defun org-to-texi (fname)
(find-file fname)
+ (setq-default indent-tabs-mode nil)
(org-texinfo-export-to-texinfo))