Various prompt fixes #1816

basil-conto · Nov 22, 2018

Please review each commit in turn.


      Mention recent ivy-read prompt change in manual

doc/ivy.org:
Update ivy-read prompt description after recent change[1] re: #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


      Fix ivy--quote-format-string usage

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: #1350


      counsel.el (counsel-prompt-function-dir): Simplify


      Mark counsel-prompt-function-default as obsolete

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.


      counsel.el (counsel--async-filter): Simplify


      counsel.el (counsel--M-x-prompt): Simplify


      ivy.el (ivy-previous-line): Simplify


      ivy.el (ivy-prompt): Improve compatibility warning

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.el: Simplify and document prompt propertizing

(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.el (ivy-cleanup-string): Clarify docstring


      ivy.el (ivy--minibuffer-setup): Simplify


      ivy.el: (ivy--remove-props): New convenience defun

(ivy-read, ivy-completion-in-region, ivy-cleanup-string): Use it.


      ivy.el (ivy-completion-in-region): Simplify


      ivy.el: Clean up ivy-completion-in-region prompt

(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.


      counsel.el: Prefer declare form to make-obsolete

(counsel-expression-history, counsel-shell-command-history):
Use declare form instead of make-obsolete.

abo-abo · Nov 24, 2018

Thanks!

basil-conto added 14 commits Nov 22, 2018

counsel.el (counsel-prompt-function-dir): Simplify

Verified

This commit was signed with a verified signature.

basil-conto Basil L. Contovounesios

GPG key ID: 205AB54A5D5D8CFF Learn about signing commits

548eeaf

counsel.el (counsel--async-filter): Simplify

Verified

This commit was signed with a verified signature.

basil-conto Basil L. Contovounesios

GPG key ID: 205AB54A5D5D8CFF Learn about signing commits

141db77

counsel.el (counsel--M-x-prompt): Simplify

Verified

This commit was signed with a verified signature.

basil-conto Basil L. Contovounesios

GPG key ID: 205AB54A5D5D8CFF Learn about signing commits

509a2b1

ivy.el (ivy-previous-line): Simplify

Verified

This commit was signed with a verified signature.

basil-conto Basil L. Contovounesios

GPG key ID: 205AB54A5D5D8CFF Learn about signing commits

259cb96

ivy.el (ivy-cleanup-string): Clarify docstring

Verified

This commit was signed with a verified signature.

basil-conto Basil L. Contovounesios

GPG key ID: 205AB54A5D5D8CFF Learn about signing commits

15132b7

ivy.el (ivy--minibuffer-setup): Simplify

Verified

This commit was signed with a verified signature.

basil-conto Basil L. Contovounesios

GPG key ID: 205AB54A5D5D8CFF Learn about signing commits

2c31355

ivy.el: (ivy--remove-props): New convenience defun
(ivy-read, ivy-completion-in-region, ivy-cleanup-string): Use it.

Verified

This commit was signed with a verified signature.

basil-conto Basil L. Contovounesios

GPG key ID: 205AB54A5D5D8CFF Learn about signing commits

10165c4

ivy.el (ivy-completion-in-region): Simplify

Verified

This commit was signed with a verified signature.

basil-conto Basil L. Contovounesios

GPG key ID: 205AB54A5D5D8CFF Learn about signing commits

Loading status checks…

3ec2dec

basil-conto changed the title ~~Fix prompt quoting~~ Various prompt fixes Nov 22, 2018

basil-conto referenced this pull request Nov 22, 2018

ivy-read: prompt interpreted as format-string #1350

Closed

abo-abo merged commit 8da6e51 into abo-abo:master Nov 24, 2018
1 of 2 checks passed

1 of 2 checks passed

continuous-integration/travis-ci/push The Travis CI build is in progress
Details

continuous-integration/travis-ci/pr The Travis CI build passed
Details

basil-conto deleted the basil-conto:blc/prompt branch Nov 24, 2018

abo-abo/swiper

Various prompt fixes #1816

Various prompt fixes #1816

basil-conto commented Nov 22, 2018

basil-conto changed the title Fix prompt quoting Various prompt fixes Nov 22, 2018

abo-abo merged commit `8da6e51` into abo-abo:master Nov 24, 2018
1 of 2 checks passed

1 of 2 checks passed

This comment has been minimized.

abo-abo commented Nov 24, 2018

basil-conto deleted the basil-conto:blc/prompt branch Nov 24, 2018

Sponsor abo-abo/swiper

abo-abo/swiper

Join GitHub today

Various prompt fixes #1816

Conversation

basil-conto commented Nov 22, 2018

basil-conto changed the title Fix prompt quoting Various prompt fixes Nov 22, 2018

Hide details View details abo-abo merged commit 8da6e51 into abo-abo:master Nov 24, 2018 1 of 2 checks passed

1 of 2 checks passed

This comment has been minimized.

abo-abo commented Nov 24, 2018

basil-conto deleted the basil-conto:blc/prompt branch Nov 24, 2018

abo-abo merged commit `8da6e51` into abo-abo:master Nov 24, 2018
1 of 2 checks passed