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

Replace uses of rx-form #580

Merged
merged 2 commits into from
Sep 30, 2019
Merged

Conversation

cmack
Copy link
Contributor

@cmack cmack commented Sep 29, 2019

Upcoming versions of emacs have rewritten rx and it appears rx-form is no longer available (emacs-mirror/emacs@2ed7122)

This PR will replace the two uses of rx-form

  1. php-create-regexp-for-method's use is replaced with rx-to-string which works for supported Emacs before and after the commit referenced above.

  2. Use abbreviate-file-name instead of the manual regex substitution. I'm not sure if I'm missing an edge case, but it appears this captures the same purpose rx-form was being used.

Tests pass except for php-mode-test-issue-186 but master also fails this test.

`rx-form` is being removed in an upcoming version of Emacs and its rewrite of
`rx`. Replacing it with `rx-to-string` is backwards and future compatible.
@zonuexe zonuexe merged commit 5ba2a16 into emacs-php:master Sep 30, 2019
@zonuexe
Copy link
Member

zonuexe commented Sep 30, 2019

@cmack Thank you!

uqs pushed a commit to freebsd/freebsd-ports that referenced this pull request Oct 28, 2019
…pshot of Emacs

PR:		241189
Submitted by:	Yasuhiro KIMURA <yasu@utahime.org> (maintainer)
Obtained from:	emacs-php/php-mode#580


git-svn-id: svn+ssh://svn.freebsd.org/ports/head@515840 35697150-7ecd-e111-bb59-0022644237b5
uqs pushed a commit to freebsd/freebsd-ports that referenced this pull request Oct 28, 2019
…pshot of Emacs

PR:		241189
Submitted by:	Yasuhiro KIMURA <yasu@utahime.org> (maintainer)
Obtained from:	emacs-php/php-mode#580
Jehops pushed a commit to Jehops/freebsd-ports-legacy that referenced this pull request Oct 28, 2019
…pshot of Emacs

PR:		241189
Submitted by:	Yasuhiro KIMURA <yasu@utahime.org> (maintainer)
Obtained from:	emacs-php/php-mode#580


git-svn-id: svn+ssh://svn.freebsd.org/ports/head@515840 35697150-7ecd-e111-bb59-0022644237b5
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.

2 participants