branch: externals/phps-mode
commit c5b38cde25422e4ddabd8345e58e6c82accd305a
Merge: 9e24e2121d 03c89be14f
Author: Christian Johansson <christ...@cvj.se>
Commit: Christian Johansson <christ...@cvj.se>
Merge branch 'master' into feature/php-8.4
---
.gitignore | 3 +++
admin/phps-mode-automation.el | 2 +-
phps-mode-ast.el | 2 +-
phps-mode-automation-grammar.el | 4 ++--
phps-mode-automation-parser-generator.el | 2 +-
phps-mode-cache.el | 2 +-
phps-mode-flymake.el | 2 +-
phps-mode-indent.el | 2 +-
phps-mode-lex-analyzer.el | 2 +-
phps-mode-lexer-generator.el | 6 +++---
phps-mode-lexer.el | 2 +-
phps-mode-macros.el | 2 +-
phps-mode-parser-sdt.el | 2 +-
phps-mode-parser.el | 2 +-
phps-mode-serial.el | 6 ++++--
phps-mode-syntax-color-generator.el | 2 +-
phps-mode-syntax-color.el | 2 +-
phps-mode-syntax-table.el | 2 +-
phps-mode-test.el | 2 +-
phps-mode.el | 6 +++---
test/phps-mode-test-ast.el | 2 +-
test/phps-mode-test-cache.el | 2 +-
test/phps-mode-test-indent.el | 2 +-
test/phps-mode-test-integration.el | 2 +-
test/phps-mode-test-lex-analyzer.el | 2 +-
test/phps-mode-test-lexer.el | 2 +-
test/phps-mode-test-parser.el | 2 +-
test/phps-mode-test-syntax-table.el | 2 +-
28 files changed, 38 insertions(+), 33 deletions(-)
diff --git a/.gitignore b/.gitignore
index 034d56c76d..f2ccac532d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
*.elc
admin/zend_language_parser.y
+output.txt
+zend_*
+*.el~
\ No newline at end of file
diff --git a/admin/phps-mode-automation.el b/admin/phps-mode-automation.el
index 767080e56e..c303191c7d 100644
--- a/admin/phps-mode-automation.el
+++ b/admin/phps-mode-automation.el
@@ -1,6 +1,6 @@
;;; phps-mode-automation --- Generate a parser file -*- lexical-binding: t -*-
-;; Copyright (C) 2018-2024 Free Software Foundation, Inc.
+;; Copyright (C) 2018-2025 Free Software Foundation, Inc.
;;; Commentary:
diff --git a/phps-mode-ast.el b/phps-mode-ast.el
index cc218bd7f3..c7b89fa816 100644
--- a/phps-mode-ast.el
+++ b/phps-mode-ast.el
@@ -1,6 +1,6 @@
;;; phps-mode-ast.el --- Abstract Syntax Tree functions -*- lexical-binding: t
-*-
-;; Copyright (C) 2018-2024 Free Software Foundation, Inc.
+;; Copyright (C) 2018-2025 Free Software Foundation, Inc.
;;; Commentary:
diff --git a/phps-mode-automation-grammar.el b/phps-mode-automation-grammar.el
index bedf847ee6..274353d145 100644
--- a/phps-mode-automation-grammar.el
+++ b/phps-mode-automation-grammar.el
@@ -1,6 +1,6 @@
;;; phps-mode-automation-grammar --- Grammar -*- lexical-binding: t -*-
-;; Copyright (C) 2018-2024 Free Software Foundation, Inc.
+;; Copyright (C) 2018-2025 Free Software Foundation, Inc.
;;; Commentary:
@@ -28,7 +28,7 @@
(defvar
phps-mode-automation-grammar--copyright
- ";; Copyright (C) 2018-2024 Free Software Foundation, Inc.\n\n;; This file
is not part of GNU Emacs.\n\n\n"
+ ";; Copyright (C) 2018-2025 Free Software Foundation, Inc.\n\n;; This file
is not part of GNU Emacs.\n\n\n"
"Copyright contents for parser.")
(defvar
diff --git a/phps-mode-automation-parser-generator.el
b/phps-mode-automation-parser-generator.el
index e8e8892ffb..8beeb4d8a2 100644
--- a/phps-mode-automation-parser-generator.el
+++ b/phps-mode-automation-parser-generator.el
@@ -1,6 +1,6 @@
;;; phps-mode-automation-parser-generator --- Generate a parser for PHP YACC
grammar -*- lexical-binding: t -*-
-;; Copyright (C) 2018-2024 Free Software Foundation, Inc.
+;; Copyright (C) 2018-2025 Free Software Foundation, Inc.
;;; Commentary:
diff --git a/phps-mode-cache.el b/phps-mode-cache.el
index 4782ccc313..c67802824e 100644
--- a/phps-mode-cache.el
+++ b/phps-mode-cache.el
@@ -1,6 +1,6 @@
;;; phps-mode-cache.el -- Cache for phps-mode -*- lexical-binding: t -*-
-;; Copyright (C) 2018-2024 Free Software Foundation, Inc.
+;; Copyright (C) 2018-2025 Free Software Foundation, Inc.
;;; Commentary:
diff --git a/phps-mode-flymake.el b/phps-mode-flymake.el
index 01c8770a2d..4a84f5d7c2 100644
--- a/phps-mode-flymake.el
+++ b/phps-mode-flymake.el
@@ -1,6 +1,6 @@
;;; phps-mode-flymake.el --- Flymake support for PHPs -*- lexical-binding: t
-*-
-;; Copyright (C) 2018-2024 Free Software Foundation, Inc.
+;; Copyright (C) 2018-2025 Free Software Foundation, Inc.
;;; Commentary:
diff --git a/phps-mode-indent.el b/phps-mode-indent.el
index 44e1153f18..a0786c0549 100644
--- a/phps-mode-indent.el
+++ b/phps-mode-indent.el
@@ -1,6 +1,6 @@
;;; phps-mode-indent.el -- Indentation for phps-mode -*- lexical-binding: t -*-
-;; Copyright (C) 2018-2024 Free Software Foundation, Inc.
+;; Copyright (C) 2018-2025 Free Software Foundation, Inc.
diff --git a/phps-mode-lex-analyzer.el b/phps-mode-lex-analyzer.el
index e774502300..95ad137bcc 100644
--- a/phps-mode-lex-analyzer.el
+++ b/phps-mode-lex-analyzer.el
@@ -1,6 +1,6 @@
;;; phps-mode-lex-analyzer.el -- Lex analyzer for PHPs -*- lexical-binding: t
-*-
-;; Copyright (C) 2018-2024 Free Software Foundation, Inc.
+;; Copyright (C) 2018-2025 Free Software Foundation, Inc.
;;; Commentary:
diff --git a/phps-mode-lexer-generator.el b/phps-mode-lexer-generator.el
index fb7a39541e..f654f15c6e 100644
--- a/phps-mode-lexer-generator.el
+++ b/phps-mode-lexer-generator.el
@@ -1,6 +1,6 @@
;;; phps-mode-lexer-generator.el -- Generate lexer rules for lexer -*-
lexical-binding: t -*-
-;; Copyright (C) 2018-2024 Free Software Foundation, Inc.
+;; Copyright (C) 2018-2025 Free Software Foundation, Inc.
;;; Commentary:
@@ -117,8 +117,8 @@
"Any character. The Zend equivalent is [^] but is not possible in Emacs
Lisp.")
(defconst phps-mode-lexer--newline
- "[\n\r]"
- "Newline characters. The Zend equivalent is (\"\r\"|\"\n\"|\"\r\n\").")
+ "\\(\r\\|\n\\|\r\n\\)"
+ "Newline characters. ")
(defvar phps-mode-lexer-generator--table nil)
diff --git a/phps-mode-lexer.el b/phps-mode-lexer.el
index c11e9f8ce9..7fe415946d 100644
--- a/phps-mode-lexer.el
+++ b/phps-mode-lexer.el
@@ -1,6 +1,6 @@
;;; phps-mode-lexer.el -- Lexer for PHPs -*- lexical-binding: t -*-
-;; Copyright (C) 2018-2024 Free Software Foundation, Inc.
+;; Copyright (C) 2018-2025 Free Software Foundation, Inc.
;;; Commentary:
diff --git a/phps-mode-macros.el b/phps-mode-macros.el
index be1c408f2f..5b5f363ead 100644
--- a/phps-mode-macros.el
+++ b/phps-mode-macros.el
@@ -1,6 +1,6 @@
;;; phps-mode-macros.el --- Macros for major mode -*- lexical-binding: t -*-
-;; Copyright (C) 2018-2024 Free Software Foundation, Inc.
+;; Copyright (C) 2018-2025 Free Software Foundation, Inc.
;;; Commentary:
diff --git a/phps-mode-parser-sdt.el b/phps-mode-parser-sdt.el
index aee7621480..f51d0dc39d 100644
--- a/phps-mode-parser-sdt.el
+++ b/phps-mode-parser-sdt.el
@@ -1,6 +1,6 @@
;;; phps-mode-parser-sdt.el --- Syntax directed translation for grammar -*-
lexical-binding: t -*-
-;; Copyright (C) 2018-2024 Free Software Foundation, Inc.
+;; Copyright (C) 2018-2025 Free Software Foundation, Inc.
;;; Commentary:
diff --git a/phps-mode-parser.el b/phps-mode-parser.el
index 8c28514343..2536f3deec 100644
--- a/phps-mode-parser.el
+++ b/phps-mode-parser.el
@@ -1,6 +1,6 @@
;;; phps-mode-parser.el --- Exported Emacs Parser Generator -*-
lexical-binding: t -*-
-;; Copyright (C) 2018-2024 Free Software Foundation, Inc.
+;; Copyright (C) 2018-2025 Free Software Foundation, Inc.
;; This file is not part of GNU Emacs.
diff --git a/phps-mode-serial.el b/phps-mode-serial.el
index d421100f08..993ad72cb5 100644
--- a/phps-mode-serial.el
+++ b/phps-mode-serial.el
@@ -1,6 +1,6 @@
;;; phps-mode-serial.el --- Functions for serial commands with varied
synchronicity -*- lexical-binding: t -*-
-;; Copyright (C) 2018-2024 Free Software Foundation, Inc.
+;; Copyright (C) 2018-2025 Free Software Foundation, Inc.
;;; Commentary:
@@ -194,6 +194,7 @@ for synchronicity."
(lambda()
(let ((quitted t)
+ (inhibit-quit t)
(start-return))
(unwind-protect
(progn
@@ -243,7 +244,8 @@ for synchronicity."
(make-thread
(lambda()
- (let ((quitted t))
+ (let ((quitted t)
+ (inhibit-quit t))
(unwind-protect
(let ((start-return (thread-join async-thread))
(end-return))
diff --git a/phps-mode-syntax-color-generator.el
b/phps-mode-syntax-color-generator.el
index 5b5735f007..263cc7e8fa 100644
--- a/phps-mode-syntax-color-generator.el
+++ b/phps-mode-syntax-color-generator.el
@@ -1,6 +1,6 @@
;;; phps-mode-syntax-color-generator.el --- Data generation for syntax color
-*- lexical-binding: t -*-
-;; Copyright (C) 2018-2024 Free Software Foundation, Inc.
+;; Copyright (C) 2018-2025 Free Software Foundation, Inc.
;;; Commentary:
diff --git a/phps-mode-syntax-color.el b/phps-mode-syntax-color.el
index 8c1ef0dcc9..f8267f1c10 100644
--- a/phps-mode-syntax-color.el
+++ b/phps-mode-syntax-color.el
@@ -1,6 +1,6 @@
;;; phps-mode-syntax-color.el --- Syntax coloring for major mode -*-
lexical-binding: t -*-
-;; Copyright (C) 2018-2024 Free Software Foundation, Inc.
+;; Copyright (C) 2018-2025 Free Software Foundation, Inc.
;;; Commentary:
diff --git a/phps-mode-syntax-table.el b/phps-mode-syntax-table.el
index 2f13732b6e..a03eb697e0 100644
--- a/phps-mode-syntax-table.el
+++ b/phps-mode-syntax-table.el
@@ -1,6 +1,6 @@
;;; phps-mode-syntax-table.el --- Syntax table for PHPs -*- lexical-binding: t
-*-
-;; Copyright (C) 2018-2024 Free Software Foundation, Inc.
+;; Copyright (C) 2018-2025 Free Software Foundation, Inc.
;; This file is not part of GNU Emacs.
diff --git a/phps-mode-test.el b/phps-mode-test.el
index 15b3b95337..611ab8675a 100644
--- a/phps-mode-test.el
+++ b/phps-mode-test.el
@@ -1,6 +1,6 @@
;;; phps-mode-test.el --- Commons for tests -*- lexical-binding: t -*-
-;; Copyright (C) 2018-2024 Free Software Foundation, Inc.
+;; Copyright (C) 2018-2025 Free Software Foundation, Inc.
;;; Commentary:
diff --git a/phps-mode.el b/phps-mode.el
index 7d972a7b4f..397e8d10a4 100644
--- a/phps-mode.el
+++ b/phps-mode.el
@@ -1,12 +1,12 @@
;;; phps-mode.el --- Major mode for PHP with code intelligence -*-
lexical-binding: t -*-
-;; Copyright (C) 2018-2024 Free Software Foundation, Inc.
+;; Copyright (C) 2018-2025 Free Software Foundation, Inc.
;; Author: Christian Johansson <christ...@cvj.se>
;; Maintainer: Christian Johansson <christ...@cvj.se>
;; Created: 3 Mar 2018
-;; Modified: 24 Apr 2024
-;; Version: 0.4.49
+;; Modified: 3 Mar 2025
+;; Version: 0.4.50
;; Keywords: tools, convenience
;; URL: https://github.com/cjohansson/emacs-phps-mode
diff --git a/test/phps-mode-test-ast.el b/test/phps-mode-test-ast.el
index a011f9ac92..a95c12c677 100644
--- a/test/phps-mode-test-ast.el
+++ b/test/phps-mode-test-ast.el
@@ -1,6 +1,6 @@
;;; phps-mode-test-ast.el --- Tests for AST -*- lexical-binding: t -*-
-;; Copyright (C) 2018-2024 Free Software Foundation, Inc.
+;; Copyright (C) 2018-2025 Free Software Foundation, Inc.
;;; Commentary:
diff --git a/test/phps-mode-test-cache.el b/test/phps-mode-test-cache.el
index 3c91220d5a..ec7109ef7d 100644
--- a/test/phps-mode-test-cache.el
+++ b/test/phps-mode-test-cache.el
@@ -1,6 +1,6 @@
;;; phps-mode-test-cache.el --- Tests for cache -*- lexical-binding: t -*-
-;; Copyright (C) 2018-2024 Free Software Foundation, Inc.
+;; Copyright (C) 2018-2025 Free Software Foundation, Inc.
;;; Commentary:
diff --git a/test/phps-mode-test-indent.el b/test/phps-mode-test-indent.el
index 9c9a87b7f1..493bf47693 100644
--- a/test/phps-mode-test-indent.el
+++ b/test/phps-mode-test-indent.el
@@ -1,6 +1,6 @@
;;; phps-mode-test-indent.el --- Tests for indentation -*- lexical-binding: t
-*-
-;; Copyright (C) 2018-2024 Free Software Foundation, Inc.
+;; Copyright (C) 2018-2025 Free Software Foundation, Inc.
;;; Commentary:
diff --git a/test/phps-mode-test-integration.el
b/test/phps-mode-test-integration.el
index 804ee01e6b..9c2170167f 100644
--- a/test/phps-mode-test-integration.el
+++ b/test/phps-mode-test-integration.el
@@ -1,6 +1,6 @@
;;; phps-mode-test-integration.el --- Tests for integration -*-
lexical-binding: t -*-
-;; Copyright (C) 2018-2024 Free Software Foundation, Inc.
+;; Copyright (C) 2018-2025 Free Software Foundation, Inc.
;;; Commentary:
diff --git a/test/phps-mode-test-lex-analyzer.el
b/test/phps-mode-test-lex-analyzer.el
index 3fe40ceb88..928bf8cf5d 100644
--- a/test/phps-mode-test-lex-analyzer.el
+++ b/test/phps-mode-test-lex-analyzer.el
@@ -1,6 +1,6 @@
;;; phps-mode-test-lex-analyzer.el --- Tests for lex-analyzer -*-
lexical-binding: t -*-
-;; Copyright (C) 2018-2024 Free Software Foundation, Inc.
+;; Copyright (C) 2018-2025 Free Software Foundation, Inc.
;;; Commentary:
diff --git a/test/phps-mode-test-lexer.el b/test/phps-mode-test-lexer.el
index ff2c0d176f..f5a8ff756d 100644
--- a/test/phps-mode-test-lexer.el
+++ b/test/phps-mode-test-lexer.el
@@ -1,6 +1,6 @@
;;; phps-mode-test-lexer.el --- Tests for lexer -*- lexical-binding: t -*-
-;; Copyright (C) 2018-2024 Free Software Foundation, Inc.
+;; Copyright (C) 2018-2025 Free Software Foundation, Inc.
;;; Commentary:
diff --git a/test/phps-mode-test-parser.el b/test/phps-mode-test-parser.el
index c440c7442a..8144e1637b 100644
--- a/test/phps-mode-test-parser.el
+++ b/test/phps-mode-test-parser.el
@@ -1,6 +1,6 @@
;;; phps-mode-test-parser.el --- Tests for parser -*- lexical-binding: t -*-
-;; Copyright (C) 2018-2024 Free Software Foundation, Inc.
+;; Copyright (C) 2018-2025 Free Software Foundation, Inc.
;;; Commentary:
diff --git a/test/phps-mode-test-syntax-table.el
b/test/phps-mode-test-syntax-table.el
index 1ac550879b..0e1de9202d 100644
--- a/test/phps-mode-test-syntax-table.el
+++ b/test/phps-mode-test-syntax-table.el
@@ -1,6 +1,6 @@
;;; phps-mode-test-syntax-table.el --- Tests for syntax-table -*-
lexical-binding: t -*-
-;; Copyright (C) 2018-2024 Free Software Foundation, Inc.
+;; Copyright (C) 2018-2025 Free Software Foundation, Inc.
;;; Commentary:
