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

Apply Stefan Monnier's patch (2) #739

Merged
merged 3 commits into from
Apr 10, 2023
Merged

Apply Stefan Monnier's patch (2) #739

merged 3 commits into from
Apr 10, 2023

Conversation

zonuexe
Copy link
Member

@zonuexe zonuexe commented Apr 10, 2023

continuation of #737

@zonuexe
Copy link
Member Author

zonuexe commented Apr 10, 2023

I tried applying the hunk below, but it doesn't seem to work as he intended.

From eafd0478fe41bbc6211a42e8759a584caa436448 Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 10 Apr 2023 21:14:00 +0900
Subject: [PATCH] Use `c-lang-const t` for c-lang-defconst

---
 lisp/php-mode.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/php-mode.el b/lisp/php-mode.el
index df090088..1877a2cf 100644
--- a/lisp/php-mode.el
+++ b/lisp/php-mode.el
@@ -588,11 +588,11 @@ might be to handle switch and goto labels differently."
 
 (c-lang-defconst c-basic-matchers-before
   php (cl-remove-if (lambda (elm) (and (listp elm) (equal (car elm) "\\s|")))
-                    (c-lang-const c-basic-matchers-before php)))
+                    (c-lang-const c-basic-matchers-before t)))
 
 (c-lang-defconst c-basic-matchers-after
   php (cl-remove-if (lambda (elm) (and (listp elm) (memq 'c-annotation-face elm)))
-                    (c-lang-const c-basic-matchers-after php)))
+                    (c-lang-const c-basic-matchers-after t)))
 
 (defconst php-mode--re-return-typed-closure
   (eval-when-compile

@zonuexe zonuexe merged commit e515cc9 into master Apr 10, 2023
@zonuexe zonuexe deleted the apply-monnier-patch branch April 10, 2023 12:46
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