Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various prompt fixes #1816

merged 15 commits into from Nov 24, 2018

Various prompt fixes #1816

merged 15 commits into from Nov 24, 2018


Copy link

@basil-conto basil-conto commented Nov 22, 2018

Please review each commit in turn.

Re: #1350

basil-conto added 14 commits Nov 22, 2018
Update ivy-read prompt description after recent change[1] re: abo-abo#1350.
doc/ivy.texi: Regenerate.

[1]: ivy.el (ivy-read): prompt argument is no longer a format string
  2018-11-22 09:39:35 +0100 6fe1a93
Don't ivy--quote-format-string prompt now that it is no longer
interpreted as a format string[1].

[1]: ivy.el (ivy-read): prompt argument is no longer a format string
  2018-11-22 09:39:35 +0100 6fe1a93

Re: abo-abo#1350
It duplicates the standard convention of ending user input prompts
with a colon and space, and requires that its caller not add them,
which is inconsistent with standard ivy-read usage.

(counsel-prompt-function-default): Simplify and mark as obsolete.
(counsel-prompt-function-dir): Handle the standard scenario where
ivy-state-prompt already ends in a colon and space.
(counsel-git, counsel-git-grep, counsel-ag): Replace
counsel-prompt-function-default with explicit colon and space.
Narrow error condition to wrong-number-of-arguments.  Specify
'ivy instead of default 'emacs custom group in warning message and
mention caller associated with offending prompt function.
(ivy-set-prompt-text-properties-function): Extend docstring.
(ivy-set-prompt-text-properties-default): Ditto and simplify.
(ivy--set-match-props): Remove unneeded function.
(ivy-read, ivy-completion-in-region, ivy-cleanup-string): Use it.
(ivy-completion-in-region-prompt): New function.
(ivy-completion-in-region): Use it as prompt function instead of
overriding user-configurable ivy--prompts-list.  Do not override
user option ivy-count-format.
@basil-conto basil-conto changed the title Fix prompt quoting Various prompt fixes Nov 22, 2018
(counsel-expression-history, counsel-shell-command-history):
Use declare form instead of make-obsolete.
@abo-abo abo-abo merged commit 8da6e51 into abo-abo:master Nov 24, 2018
1 of 2 checks passed
Copy link

@abo-abo abo-abo commented Nov 24, 2018


@basil-conto basil-conto deleted the blc/prompt branch Nov 24, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
None yet
None yet

Successfully merging this pull request may close these issues.

None yet

2 participants