From 22059e065fc5acc427f01f3b49f310823dccad9f Mon Sep 17 00:00:00 2001 From: USAMI Kenta Date: Mon, 24 Jul 2023 04:00:49 +0900 Subject: [PATCH 1/3] Add link to [disscussions-emacs29] [disscussions-emacs29]: https://github.com/emacs-php/php-mode/discussions/751 --- README.ja.md | 9 +++++++++ README.md | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/README.ja.md b/README.ja.md index b56a66a7..74bd68b3 100644 --- a/README.ja.md +++ b/README.ja.md @@ -11,10 +11,19 @@ A powerful and flexible Emacs major mode for editing PHP scripts +English   |   [日本語](README.ja.md) + [PHP ModeのGitHubプロジェクト][php-mode]にissueを作成してバグ報告や機能リクエストを送ってください。 +> **Note** +> [最新版][releases]のPHP ModeはEmacs 29をサポートしています. +> アップグレードに伴うトラブルは[Discussions][disscussions-emacs29]に気軽に書き込んでください。 + +[releases]: https://github.com/emacs-php/php-mode/releases +[disscussions-emacs29]: https://github.com/emacs-php/php-mode/discussions/751 + インストール ------------ diff --git a/README.md b/README.md index 829199d4..6f618693 100644 --- a/README.md +++ b/README.md @@ -11,10 +11,19 @@ A powerful and flexible Emacs major mode for editing PHP scripts +[English](README.md)   |   日本語 + Please submit any bug reports or feature requests by creating issues on [the GitHub page for PHP Mode][php-mode]. +> **Note** +> The [latest version][releases] of PHP Mode supports Emacs 29. +> Please feel free to [write to disucuss][disscussions-emacs29] if you have problems upgrading to Emacs 29. + +[releases]: https://github.com/emacs-php/php-mode/releases +[disscussions-emacs29]: https://github.com/emacs-php/php-mode/discussions/751 + Installation ------------ From 10509949d3c587771e2f91de2aec143e444adeb4 Mon Sep 17 00:00:00 2001 From: USAMI Kenta Date: Mon, 24 Jul 2023 04:02:00 +0900 Subject: [PATCH 2/3] Update CHANGELOG --- CHANGELOG.md | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 02e51eaa..5b6a0709 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,12 +2,36 @@ All notable changes of the PHP Mode 1.19.1 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles. -## Unreleased + + +## [1.25.0] - 2023-07-24 ### Added - * **Support Emacs 29.1** ([#750]) + * **Support Emacs 29.1** ([#743], [#750]) + +### Fixed + + * Fixed many byte compilation errors on Emacs 29 and 30 by multiple patches contributed by [Stefan Monnier] ([#737], [#739] and [#740], thanks Stefan!) + * Fixed PEAR method chaining wrong indentation ([#745] and [#746], thanks [@cweiske]!) + * Fixed `php-mode-debug-reinstall` command ([#747], [#748]) + +### Removed + * Drop Emacs 25 support ([#729], [736]) + +[Stefan Monnier]: https://www.iro.umontreal.ca/~monnier/ +[#729]: https://github.com/emacs-php/php-mode/pull/729 +[#736]: https://github.com/emacs-php/php-mode/pull/736 +[#737]: https://github.com/emacs-php/php-mode/pull/737 +[#739]: https://github.com/emacs-php/php-mode/pull/739 +[#740]: https://github.com/emacs-php/php-mode/pull/740 +[#741]: https://github.com/emacs-php/php-mode/pull/741 +[#743]: https://github.com/emacs-php/php-mode/pull/743 +[#745]: https://github.com/emacs-php/php-mode/pull/745 +[#746]: https://github.com/emacs-php/php-mode/pull/746 +[#747]: https://github.com/emacs-php/php-mode/pull/747 +[#748]: https://github.com/emacs-php/php-mode/pull/748 [#750]: https://github.com/emacs-php/php-mode/pull/750 ## [1.24.3] - 2023-03-19 From 28d0a0bc81a8481fd75e5a6477dda394fe04fef3 Mon Sep 17 00:00:00 2001 From: USAMI Kenta Date: Mon, 24 Jul 2023 04:04:26 +0900 Subject: [PATCH 3/3] Bump up version 1.25.0 --- Cask | 2 +- lisp/php-align.el | 2 +- lisp/php-complete.el | 2 +- lisp/php-defs.el | 2 +- lisp/php-face.el | 2 +- lisp/php-flymake.el | 2 +- lisp/php-ide-phpactor.el | 2 +- lisp/php-ide.el | 2 +- lisp/php-mode-debug.el | 2 +- lisp/php-mode.el | 4 ++-- lisp/php-project.el | 2 +- lisp/php.el | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Cask b/Cask index 21281db2..7b327b34 100644 --- a/Cask +++ b/Cask @@ -1,4 +1,4 @@ -(package "php-mode" "1.24.3" "Major mode for editing PHP code") +(package "php-mode" "1.25.0" "Major mode for editing PHP code") (source melpa) (source gnu) diff --git a/lisp/php-align.el b/lisp/php-align.el index bed85797..2615495f 100644 --- a/lisp/php-align.el +++ b/lisp/php-align.el @@ -7,7 +7,7 @@ ;; Maintainer: USAMI Kenta ;; Keywords: php languages convenience align ;; Homepage: https://github.com/emacs-php/php-mode -;; Version: 1.24.3 +;; Version: 1.25.0 ;; License: GPL-3.0-or-later ;; This program is free software; you can redistribute it and/or modify diff --git a/lisp/php-complete.el b/lisp/php-complete.el index 1decb6f8..605f4626 100644 --- a/lisp/php-complete.el +++ b/lisp/php-complete.el @@ -6,7 +6,7 @@ ;; Author: USAMI Kenta ;; Created: 18 Sep 2022 -;; Version: 1.24.3 +;; Version: 1.25.0 ;; Keywords: languages, php ;; This program is free software; you can redistribute it and/or modify diff --git a/lisp/php-defs.el b/lisp/php-defs.el index 7b402db0..810e26f1 100644 --- a/lisp/php-defs.el +++ b/lisp/php-defs.el @@ -4,7 +4,7 @@ ;; Author: USAMI Kenta ;; Created: 5 Mar 2022 -;; Version: 1.24.3 +;; Version: 1.25.0 ;; Keywords: languages, php ;; This program is free software; you can redistribute it and/or modify diff --git a/lisp/php-face.el b/lisp/php-face.el index 73f9f15c..1d80c702 100644 --- a/lisp/php-face.el +++ b/lisp/php-face.el @@ -4,7 +4,7 @@ ;; Author: USAMI Kenta ;; Created: 5 May 2019 -;; Version: 1.24.3 +;; Version: 1.25.0 ;; Keywords: faces, php ;; Homepage: https://github.com/emacs-php/php-mode ;; License: GPL-3.0-or-later diff --git a/lisp/php-flymake.el b/lisp/php-flymake.el index 28649dc3..54eef1e7 100644 --- a/lisp/php-flymake.el +++ b/lisp/php-flymake.el @@ -4,7 +4,7 @@ ;; Author: USAMI Kenta ;; Created: 5 Mar 2022 -;; Version: 1.24.3 +;; Version: 1.25.0 ;; Keywords: tools, languages, php ;; This program is free software; you can redistribute it and/or modify diff --git a/lisp/php-ide-phpactor.el b/lisp/php-ide-phpactor.el index 3f73c80e..ff9b8d78 100644 --- a/lisp/php-ide-phpactor.el +++ b/lisp/php-ide-phpactor.el @@ -5,7 +5,7 @@ ;; Author: USAMI Kenta ;; Keywords: tools, files ;; URL: https://github.com/emacs-php/php-mode -;; Version: 1.24.0 +;; Version: 1.25.0 ;; License: GPL-3.0-or-later ;; This program is free software; you can redistribute it and/or modify diff --git a/lisp/php-ide.el b/lisp/php-ide.el index 83d085a0..26c8fd7e 100644 --- a/lisp/php-ide.el +++ b/lisp/php-ide.el @@ -5,7 +5,7 @@ ;; Author: USAMI Kenta ;; Keywords: tools, files ;; URL: https://github.com/emacs-php/php-mode -;; Version: 1.24.0 +;; Version: 1.25.0 ;; License: GPL-3.0-or-later ;; This program is free software; you can redistribute it and/or modify diff --git a/lisp/php-mode-debug.el b/lisp/php-mode-debug.el index dcbea71f..45262531 100644 --- a/lisp/php-mode-debug.el +++ b/lisp/php-mode-debug.el @@ -5,7 +5,7 @@ ;; Author: USAMI Kenta ;; URL: https://github.com/emacs-php/php-mode ;; Keywords: maint -;; Version: 1.24.3 +;; Version: 1.25.0 ;; License: GPL-3.0-or-later ;; This program is free software; you can redistribute it and/or modify diff --git a/lisp/php-mode.el b/lisp/php-mode.el index 9911d4e4..dda4c892 100644 --- a/lisp/php-mode.el +++ b/lisp/php-mode.el @@ -9,13 +9,13 @@ ;; Maintainer: USAMI Kenta ;; URL: https://github.com/emacs-php/php-mode ;; Keywords: languages php -;; Version: 1.24.3 +;; Version: 1.25.0 ;; Package-Requires: ((emacs "26.1")) ;; License: GPL-3.0-or-later (eval-and-compile (make-obsolete-variable - (defconst php-mode-version-number "1.24.3" "PHP Mode version number.") + (defconst php-mode-version-number "1.25.0" "PHP Mode version number.") "Please call (php-mode-version :as-number t) for compatibility." "1.24.2")) ;; This program is free software; you can redistribute it and/or modify diff --git a/lisp/php-project.el b/lisp/php-project.el index c338fa2f..53af3500 100644 --- a/lisp/php-project.el +++ b/lisp/php-project.el @@ -5,7 +5,7 @@ ;; Author: USAMI Kenta ;; Keywords: tools, files ;; URL: https://github.com/emacs-php/php-mode -;; Version: 1.24.3 +;; Version: 1.25.0 ;; License: GPL-3.0-or-later ;; This program is free software; you can redistribute it and/or modify diff --git a/lisp/php.el b/lisp/php.el index 4e991287..74725973 100644 --- a/lisp/php.el +++ b/lisp/php.el @@ -5,7 +5,7 @@ ;; Author: USAMI Kenta ;; Created: 5 Dec 2018 -;; Version: 1.24.3 +;; Version: 1.25.0 ;; Keywords: languages, php ;; Homepage: https://github.com/emacs-php/php-mode ;; License: GPL-3.0-or-later