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

Use compatibility shim for add-face-text-property #1635

Merged
merged 1 commit into from Jun 19, 2018

Conversation

basil-conto
Copy link
Collaborator

@basil-conto basil-conto commented Jun 18, 2018

  • ivy.el (ivy--add-face): Minor simplification.
    (ivy-add-face-text-property): Expand arglist to that of add-face-text-property, but with the order of the last two args flipped. Move compatibility check from runtime to evaluation time. Use font-lock-prepend-text-property instead of font-lock-append-text-property when applicable.
    (ivy-append-face): Replace font-lock-append-text-property with ivy-add-face-text-property.
    (ivy-display-style):
  • doc/ivy.org (Installation, Defcustoms): Mention Emacs 24.4 instead of 24.5.
  • counsel.el (counsel-git-grep-transformer):
  • ivy-overlay.el (ivy-display-function-overlay): Replace add-face-text-property with ivy-add-face-text-property.

Re: #1634

Before merging this PR I would like to make sure that the docstring and implementation of ivy--add-face are clear and correct w.r.t. the discussion in #1634.

ivy.el (ivy--add-face): Minor simplification.
(ivy-add-face-text-property): Expand arglist to that of
add-face-text-property, but with the order of the last two args
flipped.  Move compatibility check from runtime to evaluation time.
Use font-lock-prepend-text-property instead of
font-lock-append-text-property when applicable.
(ivy-append-face): Replace font-lock-append-text-property with
ivy-add-face-text-property.
(ivy-display-style):
doc/ivy.org (Installation, Defcustoms):
Mention Emacs 24.4 instead of 24.5.
counsel.el (counsel-git-grep-transformer):
ivy-overlay.el (ivy-display-function-overlay):
Replace add-face-text-property with ivy-add-face-text-property.

Re: abo-abo#1634
@abo-abo abo-abo merged commit b8c5190 into abo-abo:master Jun 19, 2018
1 of 2 checks passed
@abo-abo
Copy link
Owner

@abo-abo abo-abo commented Jun 19, 2018

Thanks.

@abo-abo
Copy link
Owner

@abo-abo abo-abo commented Jun 19, 2018

Before merging this PR I would like to make sure that the docstring and implementation of ivy--add-face are clear and correct

Looks good to me. Removing the extra description would have also been fine.

@basil-conto basil-conto deleted the blc/add-face branch Jun 19, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants