[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/php-mode 6d6b5a66a4 4/5: Merge pull request #701 from emac
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/php-mode 6d6b5a66a4 4/5: Merge pull request #701 from emacs-php/release/1.24.1 |
Date: |
Wed, 7 Sep 2022 22:59:01 -0400 (EDT) |
branch: elpa/php-mode
commit 6d6b5a66a4546381c3cfe39221ae06ef787aa623
Merge: 45b4587671 ae3b0b184e
Author: USAMI Kenta <tadsan@pixiv.com>
Commit: GitHub <noreply@github.com>
Merge pull request #701 from emacs-php/release/1.24.1
Bump up version 1.24.1
---
CHANGELOG.md | 18 ++++++++++++++++--
README.ja.md | 2 +-
README.md | 2 +-
lisp/php-align.el | 4 ++--
lisp/php-face.el | 4 ++--
lisp/php-local-manual.el | 2 +-
lisp/php-mode-debug.el | 4 ++--
lisp/php-mode.el | 6 +++---
lisp/php-project.el | 4 ++--
lisp/php.el | 4 ++--
10 files changed, 32 insertions(+), 18 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31960fd0c3..66b2389170 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,9 @@
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
+<!-- ## Unreleased -->
+
+## [1.24.1] - 2022-10-08
### Added
@@ -12,7 +14,7 @@ All notable changes of the PHP Mode 1.19.1 release series are
documented in this
* Add `php-imenu-generic-expression-default` for default value or
`php-imenu-generic-expression`
* Add `php-imenu-generic-expression-legacy` for compatibility
* Add `php-imenu-generic-expression-simple` for simple display
- * Add `php-project-project-find-function` compatible with
`project-find-functions`
+ * Add `php-project-project-find-function` compatible with
`project-find-functions` ([#693])
### Changed
@@ -27,9 +29,21 @@ All notable changes of the PHP Mode 1.19.1 release series
are documented in this
* Renamed `All Methods` to `Methods`
* Removed `Public Methods`, `Protected Methods` and `Provate Methods`
* Unified `Classes`, `Traits`, `Interfaces` into `Classes`
+ * Modified regexp patterns ([#681])
+ * Suppress compile-time warnings ([#683], [#690], [#697])
+
+### Fixed
+
+ * Fix `php-run-builtin-web-server` to expand root path (#699)
[#669]: https://github.com/emacs-php/php-mode/pull/669
[#680]: https://github.com/emacs-php/php-mode/pull/680
+[#681]: https://github.com/emacs-php/php-mode/pull/681
+[#683]: https://github.com/emacs-php/php-mode/pull/683
+[#690]: https://github.com/emacs-php/php-mode/pull/690
+[#693]: https://github.com/emacs-php/php-mode/pull/693
+[#697]: https://github.com/emacs-php/php-mode/pull/697
+[#699]: https://github.com/emacs-php/php-mode/pull/699
## [1.24.0] - 2021-03-07
diff --git a/README.ja.md b/README.ja.md
index 057b29512c..ee1fcf0f9b 100644
--- a/README.ja.md
+++ b/README.ja.md
@@ -310,7 +310,7 @@ PHP Modeは[GNU General Public License Version 3][gpl-v3]
(GPLv3) でライセ
このプロジェクトは2017年まで[Eric James Michael Ritz][@ejmr]によりメンテナンスされていました。現在は[Friends
of Emacs-PHP Development][@emacs-php]コミュニティが引き継いで開発しています。
> ```
-> Copyright (C) 2018-2020 Friends of Emacs-PHP development
+> Copyright (C) 2022 Friends of Emacs-PHP development
> Copyright (C) 1999, 2000, 2001, 2003, 2004 Turadg Aleahmad
> 2008 Aaron S. Hawley
> 2011, 2012, 2013, 2014, 2015, 2016, 2017 Eric James Michael
> Ritz
diff --git a/README.md b/README.md
index b87f7c0a91..54248ed46c 100644
--- a/README.md
+++ b/README.md
@@ -289,7 +289,7 @@ This project originated in `php-mode.el` written by [Turadg
Aleahmad][@turadg] i
This project was maintained by [Eric James Michael Ritz][@ejmr] until 2017.
Currently, the [Friends of Emacs-PHP Development][@emacs-php] community
inherits PHP Mode.
> ```
-> Copyright (C) 2018-2020 Friends of Emacs-PHP development
+> Copyright (C) 2022 Friends of Emacs-PHP development
> Copyright (C) 1999, 2000, 2001, 2003, 2004 Turadg Aleahmad
> 2008 Aaron S. Hawley
> 2011, 2012, 2013, 2014, 2015, 2016, 2017 Eric James Michael
> Ritz
diff --git a/lisp/php-align.el b/lisp/php-align.el
index 1e144893f3..d55fab7a29 100644
--- a/lisp/php-align.el
+++ b/lisp/php-align.el
@@ -1,13 +1,13 @@
;;; php-align.el --- Alignment configuration for PHP -*- lexical-binding: t;
-*-
;; Copyright (C) 2011 tetsujin (Yusuke Segawa)
-;; Copyright (C) 2020 Friends of Emacs-PHP development
+;; Copyright (C) 2022 Friends of Emacs-PHP development
;; Author: tetsujin (Yusuke Segawa) <tetsujin85 (at) gmail.com>
;; Maintainer: USAMI Kenta <tadsan@zonu.me>
;; Keywords: php languages convenience align
;; Homepage: https://github.com/emacs-php/php-mode
-;; Version: 1.24.0
+;; Version: 1.24.1
;; License: GPL-3.0-or-later
;; 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 48fa4fb52d..ca7524c7d4 100644
--- a/lisp/php-face.el
+++ b/lisp/php-face.el
@@ -1,10 +1,10 @@
;;; php-face.el --- Face definitions for PHP script -*- lexical-binding: t;
-*-
-;; Copyright (C) 2020 Friends of Emacs-PHP development
+;; Copyright (C) 2022 Friends of Emacs-PHP development
;; Author: USAMI Kenta <tadsan@zonu.me>
;; Created: 5 May 2019
-;; Version: 1.24.0
+;; Version: 1.24.1
;; Keywords: faces, php
;; Homepage: https://github.com/emacs-php/php-mode
;; License: GPL-3.0-or-later
diff --git a/lisp/php-local-manual.el b/lisp/php-local-manual.el
index 040dca4c5b..dda26c5dd7 100644
--- a/lisp/php-local-manual.el
+++ b/lisp/php-local-manual.el
@@ -1,6 +1,6 @@
;;; php-local-manual.el --- Tools for local PHP manual -*- lexical-binding: t;
-*-
-;; Copyright (C) 2020 Friends of Emacs-PHP development
+;; Copyright (C) 2022 Friends of Emacs-PHP development
;; Author: phil-s
;; Maintainer: USAMI Kenta <tadsan@zonu.me>
diff --git a/lisp/php-mode-debug.el b/lisp/php-mode-debug.el
index 35dfea423f..d32485a1e6 100644
--- a/lisp/php-mode-debug.el
+++ b/lisp/php-mode-debug.el
@@ -1,11 +1,11 @@
;;; php-mode-debug.el --- Debug functions for PHP Mode -*- lexical-binding:
t; -*-
-;; Copyright (C) 2020 Friends of Emacs-PHP development
+;; Copyright (C) 2022 Friends of Emacs-PHP development
;; Author: USAMI Kenta <tadsan@zonu.me>
;; URL: https://github.com/emacs-php/php-mode
;; Keywords: maint
-;; Version: 1.24.0
+;; Version: 1.24.1
;; 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 f221770a83..ecf80dd855 100644
--- a/lisp/php-mode.el
+++ b/lisp/php-mode.el
@@ -1,6 +1,6 @@
;;; php-mode.el --- Major mode for editing PHP code -*- lexical-binding: t;
-*-
-;; Copyright (C) 2020 Friends of Emacs-PHP development
+;; Copyright (C) 2022 Friends of Emacs-PHP development
;; Copyright (C) 1999, 2000, 2001, 2003, 2004 Turadg Aleahmad
;; 2008 Aaron S. Hawley
;; 2011, 2012, 2013, 2014, 2015, 2016, 2017 Eric James Michael
Ritz
@@ -9,11 +9,11 @@
;; Maintainer: USAMI Kenta <tadsan@zonu.me>
;; URL: https://github.com/emacs-php/php-mode
;; Keywords: languages php
-;; Version: 1.24.0
+;; Version: 1.24.1
;; Package-Requires: ((emacs "25.2"))
;; License: GPL-3.0-or-later
-(defconst php-mode-version-number "1.24.0"
+(defconst php-mode-version-number "1.24.1"
"PHP Mode version number.")
;; 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 3ed761eb28..3ac833ba8d 100644
--- a/lisp/php-project.el
+++ b/lisp/php-project.el
@@ -1,11 +1,11 @@
;;; php-project.el --- Project support for PHP application -*-
lexical-binding: t; -*-
-;; Copyright (C) 2020 Friends of Emacs-PHP development
+;; Copyright (C) 2022 Friends of Emacs-PHP development
;; Author: USAMI Kenta <tadsan@zonu.me>
;; Keywords: tools, files
;; URL: https://github.com/emacs-php/php-mode
-;; Version: 1.24.0
+;; Version: 1.24.1
;; 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 1a49e42ed7..94fec3c4b2 100644
--- a/lisp/php.el
+++ b/lisp/php.el
@@ -1,10 +1,10 @@
;;; php.el --- PHP support for friends -*- lexical-binding: t;
-*-
-;; Copyright (C) 2020 Friends of Emacs-PHP development
+;; Copyright (C) 2022 Friends of Emacs-PHP development
;; Author: USAMI Kenta <tadsan@zonu.me>
;; Created: 5 Dec 2018
-;; Version: 1.24.0
+;; Version: 1.24.1
;; Keywords: languages, php
;; Homepage: https://github.com/emacs-php/php-mode
;; License: GPL-3.0-or-later