Date: Mon, 28 Oct 2019 00:15:51 +0000 (UTC) From: Koichiro Iwao <meta@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r515840 - in head/lang/php-mode.el: . files Message-ID: <201910280015.x9S0FpI1050143@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: meta Date: Mon Oct 28 00:15:51 2019 New Revision: 515840 URL: https://svnweb.freebsd.org/changeset/ports/515840 Log: lang/php-mode.el: backport from upstream to fix error with recent snapshot of Emacs PR: 241189 Submitted by: Yasuhiro KIMURA <yasu@utahime.org> (maintainer) Obtained from: https://github.com/emacs-php/php-mode/pull/580 Added: head/lang/php-mode.el/files/patch-75d3ee1ead7557175e6aeb2ad8efdd73ee3c9332 (contents, props changed) Modified: head/lang/php-mode.el/Makefile Modified: head/lang/php-mode.el/Makefile ============================================================================== --- head/lang/php-mode.el/Makefile Sun Oct 27 23:07:45 2019 (r515839) +++ head/lang/php-mode.el/Makefile Mon Oct 28 00:15:51 2019 (r515840) @@ -4,6 +4,7 @@ PORTNAME= php-mode.el PORTVERSION= 1.22.0 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= lang elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} @@ -11,10 +12,6 @@ MAINTAINER= yasu@utahime.org COMMENT= PHP mode for GNU Emacs LICENSE= GPLv3 - -.if ${FLAVOR:U} == devel_full || ${FLAVOR:U} == devel_nox -BROKEN= php.el:232:10:Error: Symbol's function definition is void: rx-form -.endif USES= emacs gmake USE_GITHUB= yes Added: head/lang/php-mode.el/files/patch-75d3ee1ead7557175e6aeb2ad8efdd73ee3c9332 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/php-mode.el/files/patch-75d3ee1ead7557175e6aeb2ad8efdd73ee3c9332 Mon Oct 28 00:15:51 2019 (r515840) @@ -0,0 +1,61 @@ +From 75d3ee1ead7557175e6aeb2ad8efdd73ee3c9332 Mon Sep 17 00:00:00 2001 +From: Charlie McMackin <charliemac@gmail.com> +Date: Sun, 29 Sep 2019 11:52:54 -0500 +Subject: [PATCH] Replace rx-form with rx-to-string + +`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. +--- + php.el | 36 ++++++++++++++++++------------------ + 1 file changed, 18 insertions(+), 18 deletions(-) + +diff --git php.el php.el +index 64286da..ea36fc3 100644 +--- php.el ++++ php.el +@@ -177,24 +177,24 @@ keywords that can appear in method signatures, e.g. 'final' and + which will be the name of the method." + (when (stringp visibility) + (setq visibility (list visibility))) +- (rx-form `(: line-start +- (* (syntax whitespace)) +- ,@(if visibility +- `((* (or "abstract" "final" "static") +- (+ (syntax whitespace))) +- (or ,@visibility) +- (+ (syntax whitespace)) +- (* (or "abstract" "final" "static") +- (+ (syntax whitespace)))) +- '((* (* (or "abstract" "final" "static" +- "private" "protected" "public") +- (+ (syntax whitespace)))))) +- "function" +- (+ (syntax whitespace)) +- (? "&" (* (syntax whitespace))) +- (group (+ (or (syntax word) (syntax symbol)))) +- (* (syntax whitespace)) +- "("))) ++ (rx-to-string `(: line-start ++ (* (syntax whitespace)) ++ ,@(if visibility ++ `((* (or "abstract" "final" "static") ++ (+ (syntax whitespace))) ++ (or ,@visibility) ++ (+ (syntax whitespace)) ++ (* (or "abstract" "final" "static") ++ (+ (syntax whitespace)))) ++ '((* (* (or "abstract" "final" "static" ++ "private" "protected" "public") ++ (+ (syntax whitespace)))))) ++ "function" ++ (+ (syntax whitespace)) ++ (? "&" (* (syntax whitespace))) ++ (group (+ (or (syntax word) (syntax symbol)))) ++ (* (syntax whitespace)) ++ "("))) + + (defun php-create-regexp-for-classlike (type) + "Accepts a `TYPE' of a 'classlike' object as a string, such as +-- +2.23.0 +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910280015.x9S0FpI1050143>