[elpa] externals/corfu 2c3947d415 1/2: Expand docstrings

[ELPA Syncer]

branch: externals/corfu
commit 2c3947d415cee368a44b2e4310be48d722e9c29c
Author: Daniel Mendler 
Commit: Daniel Mendler 

Expand docstrings
---
 corfu.el | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/corfu.el b/corfu.el
index 7d9c247a64..2e1d3ed382 100644
--- a/corfu.el
+++ b/corfu.el
@@ -159,11 +159,16 @@ return a string, possibly an icon."
 (defcustom corfu-auto-prefix 3
   "Minimum length of prefix for auto completion.
 The completion backend can override this with
-:company-prefix-length."
+:company-prefix-length.  It is *not recommended* to use a small
+value here (below 2), since this will create high load for
+Emacs.  See also `corfu-auto-delay'."
   :type 'natnum)
 
 (defcustom corfu-auto-delay 0.2
-  "Delay for auto completion."
+  "Delay for auto completion.
+It is *not recommended* to use a very small value or even 0,
+since this will create high load for Emacs in particular if the
+completion backend in use is expensive."
   :type 'float)
 
 (defcustom corfu-auto-commands

[elpa] externals/corfu 60655764dc 2/2: corfu-echo-delay, corfu-popupinfo-delay: Remove support for instant value t.

[ELPA Syncer]

branch: externals/corfu
commit 60655764dc41dc42666abd69ff5c386661d98e59
Author: Daniel Mendler 
Commit: Daniel Mendler 

corfu-echo-delay, corfu-popupinfo-delay: Remove support for instant value t.
---
 CHANGELOG.org |  3 +++
 corfu.el  |  4 ++--
 extensions/corfu-echo.el  |  7 +++
 extensions/corfu-popupinfo.el | 19 +++
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.org b/CHANGELOG.org
index c7539fe5a6..29049d234e 100644
--- a/CHANGELOG.org
+++ b/CHANGELOG.org
@@ -5,6 +5,9 @@
 * Development
 
 - Drop obsolete =corfu-preselect-first=.
+- =corfu-popupinfo-delay= and =corfu-echo-delay=: Remove support for value =t=.
+  Instant updates are not recommended. It is still possible to use a small 
value
+  for the delay.
 
 * Version 0.35 (2023-02-17)
 
diff --git a/corfu.el b/corfu.el
index 2e1d3ed382..bd46aa1879 100644
--- a/corfu.el
+++ b/corfu.el
@@ -160,13 +160,13 @@ return a string, possibly an icon."
   "Minimum length of prefix for auto completion.
 The completion backend can override this with
 :company-prefix-length.  It is *not recommended* to use a small
-value here (below 2), since this will create high load for
+prefix length (below 2), since this will create high load for
 Emacs.  See also `corfu-auto-delay'."
   :type 'natnum)
 
 (defcustom corfu-auto-delay 0.2
   "Delay for auto completion.
-It is *not recommended* to use a very small value or even 0,
+It is *not recommended* to use a very small delay or even 0,
 since this will create high load for Emacs in particular if the
 completion backend in use is expensive."
   :type 'float)
diff --git a/extensions/corfu-echo.el b/extensions/corfu-echo.el
index 5b845c7f14..66dcb9e63e 100644
--- a/extensions/corfu-echo.el
+++ b/extensions/corfu-echo.el
@@ -41,10 +41,9 @@
 
 (defcustom corfu-echo-delay '(2.0 . 1.0)
   "Show documentation string in the echo area after that number of seconds.
-Set to t for an instant message.  The value can be a pair of two
-floats to specify initial and subsequent delay."
+The value can be a pair of two floats to specify initial and
+subsequent delay."
   :type '(choice (const :tag "Never" nil)
- (const :tag "Instant" t)
  (number :tag "Delay in seconds")
  (cons :tag "Two Delays"
(choice :tag "Initial   " number)
@@ -89,7 +88,7 @@ floats to specify initial and subsequent delay."
(fun (plist-get corfu--extra :company-docsig))
(cand (and (>= corfu--index 0)
   (nth corfu--index corfu--candidates
-  (if (or (eq delay t) (<= delay 0))
+  (if (<= delay 0)
   (corfu-echo--show (funcall fun cand))
 (corfu-echo--cancel)
 (setq corfu-echo--timer
diff --git a/extensions/corfu-popupinfo.el b/extensions/corfu-popupinfo.el
index 8bf7405a6a..2c9e650aad 100644
--- a/extensions/corfu-popupinfo.el
+++ b/extensions/corfu-popupinfo.el
@@ -53,14 +53,17 @@
 (defcustom corfu-popupinfo-delay '(2.0 . 1.0)
   "Automatically update info popup after that number of seconds.
 
-Set to t for an instant update.  The value can be a pair of two
-floats to specify initial and subsequent delay.  If the value is
-non-nil or the car of the pair is non-nil, the popup will
-automatically appear for the preselected candidate.  Otherwise the
-popup can be requested manually via `corfu-popupinfo-toggle',
-`corfu-popupinfo-documentation' and `corfu-popupinfo-location'."
+The value can be a pair of two floats to specify initial and
+subsequent delay.  If the value is non-nil or the car of the pair
+is non-nil, the popup will automatically appear for the
+preselected candidate.  Otherwise the popup can be requested
+manually via `corfu-popupinfo-toggle',
+`corfu-popupinfo-documentation' and `corfu-popupinfo-location'.
+
+It is *not recommended* to use a very small delay, since this
+will create high load for Emacs since retrieving the
+documentation is usually expensive."
   :type '(choice (const :tag "Never" nil)
- (const :tag "Instant" t)
  (number :tag "Delay in seconds")
  (cons :tag "Two Delays"
(choice :tag "Initial   "
@@ -484,7 +487,7 @@ not be displayed until this command is called again, even if
corfu-popupinfo-delay)
 corfu-popupinfo-delay))
(corfu-popupinfo--toggle))
-  (if (or (eq delay t) (<= delay 0)
+  (if (or (<= delay 0)
   (and (equal candidate corfu-popupinfo--candidate)
(corfu-popupinfo--visible-p)))
   (corfu-popupinfo--show candidate)

[elpa] externals/corfu updated (44df3d98b7 -> 60655764dc)

[ELPA Syncer]

elpasync pushed a change to branch externals/corfu.

  from  44df3d98b7 Use natnum custom type (supported by Compat 29.1.4.0)
   new  2c3947d415 Expand docstrings
   new  60655764dc corfu-echo-delay, corfu-popupinfo-delay: Remove support 
for instant value t.


Summary of changes:
 CHANGELOG.org |  3 +++
 corfu.el  |  9 +++--
 extensions/corfu-echo.el  |  7 +++
 extensions/corfu-popupinfo.el | 19 +++
 4 files changed, 24 insertions(+), 14 deletions(-)

[elpa] externals/consult 052399ed05: Update changelog

[ELPA Syncer]

branch: externals/consult
commit 052399ed05372464b8ed6261b3196de143a8a834
Author: Daniel Mendler 
Commit: Daniel Mendler 

Update changelog
---
 CHANGELOG.org | 4 
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.org b/CHANGELOG.org
index 900a3b3a94..ee5cfd8a22 100644
--- a/CHANGELOG.org
+++ b/CHANGELOG.org
@@ -5,6 +5,10 @@
 * Development
 
 - =consult-org-heading=: Support tag inheritance.
+- Use pure =consult--fast-abbreviate-file-name= function to abbreviate file 
names
+  in =consult-buffer= and =consult-recent-file=. This ensures that 
abbreviation does
+  not access the file system (or worse remote hosts via Tramp) and is always
+  fast. The downside is that some paths may not get abbreviated.
 
 * Version 0.33 (2023-03-11)
 

[elpa] externals/org 3b9ffc6868: org-latex-export-to-latex: Use nil arg for `write-region'

[ELPA Syncer]

branch: externals/org
commit 3b9ffc6868d9fadff374eca4206c66fd8d71b1a9
Author: Ihor Radchenko 
Commit: Ihor Radchenko 

org-latex-export-to-latex: Use nil arg for `write-region'

* lisp/ox.el: Use BEG=nil instead of explicit arguments to
`write-region'.  This simplifies the code.
---
 lisp/ox.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/ox.el b/lisp/ox.el
index 7e4042bb8f..f9fc9a99b4 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -6813,14 +6813,14 @@ or FILE."
   (with-temp-buffer
 (insert output)
 (let ((coding-system-for-write ',encoding))
-  (write-region (point-min) (point-max) ,file)))
+  (write-region nil nil ,file)))
   (or (ignore-errors (funcall ',post-process ,file)) ,file)))
 (let ((output (org-export-as
backend subtreep visible-only body-only ext-plist)))
   (with-temp-buffer
 (insert output)
 (let ((coding-system-for-write encoding))
- (write-region (point-min) (point-max) file)))
+ (write-region nil nil file)))
   (when (and (org-export--copy-to-kill-ring-p) (org-string-nw-p 
output))
 (org-kill-new output))
   ;; Get proper return value.

[elpa] externals-release/org 92471e5303: org-agenda-run-series: Fix `org-agenda-list' call

[ELPA Syncer]

branch: externals-release/org
commit 92471e53031c4de36ecd65a37e28a48fd139ff4a
Author: Ihor Radchenko 
Commit: Ihor Radchenko 

org-agenda-run-series: Fix `org-agenda-list' call

* lisp/org-agenda.el (org-agenda-run-series): Fix arguments in the
call.  "agenda*" should include appointments and thus HOURS argument
should be non-nil.  See `org-agenda' for analogous call.
---
 lisp/org-agenda.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index a33d84f1cd..2ec2f4c00b 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -3348,7 +3348,7 @@ s   Search for keywords M   Like m, but 
only TODO entries
  (`agenda
   (call-interactively 'org-agenda-list))
  (`agenda*
-  (funcall 'org-agenda-list nil nil t))
+  (funcall 'org-agenda-list nil nil nil t))
  (`alltodo
   (call-interactively 'org-todo-list))
  (`search

[elpa] externals/org updated (3b9ffc6868 -> 07ea7fc443)

[ELPA Syncer]

elpasync pushed a change to branch externals/org.

  from  3b9ffc6868 org-latex-export-to-latex: Use nil arg for `write-region'
   new  92471e5303 org-agenda-run-series: Fix `org-agenda-list' call
   new  6bf8e44d3f Merge branch 'bugfix'
   new  07ea7fc443 org-manual.org: $n$-th is not math


Summary of changes:
 doc/org-manual.org | 16 
 lisp/org-agenda.el |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

[elpa] externals/org 6bf8e44d3f 1/2: Merge branch 'bugfix'

[ELPA Syncer]

branch: externals/org
commit 6bf8e44d3f7cd1d7e8f4835c19b15bb54b1bbc5c
Merge: 3b9ffc6868 92471e5303
Author: Ihor Radchenko 
Commit: Ihor Radchenko 

Merge branch 'bugfix'
---
 lisp/org-agenda.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 3da0967f04..892d88a774 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -3348,7 +3348,7 @@ s   Search for keywords M   Like m, but 
only TODO entries
  (`agenda
   (call-interactively 'org-agenda-list))
  (`agenda*
-  (funcall 'org-agenda-list nil nil t))
+  (funcall 'org-agenda-list nil nil nil t))
  (`alltodo
   (call-interactively 'org-todo-list))
  (`search

[elpa] externals/org 07ea7fc443 2/2: org-manual.org: $n$-th is not math

[ELPA Syncer]

branch: externals/org
commit 07ea7fc4432185b2edaeb170ac2ef66a5c20e5ef
Author: Max Nikulin 
Commit: Ihor Radchenko 

org-manual.org: $n$-th is not math

* doc/org-manual.org (LaTeX fragments): Do not state that dash is
allowed after single "$" math delimiter and recommend "\(...\)".

Detection of "$-" as closing math delimiters has been broken since 2015
as a side effect of using punctuation class in regular expressions while
dash is considered as a word constituent.  See commits
6779f8f424 and c0369a7984.  Bring the manual in accordance to the code
instead of allowing "($-2 change)" false positives.  Users who do not
like "\(...\)" constructs may use a helper for typing it and may change
how it is displayed to minimize visual noise by fontification, see

- Eric S Fraga to emacs-orgmode. Re: Depreciating TeX-style LaTeX
  fragments. Sun, 16 Jan 2022 12:10:30 +.
  
- Ihor Radchenko to emacs-orgmode. Re: [PATCH] Add support for $…$ latex
  fragments followed by a dash. Thu, 27 Jan 2022 16:28:10 +0800.
  
---
 doc/org-manual.org | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/doc/org-manual.org b/doc/org-manual.org
index 1c97d6aa80..37fd3df144 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -11152,14 +11152,14 @@ snippets are identified as LaTeX source code:
   =\begin= statement appears on a new line, preceded by only
   whitespace.
 
-- Text within the usual LaTeX math delimiters.  To avoid conflicts
-  with currency specifications, single =$= characters are only
-  recognized as math delimiters if the enclosed text contains at most
-  two line breaks, is directly attached to the =$= characters with no
-  whitespace in between, and if the closing =$= is followed by
-  whitespace, punctuation or a dash.  For the other delimiters, there
-  is no such restriction, so when in doubt, use =\(...\)= as inline
-  math delimiters.
+- Text within the usual LaTeX math delimiters.  Prefer =\(...\)= for
+  inline fragments.  The =$...$= alternative has some restrictions and
+  may be a source of confusion.  To avoid conflicts with currency
+  specifications, single =$= characters are only recognized as math
+  delimiters if the enclosed text contains at most two line breaks, is
+  directly attached to the =$= characters with no whitespace in
+  between, and if the closing =$= is followed by whitespace or
+  punctuation (but not a dash).
 
 #+texinfo: @noindent
 For example:

[nongnu] elpa/git-commit 781544586b: magit-branch-delete: Reference magit-no-confirm in documentation

[ELPA Syncer]

branch: elpa/git-commit
commit 781544586b0b69ddff193b65d5d0f9c923a385b2
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

magit-branch-delete: Reference magit-no-confirm in documentation

Closes #4905.
---
 docs/magit.org   | 6 ++
 docs/magit.texi  | 6 ++
 lisp/magit-branch.el | 9 -
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/docs/magit.org b/docs/magit.org
index 68d8ecdcd9..e8eef615ed 100644
--- a/docs/magit.org
+++ b/docs/magit.org
@@ -5142,6 +5142,12 @@ The variables are described in [[*Branch Git Variables]].
   branches, then offer to delete those.  Otherwise, prompt for a single
   branch to be deleted, defaulting to the branch at point.
 
+  Require confirmation when deleting branches is dangerous in some
+  way.  Option ~magit-no-confirm~ can be customized to not require
+  confirmation in certain cases.  See its docstring to learn why
+  confirmation is required by default in certain cases or if a
+  prompt is confusing.
+
 - Key: b m (magit-branch-rename) ::
 
   Rename a branch.  The branch and the new name are read in the
diff --git a/docs/magit.texi b/docs/magit.texi
index 0fcf0418de..50338b8718 100644
--- a/docs/magit.texi
+++ b/docs/magit.texi
@@ -6334,6 +6334,12 @@ Delete one or multiple branches.  If the region marks 
multiple
 branches, then offer to delete those.  Otherwise, prompt for a single
 branch to be deleted, defaulting to the branch at point.
 
+Require confirmation when deleting branches is dangerous in some
+way.  Option @code{magit-no-confirm} can be customized to not require
+confirmation in certain cases.  See its docstring to learn why
+confirmation is required by default in certain cases or if a
+prompt is confusing.
+
 @item @kbd{b m} (@code{magit-branch-rename})
 @kindex b m
 @findex magit-branch-rename
diff --git a/lisp/magit-branch.el b/lisp/magit-branch.el
index 85e7c876fc..4b8b100ab3 100644
--- a/lisp/magit-branch.el
+++ b/lisp/magit-branch.el
@@ -543,9 +543,16 @@ that is being reset."
 ;;;###autoload
 (defun magit-branch-delete (branches &optional force)
   "Delete one or multiple branches.
+
 If the region marks multiple branches, then offer to delete
 those, otherwise prompt for a single branch to be deleted,
-defaulting to the branch at point."
+defaulting to the branch at point.
+
+Require confirmation when deleting branches is dangerous in some
+way.  Option `magit-no-confirm' can be customized to not require
+confirmation in certain cases.  See its docstring to learn why
+confirmation is required by default in certain cases or if a
+prompt is confusing."
   ;; One would expect this to be a command as simple as, for example,
   ;; `magit-branch-rename'; but it turns out everyone wants to squeeze
   ;; a bit of extra functionality into this one, including myself.

[nongnu] elpa/magit-section updated (564a5ceeb0 -> 781544586b)

[ELPA Syncer]

elpasync pushed a change to branch elpa/magit-section.

  from  564a5ceeb0 magit-git-debug: Fix key binding in docstring
  adds  781544586b magit-branch-delete: Reference magit-no-confirm in 
documentation

No new revisions were added by this update.

Summary of changes:
 docs/magit.org   | 6 ++
 docs/magit.texi  | 6 ++
 lisp/magit-branch.el | 9 -
 3 files changed, 20 insertions(+), 1 deletion(-)

[nongnu] elpa/magit updated (564a5ceeb0 -> 781544586b)

[ELPA Syncer]

elpasync pushed a change to branch elpa/magit.

  from  564a5ceeb0 magit-git-debug: Fix key binding in docstring
  adds  781544586b magit-branch-delete: Reference magit-no-confirm in 
documentation

No new revisions were added by this update.

Summary of changes:
 docs/magit.org   | 6 ++
 docs/magit.texi  | 6 ++
 lisp/magit-branch.el | 9 -
 3 files changed, 20 insertions(+), 1 deletion(-)

[elpa] externals/realgud-ipdb 60995633bd 2/3: Update README.md

[ELPA Syncer]

branch: externals/realgud-ipdb
commit 60995633bd18e7bf638471ca33241cbef3d8786c
Author: R. Bernstein 
Commit: GitHub 

Update README.md
---
 README.md | 11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 4c0f90207f..3ddce60698 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,17 @@
 [![GNU ELPA][gnu-elpa-image]][gnu-elpa]
 [![MELPA][melpa-image]][melpa]
-[![MELPA Stable][melpa-stable-image]][melpa-stable]
 
 Introduction
-
+
 
 Emacs Lisp Module to add [ipdb](https://pypi.org/project/ipdb/) support to 
[realgud](https://github.com/realgud/realgud).
 
 
 Installation
-
+=
 
 From ELPA or MELPA
-++
+--
 
 Inside GNU Emacs evaluate:
 
@@ -22,7 +21,7 @@ Inside GNU Emacs evaluate:
 
 
 From github source
-++
+---
 
 * Have `realgud` and `test-simple` installed.
 * From inside GNU Emacs, evaluate:
@@ -32,7 +31,5 @@ From github source
 
 [gnu-elpa-image]: https://elpa.gnu.org/packages/realgud-ipdb.svg
 [gnu-elpa]: https://elpa.gnu.org/packages/realgud-ipdb.html
-[melpa-stable-image]: http://stable.melpa.org/packages/realgud-ipdb-badge.svg
-[melpa-stable]: http://stable.melpa.org/#/realgud-ipdb
 [melpa-image]: http://melpa.org/packages/realgud-ipdb-badge.svg
 [melpa]: http://melpa.org/#/realgud-ipdb

[elpa] externals/realgud-ipdb updated (d5ad95710c -> aa89cc19c9)

[ELPA Syncer]

elpasync pushed a change to branch externals/realgud-ipdb.

  from  d5ad95710c Add GPLv3 LICENCSE
   new  b8883ee9d0 Add install instructions
   new  60995633bd Update README.md
   new  aa89cc19c9 Update README.md


Summary of changes:
 README.md | 35 +++
 1 file changed, 35 insertions(+)

[elpa] externals/realgud-ipdb b8883ee9d0 1/3: Add install instructions

[ELPA Syncer]

branch: externals/realgud-ipdb
commit b8883ee9d0f2f8cc458694656712ec35c3d0f393
Author: rocky 
Commit: rocky 

Add install instructions
---
 README.md | 37 +
 1 file changed, 37 insertions(+)

diff --git a/README.md b/README.md
index 1335fb1850..4c0f90207f 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,38 @@
+[![GNU ELPA][gnu-elpa-image]][gnu-elpa]
+[![MELPA][melpa-image]][melpa]
+[![MELPA Stable][melpa-stable-image]][melpa-stable]
+
+Introduction
+
+
 Emacs Lisp Module to add [ipdb](https://pypi.org/project/ipdb/) support to 
[realgud](https://github.com/realgud/realgud).
+
+
+Installation
+
+
+From ELPA or MELPA
+++
+
+Inside GNU Emacs evaluate:
+
+```lisp
+  (package-install realgud-ipdb)
+```
+
+
+From github source
+++
+
+* Have `realgud` and `test-simple` installed.
+* From inside GNU Emacs, evaluate:
+```lisp
+  (compile (format "EMACSLOADPATH=:%s:%s ./autogen.sh" (file-name-directory 
(locate-library "test-simple.elc")) (file-name-directory (locate-library 
"realgud.elc"
+```
+
+[gnu-elpa-image]: https://elpa.gnu.org/packages/realgud-ipdb.svg
+[gnu-elpa]: https://elpa.gnu.org/packages/realgud-ipdb.html
+[melpa-stable-image]: http://stable.melpa.org/packages/realgud-ipdb-badge.svg
+[melpa-stable]: http://stable.melpa.org/#/realgud-ipdb
+[melpa-image]: http://melpa.org/packages/realgud-ipdb-badge.svg
+[melpa]: http://melpa.org/#/realgud-ipdb

[elpa] externals/realgud-ipdb aa89cc19c9 3/3: Update README.md

[ELPA Syncer]

branch: externals/realgud-ipdb
commit aa89cc19c96a554cc62bea30f48b816828848e7c
Author: R. Bernstein 
Commit: GitHub 

Update README.md
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 3ddce60698..3d151efe92 100644
--- a/README.md
+++ b/README.md
@@ -24,6 +24,7 @@ From github source
 ---
 
 * Have `realgud` and `test-simple` installed.
+* Edit this README.md file. (Or rather just make sure that you are in the 
_directory_ where this file is located).
 * From inside GNU Emacs, evaluate:
 ```lisp
   (compile (format "EMACSLOADPATH=:%s:%s ./autogen.sh" (file-name-directory 
(locate-library "test-simple.elc")) (file-name-directory (locate-library 
"realgud.elc"

[elpa] externals/vertico 49e0932560 1/2: Add more display options (Fix #344)

[ELPA Syncer]

branch: externals/vertico
commit 49e0932560ff5d9d5b1271d5fb2be2f3b1c647e3
Author: Daniel Mendler 
Commit: Daniel Mendler 

Add more display options (Fix #344)
---
 extensions/vertico-buffer.el | 19 +--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/extensions/vertico-buffer.el b/extensions/vertico-buffer.el
index 7f79092c68..9eb7b73cab 100644
--- a/extensions/vertico-buffer.el
+++ b/extensions/vertico-buffer.el
@@ -46,8 +46,23 @@
   :type `(choice
   (const :tag "Reuse some window"
  (display-buffer-reuse-window))
-  (const :tag "Below target buffer"
- (display-buffer-below-selected
+  (const :tag "Least recently used window"
+ (,'display-buffer-use-least-recent-window))
+  (const :tag "Left of current window"
+ (display-buffer-in-direction
+  (direction . left)
+  (window-width . 0.3)))
+  (const :tag "Right of current window"
+ (display-buffer-in-direction
+  (direction . right)
+  (window-height . 0.3)))
+  (const :tag "Above current window"
+ (display-buffer-in-direction
+  (direction . above)
+  (window-height . ,(+ 3 vertico-count
+  (const :tag "Below current window"
+ (display-buffer-in-direction
+  (direction . below)
   (window-height . ,(+ 3 vertico-count
   (const :tag "Bottom of frame"
  (display-buffer-at-bottom

[elpa] externals/vertico b6b8420d29 2/2: Update changelog

[ELPA Syncer]

branch: externals/vertico
commit b6b8420d2943e42b88e2a143da29edf76bc223b5
Author: Daniel Mendler 
Commit: Daniel Mendler 

Update changelog
---
 CHANGELOG.org | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.org b/CHANGELOG.org
index f770ade4e4..bb2199f8b3 100644
--- a/CHANGELOG.org
+++ b/CHANGELOG.org
@@ -7,6 +7,8 @@
 - Use pixel-wise computation to determine if =truncate-lines= should be set. If
   point is too far too the right of the window, line truncation is disabled 
such
   that the full prompt is visible.
+- =vertico-buffer-display=: Add more choices for the display action to the
+  customizable variable.
 
 * Version 1.2 (2023-03-11)
 

[elpa] externals/vertico updated (febc71a317 -> b6b8420d29)

[ELPA Syncer]

elpasync pushed a change to branch externals/vertico.

  from  febc71a317 Update changelog
   new  49e0932560 Add more display options (Fix #344)
   new  b6b8420d29 Update changelog


Summary of changes:
 CHANGELOG.org|  2 ++
 extensions/vertico-buffer.el | 19 +--
 2 files changed, 19 insertions(+), 2 deletions(-)

[nongnu] elpa/git-commit d05b1ed381 3/3: Show errors inline in log buffers

[ELPA Syncer]

branch: elpa/git-commit
commit d05b1ed381c44d53dfe16a964169ecbdae9067ff
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Show errors inline in log buffers

Only do it for log sections that make up the whole buffer.
That makes it necessary to add a new argument, and because
I would like for it to go first, that is a breaking change.

Take this opportunity to replace `magit-insert-log' with
`magit--insert-log' for symmetry with `magit--insert-diff',
which is is a function on `magit-diff-sections-hook', run by
`magit-diff-refresh-buffer'.  `magit-log-refresh-buffer' runs
no hook.  Instead it calls `magit--insert-log' directly.
---
 lisp/magit-log.el   | 28 
 lisp/magit-merge.el | 12 ++--
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/lisp/magit-log.el b/lisp/magit-log.el
index eea3947d4d..fb5b844e0f 100644
--- a/lisp/magit-log.el
+++ b/lisp/magit-log.el
@@ -1083,7 +1083,7 @@ Type \\[magit-reset] to reset `HEAD' to the commit at 
point.
  revs
(format "%s~%s..%s" revs limit revs
 (magit-insert-section (logbuf)
-  (magit-insert-log revs args files
+  (magit--insert-log t revs args files
 
 (cl-defmethod magit-buffer-value (&context (major-mode magit-log-mode))
   (append magit-buffer-revisions
@@ -1113,11 +1113,16 @@ Type \\[magit-reset] to reset `HEAD' to the commit at 
point.
   args)))
 
 (defun magit-insert-log (revs &optional args files)
+  (declare (obsolete magit--insert-log "Magit 4.0.0"))
+  (magit--insert-log nil revs args files))
+
+(defun magit--insert-log (keep-error revs &optional args files)
   "Insert a log section.
 Do not add this to a hook variable."
+  (declare (indent defun))
   (let ((magit-git-global-arguments
  (remove "--literal-pathspecs" magit-git-global-arguments)))
-(magit-git-wash (apply-partially #'magit-log-wash-log 'log)
+(magit--git-wash (apply-partially #'magit-log-wash-log 'log) keep-error
   "log"
   (format "--format=%s%%h%%x0c%s%%x0c%s%%x0c%%aN%%x0c%s%%x0c%%s%s"
   (if (and (member "--left-right" args)
@@ -1621,8 +1626,7 @@ Type \\[magit-log-select-quit] to abort without selecting 
a commit."
 
 (defun magit-log-select-refresh-buffer ()
   (magit-insert-section (logbuf)
-(magit-insert-log magit-buffer-revisions
-  magit-buffer-log-args)))
+(magit--insert-log t magit-buffer-revisions magit-buffer-log-args)))
 
 (cl-defmethod magit-buffer-value (&context (major-mode magit-log-select-mode))
   magit-buffer-revisions)
@@ -1787,7 +1791,7 @@ in the pushremote case."
 (format (propertize "Unpulled from %s."
 'font-lock-face 'magit-section-heading)
 upstream))
-  (magit-insert-log "..@{upstream}" magit-buffer-log-args)
+  (magit--insert-log nil "..@{upstream}" magit-buffer-log-args)
   (magit-log-insert-child-count
 
 (magit-define-section-jumper magit-jump-to-unpulled-from-pushremote
@@ -1803,7 +1807,7 @@ in the pushremote case."
   (format (propertize "Unpulled from %s."
   'font-lock-face 'magit-section-heading)
   (propertize it 'font-lock-face 'magit-branch-remote)))
-(magit-insert-log (concat ".." it) magit-buffer-log-args)
+(magit--insert-log nil (concat ".." it) magit-buffer-log-args)
 (magit-log-insert-child-count)
 
 (defvar-keymap magit-unpushed-section-map
@@ -1843,7 +1847,7 @@ then show the last `magit-log-section-commit-count' 
commits."
 (format (propertize "Unmerged into %s."
 'font-lock-face 'magit-section-heading)
 (magit-get-upstream-branch)))
-  (magit-insert-log "@{upstream}.." magit-buffer-log-args)
+  (magit--insert-log nil "@{upstream}.." magit-buffer-log-args)
   (magit-log-insert-child-count
 
 (defun magit-insert-recent-commits (&optional type value)
@@ -1856,10 +1860,10 @@ Show the last `magit-log-section-commit-count' commits."
(or value range)
t)
   (magit-insert-heading "Recent commits")
-  (magit-insert-log range
-(cons (format "-n%d" magit-log-section-commit-count)
-  (--remove (string-prefix-p "-n" it)
-magit-buffer-log-args))
+  (magit--insert-log nil range
+(cons (format "-n%d" magit-log-section-commit-count)
+  (--remove (string-prefix-p "-n" it)
+magit-buffer-log-args))
 
 (magit-define-section-jumper magit-jump-to-unpushed-to-pushremote
   "Unpushed to " unpushed
@@ -1874,7 +1878,7 @@ Show the last `magit-log-section-commit-count' commits."
   (format (propertize "Unpushed to %s."
   'font-lock-face 'magit-section-heading)
   (prop

[nongnu] elpa/git-commit 78a979fde5 1/3: Support displaying errors that occur when washing a section

[ELPA Syncer]

branch: elpa/git-commit
commit 78a979fde52815242b165f083d171259db28e0b4
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Support displaying errors that occur when washing a section

`magit-git-wash' silently removes a section when the command produces
no output on stdout and stderr is ignored.  For a section among many,
that is usually the right thing to do, but when the section is the
only or primary section of a buffer, then we might want to display
the error (see subsequent commits).

Add a new function `magit--git-wash', which takes a new argument that
allows doing that.  Also add variable `magit--git-wash-keep-error' to
allow forcing that for all sections inserted with `magit-git-wash'.
That is experimental and might be removed again.
---
 lisp/magit-git.el | 32 +---
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/lisp/magit-git.el b/lisp/magit-git.el
index d928e63901..afeceb9935 100644
--- a/lisp/magit-git.el
+++ b/lisp/magit-git.el
@@ -566,6 +566,8 @@ message and add a section in the respective process buffer."
 (apply #'magit-git-insert args)
 (split-string (buffer-string) "\0" t)))
 
+(defvar magit--git-wash-keep-error nil) ; experimental
+
 (defun magit-git-wash (washer &rest args)
   "Execute Git with ARGS, inserting washed output at point.
 Actually first insert the raw output at point.  If there is no
@@ -573,21 +575,29 @@ output, call `magit-cancel-section'.  Otherwise 
temporarily narrow
 the buffer to the inserted text, move to its beginning, and then
 call function WASHER with ARGS as its sole argument."
   (declare (indent 1))
-  (let ((beg (point)))
-(setq args (flatten-tree args))
-(magit-git-insert args)
+  (apply #'magit--git-wash washer magit--git-wash-keep-error args))
+
+(defun magit--git-wash (washer keep-error &rest args)
+  (declare (indent 2))
+  (setq args (flatten-tree args))
+  (let ((beg (point))
+(exit (if keep-error
+  (magit-process-git t args)
+(magit-git-insert args
 (if (= (point) beg)
 (magit-cancel-section)
   (unless (bolp)
 (insert "\n"))
-  (save-restriction
-(narrow-to-region beg (point))
-(goto-char beg)
-(funcall washer args))
-  (when (or (= (point) beg)
-(= (point) (1+ beg)))
-(magit-cancel-section))
-  (magit-maybe-make-margin-overlay
+  (when (zerop exit)
+(save-restriction
+  (narrow-to-region beg (point))
+  (goto-char beg)
+  (funcall washer args))
+(when (or (= (point) beg)
+  (= (point) (1+ beg)))
+  (magit-cancel-section))
+(magit-maybe-make-margin-overlay)))
+exit))
 
 (defun magit-git-executable-find (command)
   "Search for COMMAND in Git's exec path, falling back to `exec-path'.

[nongnu] elpa/git-commit 2bd3db69d6 2/3: Show errors inline in diff buffers

[ELPA Syncer]

branch: elpa/git-commit
commit 2bd3db69d60e90cf4f4139a2bdae5bb448685e37
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Show errors inline in diff buffers

Closes #4869.
---
 lisp/magit-diff.el  | 16 
 lisp/magit-stash.el |  5 +++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/lisp/magit-diff.el b/lisp/magit-diff.el
index 65afdaa7a3..5dc58f80ac 100644
--- a/lisp/magit-diff.el
+++ b/lisp/magit-diff.el
@@ -2093,15 +2093,15 @@ keymap is the parent of their keymaps."
 
 (defun magit-insert-diff ()
   "Insert the diff into this `magit-diff-mode' buffer."
-  (magit--insert-diff
+  (magit--insert-diff t
 "diff" magit-buffer-range "-p" "--no-prefix"
 (and (member "--stat" magit-buffer-diff-args) "--numstat")
 magit-buffer-typearg
 magit-buffer-diff-args "--"
 magit-buffer-diff-files))
 
-(defun magit--insert-diff (&rest args)
-  (declare (indent 0))
+(defun magit--insert-diff (keep-error &rest args)
+  (declare (indent 1))
   (pcase-let ((`(,cmd . ,args)
(flatten-tree args))
   (magit-git-global-arguments
@@ -2118,7 +2118,7 @@ keymap is the parent of their keymaps."
   (setq magit-git-global-arguments
 (append magit-diff--reset-non-color-moved
 magit-git-global-arguments)))
-(magit-git-wash #'magit-diff-wash-diffs cmd args)))
+(magit--git-wash #'magit-diff-wash-diffs keep-error cmd args)))
 
 (defun magit-diff--maybe-add-stat-arguments (args)
   (if (member "--stat" args)
@@ -2548,7 +2548,7 @@ Staging and applying changes is documented in info node
 
 (defun magit-insert-revision-diff ()
   "Insert the diff into this `magit-revision-mode' buffer."
-  (magit--insert-diff
+  (magit--insert-diff t
 "show" "-p" "--cc" "--format=" "--no-prefix"
 (and (member "--stat" magit-buffer-diff-args) "--numstat")
 magit-buffer-diff-args
@@ -2879,7 +2879,7 @@ Refer to user option 
`magit-revision-insert-related-refs-display-alist'."
   magit-buffer-revision
   (or branch "HEAD")))
 (magit-insert-section (diffbuf)
-  (magit--insert-diff
+  (magit--insert-diff t
 "merge-tree" (magit-git-string "merge-base" head magit-buffer-revision)
 head magit-buffer-revision
 
@@ -2956,7 +2956,7 @@ It the SECTION has a different type, then do nothing."
   "Insert section showing unstaged changes."
   (magit-insert-section (unstaged)
 (magit-insert-heading "Unstaged changes:")
-(magit--insert-diff
+(magit--insert-diff nil
   "diff" magit-buffer-diff-args "--no-prefix"
   "--" magit-buffer-diff-files)))
 
@@ -2979,7 +2979,7 @@ It the SECTION has a different type, then do nothing."
   (unless (magit-bare-repo-p)
 (magit-insert-section (staged)
   (magit-insert-heading "Staged changes:")
-  (magit--insert-diff
+  (magit--insert-diff nil
 "diff" "--cached" magit-buffer-diff-args "--no-prefix"
 "--" magit-buffer-diff-files
 
diff --git a/lisp/magit-stash.el b/lisp/magit-stash.el
index b6b3ab3937..150e740c3a 100644
--- a/lisp/magit-stash.el
+++ b/lisp/magit-stash.el
@@ -524,8 +524,9 @@ If there is no stash buffer in the same frame, then do 
nothing."
 (defun magit-stash-insert-section (commit range message &optional files)
   (magit-insert-section (commit commit)
 (magit-insert-heading message)
-(magit--insert-diff "diff" range "-p" "--no-prefix" magit-buffer-diff-args
-"--" (or files magit-buffer-diff-files
+(magit--insert-diff nil
+  "diff" range "-p" "--no-prefix" magit-buffer-diff-args
+  "--" (or files magit-buffer-diff-files
 
 (defun magit-insert-stash-notes ()
   "Insert section showing notes for a stash.

[nongnu] elpa/git-commit updated (781544586b -> d05b1ed381)

[ELPA Syncer]

elpasync pushed a change to branch elpa/git-commit.

  from  781544586b magit-branch-delete: Reference magit-no-confirm in 
documentation
   new  78a979fde5 Support displaying errors that occur when washing a 
section
   new  2bd3db69d6 Show errors inline in diff buffers
   new  d05b1ed381 Show errors inline in log buffers


Summary of changes:
 lisp/magit-diff.el  | 16 
 lisp/magit-git.el   | 32 +---
 lisp/magit-log.el   | 28 
 lisp/magit-merge.el | 12 ++--
 lisp/magit-stash.el |  5 +++--
 5 files changed, 54 insertions(+), 39 deletions(-)

[nongnu] elpa/magit updated (781544586b -> d05b1ed381)

[ELPA Syncer]

elpasync pushed a change to branch elpa/magit.

  from  781544586b magit-branch-delete: Reference magit-no-confirm in 
documentation
  adds  78a979fde5 Support displaying errors that occur when washing a 
section
  adds  2bd3db69d6 Show errors inline in diff buffers
  adds  d05b1ed381 Show errors inline in log buffers

No new revisions were added by this update.

Summary of changes:
 lisp/magit-diff.el  | 16 
 lisp/magit-git.el   | 32 +---
 lisp/magit-log.el   | 28 
 lisp/magit-merge.el | 12 ++--
 lisp/magit-stash.el |  5 +++--
 5 files changed, 54 insertions(+), 39 deletions(-)

[nongnu] elpa/magit-section updated (781544586b -> d05b1ed381)

[ELPA Syncer]

elpasync pushed a change to branch elpa/magit-section.

  from  781544586b magit-branch-delete: Reference magit-no-confirm in 
documentation
  adds  78a979fde5 Support displaying errors that occur when washing a 
section
  adds  2bd3db69d6 Show errors inline in diff buffers
  adds  d05b1ed381 Show errors inline in log buffers

No new revisions were added by this update.

Summary of changes:
 lisp/magit-diff.el  | 16 
 lisp/magit-git.el   | 32 +---
 lisp/magit-log.el   | 28 
 lisp/magit-merge.el | 12 ++--
 lisp/magit-stash.el |  5 +++--
 5 files changed, 54 insertions(+), 39 deletions(-)

[nongnu] elpa/php-mode 657a7b803d 08/15: Update CHANGELOG

[ELPA Syncer]

branch: elpa/php-mode
commit 657a7b803d5870f2e0cdd83fdb745cbfdac808d2
Author: USAMI Kenta 
Commit: USAMI Kenta 

Update CHANGELOG
---
 CHANGELOG.md | 4 
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index de0f8d111b..21fa2d8c16 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,9 @@ All notable changes of the PHP Mode 1.19.1 release series are 
documented in this
  * **Net feature**: `php-format` ([#731])
* Add `php-format-project` and `php-format-this-buffer-file` commands
* Add `php-format-auto-mode` minor mode
+ * **Experimental feature: `php-ide`** ([#709])
+   * Add `php-ide-phpactor` as simple IDE feature without LSP clients
+   * Add `php-ide-mode` minor mode for binding IDE-like features
 
 ### Fixed
 
@@ -19,6 +22,7 @@ All notable changes of the PHP Mode 1.19.1 release series are 
documented in this
  * No longer highlights `'link` in PHPDoc ([#724])
* Please use `goto-address-prog-mode` minor mode
 
+[#709]: https://github.com/emacs-php/php-mode/pull/709
 [#724]: https://github.com/emacs-php/php-mode/pull/724
 [#726]: https://github.com/emacs-php/php-mode/pull/726
 [#731]: https://github.com/emacs-php/php-mode/pull/731

[nongnu] elpa/php-mode 5d3e9462a2 01/15: Fix doc comment

[ELPA Syncer]

branch: elpa/php-mode
commit 5d3e9462a252d6ef306894cb0ee7d886a84f267a
Author: USAMI Kenta 
Commit: USAMI Kenta 

Fix doc comment
---
 lisp/php-format.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/php-format.el b/lisp/php-format.el
index f3a7886926..166975ffaa 100644
--- a/lisp/php-format.el
+++ b/lisp/php-format.el
@@ -130,7 +130,7 @@
   :group 'php-format)
 
 (defcustom php-format-disable-async-format-buffer-has-modified t
-  "When non-NIL, disable asynchronous formatting if the buffer has modified 
(not saved)."
+  "When set to non-NIL, disables async formatting if buffer is modified 
(unsaved)."
   :tag "PHP Format Disable Async Format Buffer Has Modified"
   :type 'boolean
   :group 'php-format)

[nongnu] elpa/php-mode c601f75fb9 13/15: Merge pull request #734 from emacs-php/release/v1.24.3

[ELPA Syncer]

branch: elpa/php-mode
commit c601f75fb953de1c35929ac5fea5b992388c2900
Merge: c68e18c06b bed4d8ced3
Author: USAMI Kenta 
Commit: GitHub 

Merge pull request #734 from emacs-php/release/v1.24.3

Bump up version 1.24.3
---
 CHANGELOG.md   | 4 +++-
 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-mode-debug.el | 2 +-
 lisp/php-mode.el   | 4 ++--
 lisp/php-project.el| 2 +-
 lisp/php.el| 2 +-
 11 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 21fa2d8c16..3652ffd09b 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
+
+
+## [1.24.3] - 2023-03-19
 
 ### Added
 
diff --git a/Cask b/Cask
index a52d38faaf..822f910126 100644
--- a/Cask
+++ b/Cask
@@ -1,4 +1,4 @@
-(package "php-mode" "1.24.2" "Major mode for editing PHP code")
+(package "php-mode" "1.24.3" "Major mode for editing PHP code")
 (source melpa)
 
 (package-file "lisp/php-mode.el")
diff --git a/lisp/php-align.el b/lisp/php-align.el
index b1ea3bf49d..bed857979e 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.2
+;; Version: 1.24.3
 ;; 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 e289943a2f..1decb6f8de 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.2
+;; Version: 1.24.3
 ;; 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 fc9e59c812..7b402db0fe 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.2
+;; Version: 1.24.3
 ;; 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 1106035c9a..73f9f15c7d 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.2
+;; Version: 1.24.3
 ;; 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 822336e589..28649dc31c 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.2
+;; Version: 1.24.3
 ;; Keywords: tools, languages, php
 
 ;; 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 9c69e2050b..dcbea71fb9 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.2
+;; Version: 1.24.3
 ;; 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 012f21ee29..626904895d 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.2
+;; Version: 1.24.3
 ;; Package-Requires: ((emacs "25.2"))
 ;; License: GPL-3.0-or-later
 
 (eval-and-compile
   (make-obsolete-variable
-   (defconst php-mode-version-number "1.24.2" "PHP Mode version number.")
+   (defconst php-mode-version-number "1.24.3" "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 f862a6720b..c338fa2f0d 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.2
+;; Version: 1.24.3
 ;; 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 3bff893b01..ae6ad647de 100644
--- a/lisp/php.el
+++ b/lisp/php.el
@@ -5,7 +5,7 @@
 
 ;; Author: USAMI Kenta 
 ;; Created: 5 Dec 2018
-;; Version: 1.24.2
+;; Version: 1.24.3
 ;; Keywords: languages, php
 ;; Homepage: https://github.com/emacs-php/php-mode
 ;; License: GPL-3.0-or-later

[nongnu] elpa/php-mode 6d4ca45093 06/15: Add php-ide-mode-hooks

[ELPA Syncer]

branch: elpa/php-mode
commit 6d4ca45093060ad320b9a9dfc197098953b89d63
Author: USAMI Kenta 
Commit: USAMI Kenta 

Add php-ide-mode-hooks
---
 lisp/php-ide.el | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lisp/php-ide.el b/lisp/php-ide.el
index 1342c1564e..c0bf2e6876 100644
--- a/lisp/php-ide.el
+++ b/lisp/php-ide.el
@@ -143,6 +143,8 @@
   :type 'string
   :safe #'stringp)
 
+(defvar php-ide-mode-hooks nil)
+
 ;;;###autoload
 (define-minor-mode php-ide-mode
   "Minor mode for integrate IDE-like tools."
@@ -155,6 +157,7 @@
   ide-features
   (mapconcat (lambda (feature) (concat "'" (symbol-name 
feature)))
  (php-ide--avilable-features) ", ")))
+(run-hooks 'php-ide-mode-hooks)
 (cl-loop for feature in ide-features
  for ide-plist = (cdr-safe (assq feature php-ide-feature-alist))
  do (if (null ide-plist)

[nongnu] elpa/php-mode 91cd91a107 07/15: Remove php-eglot.el

[ELPA Syncer]

branch: elpa/php-mode
commit 91cd91a107bca6a0ad1b55d3ac05467f744b2e28
Author: USAMI Kenta 
Commit: USAMI Kenta 

Remove php-eglot.el
---
 Cask  |   1 -
 Makefile  |   1 -
 lisp/php-eglot.el | 116 --
 3 files changed, 118 deletions(-)

diff --git a/Cask b/Cask
index 0e8d058553..a52d38faaf 100644
--- a/Cask
+++ b/Cask
@@ -7,7 +7,6 @@
  "lisp/php.el"
  "lisp/php-complete.el"
  "lisp/php-defs.el"
- "lisp/php-eglot.el"
  "lisp/php-face.el"
  "lisp/php-format.el"
  "lisp/php-project.el"
diff --git a/Makefile b/Makefile
index 42db81da41..77474be14d 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,6 @@ ELS  = lisp/php.el
 ELS += lisp/php-align.el
 ELS += lisp/php-complete.el
 ELS += lisp/php-defs.el
-ELS += lisp/php-eglot.el
 ELS += lisp/php-face.el
 ELS += lisp/php-flymake.el
 ELS += lisp/php-format.el
diff --git a/lisp/php-eglot.el b/lisp/php-eglot.el
deleted file mode 100644
index 6a7875f346..00
--- a/lisp/php-eglot.el
+++ /dev/null
@@ -1,116 +0,0 @@
-;;; php-eglot.el --- Eglot enhancement for PHP development -*- 
lexical-binding: t; -*-
-
-;; Copyright (C) 2023  Friends of Emacs-PHP development
-
-;; Author: USAMI Kenta 
-;; Keywords: tools, files
-;; URL: https://github.com/emacs-php/php-mode
-;; Version: 1.24.0
-;; License: GPL-3.0-or-later
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see .
-
-;;; Commentary:
-
-;; PHP Mode integrates Eglot .
-;;
-;; **Note**:
-;; This feature is under development and experimental.
-;; All of these functions, modes and terms are subject to change without 
notice.
-;;
-;; ## Configuration
-;;
-;; Put follows code into your .emacs (~/.emacs.d/init.el) file:
-;;
-;; (add-to-list 'eglot-server-programs ((php-mode phps-mode) . 
php-eglot-server-program))
-;;
-;; ### For per project configuration
-;;
-;; Put follows code into .dir-locals.el in project directory:
-;;
-;; ((nil (php-project-root . git)
-;;   (php-eglot-executable . ("psalm-language-server"))
-;;   ;; or (php-eglot-executable . ("php" "vendor/bin/path/to/server"))
-;;   ))
-;;
-;; If you can't put .dir-locals.el in your project directory, consider the 
sidecar-locals package.
-;; https://melpa.org/#/sidecar-locals
-;; https://codeberg.org/ideasman42/emacs-sidecar-locals
-;;
-
-;;; Code:
-(require 'cl-lib)
-(require 'php-project)
-(require 'eglot nil t)
-(require 'phpactor nil t)
-
-(eval-when-compile
-  (defvar eglot-server-programs)
-  (defvar eglot--managed-mode)
-  (declare-function eglot-ensure "ext:eglot" ())
-  (declare-function phpactor--find-executable "ext:phpactor" ()))
-
-(defvar php-eglot-lsp-command-alist
-  '((intelephense "intelephense" "--stdio")
-(phpactor . (lambda () (list (if (require 'phpactor nil t)
- (phpactor--find-executable)
-   "phpactor"))
-
-(defgroup php-eglot nil
-  "Eglot PHP integration."
-  :tag "PHP-Eglot"
-  :prefix "php-eglot-"
-  :group 'eglot
-  :group 'php)
-
-;;;###autoload
-(defcustom php-eglot-executable nil
-  "Command name or path to the command of Eglot LSP executable."
-  :tag "Php-Eglot Executable"
-  :group 'php-eglot
-  :type '(choice
-  (const intelephense)
-  (const phpactor)
-  string (repeat string))
-  :safe (lambda (v) (cond
- ((stringp v) (file-exists-p v))
- ((listp v) (cl-every #'stringp v))
- ((assq v php-eglot-lsp-command-alist)
-
-;;;###autoload
-(defun php-eglot-server-program ()
-  "Return a list of command to execute LSP Server."
-  (cond
-   ((stringp php-eglot-executable) (list php-eglot-executable))
-   ((listp php-eglot-executable) php-eglot-executable)
-   ((when-let (command (assq php-eglot-executable php-eglot-lsp-command-alist))
-  (cond
-   ((functionp command) (funcall command))
-   ((listp command) command))
-
-(defun php-eglot-ensure ()
-  "Start PHP-specific Eglot session for current buffer if there isn't one."
-  (when-let (server-program (php-eglot-server-program))
-(setq-local eglot-server-programs (list (cons major-mode server-program
-  (setq-local project-find-functions (list 
#'php-project-project-find-function))
-  (add-function :after (local 'eglot--managed-mode) 
#'php-eglot--eglot--managed-

[nongnu] elpa/php-mode bb5bec31ee 04/15: Add php-ide.el

[ELPA Syncer]

branch: elpa/php-mode
commit bb5bec31ee927e184c1ddc162d0ddbb92d56d633
Author: USAMI Kenta 
Commit: USAMI Kenta 

Add php-ide.el
---
 Cask|   2 +
 Makefile|   1 +
 lisp/php-ide.el | 184 
 3 files changed, 187 insertions(+)

diff --git a/Cask b/Cask
index e090d524d5..0e8d058553 100644
--- a/Cask
+++ b/Cask
@@ -13,9 +13,11 @@
  "lisp/php-project.el"
  "lisp/php-local-manual.el"
  "lisp/php-ide-phpactor.el"
+ "lisp/php-ide.el"
  "lisp/php-mode-debug.el")
 
 (development
+ ;;(depends-on "lsp-mode")
  (depends-on "phpactor")
  (depends-on "pkg-info")
  (depends-on "projectile")
diff --git a/Makefile b/Makefile
index c2fc9ffe84..42db81da41 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,7 @@ ELS += lisp/php-face.el
 ELS += lisp/php-flymake.el
 ELS += lisp/php-format.el
 ELS += lisp/php-ide-phpactor.el
+ELS += lisp/php-ide.el
 ELS += lisp/php-local-manual.el
 ELS += lisp/php-mode-debug.el
 ELS += lisp/php-mode.el
diff --git a/lisp/php-ide.el b/lisp/php-ide.el
new file mode 100644
index 00..e19de0b219
--- /dev/null
+++ b/lisp/php-ide.el
@@ -0,0 +1,184 @@
+;;; php-ide.el --- IDE-like UI support for PHP development -*- 
lexical-binding: t; -*-
+
+;; Copyright (C) 2023  Friends of Emacs-PHP development
+
+;; Author: USAMI Kenta 
+;; Keywords: tools, files
+;; URL: https://github.com/emacs-php/php-mode
+;; Version: 1.24.0
+;; License: GPL-3.0-or-later
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see .
+
+;;; Commentary:
+
+;; PHP Mode integrates LSP Mode (lsp-mode), Phpactor (phpactor.el) and 
IDE-like tools.
+;;
+;; **Note**:
+;; This feature is under development and experimental.
+;; All of these functions, modes and terms are subject to change without 
notice.
+;;
+;; ## Motivations
+;;
+;; There are some IDE-like features / packages for PHP development.
+;; PHP-IDE bridges projects and their IDE-like features.
+;;
+;; ## IDE Features
+;;
+;; We don't recommend features, but bundle some feature bridges.
+;; They are sorted alphabetically except "none."
+;;
+;;  - none
+;;  Does not launch any IDE features.
+;;  - eglot
+;;  https://github.com/joaotavora/eglot
+;;  - lsp-mode
+;;  https://emacs-lsp.github.io/lsp-mode/
+;;  https://github.com/emacs-lsp/lsp-mode
+;;  - phpactor
+;;  https://phpactor.readthedocs.io/
+;;  https://github.com/phpactor/phpactor
+;;  https://github.com/emacs-php/phpactor.el
+;;
+;; ## Configuration
+;;
+;; Put follows code into your .emacs (~/.emacs.d/init.el) file:
+;;
+;; (defun my-php-mode-setup ()
+;;   (add-hook 'hack-local-variables-hook #'php-ide-mode t t))
+;;
+;; (with-eval-after-load 'php-ide
+;;   (custom-set-variables
+;;'(php-ide-features . 'eglot) ;; and/or 'none, 'phpactor, 'lsp-mode
+;;'(php-ide-eglot-executable "psalm-language-server") ;; or 
"intelephense", '("php" "vendor/bin/path/to/server")
+;;;; If you want to hide php-ide-mode from the mode line, set an empty 
string
+;;'(php-ide-mode-lighter ""))
+;;
+;;   (add-hook 'php-mode #'my-php-mode-setup))
+;;
+;; If you don't enable IDE support by default, set '(php-ide-feature 'none)
+;;
+;; ### For per project configuration
+;;
+;; Put follows code into .dir-locals.el in project directory:
+;;
+;; ((nil (php-project-root . git)
+;;   (php-ide-features . (lsp-mode
+;;
+;; If you can't put .dir-locals.el in your project directory, consider the 
sidecar-locals package.
+;; https://melpa.org/#/sidecar-locals
+;; https://codeberg.org/ideasman42/emacs-sidecar-locals
+;;
+
+;;; Code:
+(require 'php-project)
+
+(eval-when-compile
+  (require 'cl-lib)
+  (require 'php-ide-phpactor)
+  (defvar eglot-server-programs)
+  (declare-function eglot-ensure "ext:eglot" ())
+  (declare-function eglot--managed-mode-off "ext:eglot" ())
+  (declare-function phpactor--find-executable "ext:phpactor" ()))
+
+(defvar php-ide-feature-alist
+  '((none :test (lambda () t)
+  :activate (lambda () t)
+  :deactivate (lambda () t))
+(phpactor :test (lambda () (and (require 'phpactor nil t) (featurep 
'phpactor)))
+  :activate php-ide-phpactor-activate
+  :deactivate php-ide-phpactor-activate)
+(eglot :test (lambda () (and (require 'eglot nil t) (featurep 'eglot)))
+   :activate eglot-ensure
+   :deactivate eglo

[nongnu] elpa/php-mode acde9abad2 03/15: Add php-eglot.el

[ELPA Syncer]

branch: elpa/php-mode
commit acde9abad2777b9893a062ebc178313b0fb4b2cb
Author: USAMI Kenta 
Commit: USAMI Kenta 

Add php-eglot.el
---
 Cask  |   1 +
 Makefile  |   1 +
 lisp/php-eglot.el | 116 ++
 3 files changed, 118 insertions(+)

diff --git a/Cask b/Cask
index b0e67ed774..e090d524d5 100644
--- a/Cask
+++ b/Cask
@@ -7,6 +7,7 @@
  "lisp/php.el"
  "lisp/php-complete.el"
  "lisp/php-defs.el"
+ "lisp/php-eglot.el"
  "lisp/php-face.el"
  "lisp/php-format.el"
  "lisp/php-project.el"
diff --git a/Makefile b/Makefile
index dc60f90034..c2fc9ffe84 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,7 @@ ELS  = lisp/php.el
 ELS += lisp/php-align.el
 ELS += lisp/php-complete.el
 ELS += lisp/php-defs.el
+ELS += lisp/php-eglot.el
 ELS += lisp/php-face.el
 ELS += lisp/php-flymake.el
 ELS += lisp/php-format.el
diff --git a/lisp/php-eglot.el b/lisp/php-eglot.el
new file mode 100644
index 00..6a7875f346
--- /dev/null
+++ b/lisp/php-eglot.el
@@ -0,0 +1,116 @@
+;;; php-eglot.el --- Eglot enhancement for PHP development -*- 
lexical-binding: t; -*-
+
+;; Copyright (C) 2023  Friends of Emacs-PHP development
+
+;; Author: USAMI Kenta 
+;; Keywords: tools, files
+;; URL: https://github.com/emacs-php/php-mode
+;; Version: 1.24.0
+;; License: GPL-3.0-or-later
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see .
+
+;;; Commentary:
+
+;; PHP Mode integrates Eglot .
+;;
+;; **Note**:
+;; This feature is under development and experimental.
+;; All of these functions, modes and terms are subject to change without 
notice.
+;;
+;; ## Configuration
+;;
+;; Put follows code into your .emacs (~/.emacs.d/init.el) file:
+;;
+;; (add-to-list 'eglot-server-programs ((php-mode phps-mode) . 
php-eglot-server-program))
+;;
+;; ### For per project configuration
+;;
+;; Put follows code into .dir-locals.el in project directory:
+;;
+;; ((nil (php-project-root . git)
+;;   (php-eglot-executable . ("psalm-language-server"))
+;;   ;; or (php-eglot-executable . ("php" "vendor/bin/path/to/server"))
+;;   ))
+;;
+;; If you can't put .dir-locals.el in your project directory, consider the 
sidecar-locals package.
+;; https://melpa.org/#/sidecar-locals
+;; https://codeberg.org/ideasman42/emacs-sidecar-locals
+;;
+
+;;; Code:
+(require 'cl-lib)
+(require 'php-project)
+(require 'eglot nil t)
+(require 'phpactor nil t)
+
+(eval-when-compile
+  (defvar eglot-server-programs)
+  (defvar eglot--managed-mode)
+  (declare-function eglot-ensure "ext:eglot" ())
+  (declare-function phpactor--find-executable "ext:phpactor" ()))
+
+(defvar php-eglot-lsp-command-alist
+  '((intelephense "intelephense" "--stdio")
+(phpactor . (lambda () (list (if (require 'phpactor nil t)
+ (phpactor--find-executable)
+   "phpactor"))
+
+(defgroup php-eglot nil
+  "Eglot PHP integration."
+  :tag "PHP-Eglot"
+  :prefix "php-eglot-"
+  :group 'eglot
+  :group 'php)
+
+;;;###autoload
+(defcustom php-eglot-executable nil
+  "Command name or path to the command of Eglot LSP executable."
+  :tag "Php-Eglot Executable"
+  :group 'php-eglot
+  :type '(choice
+  (const intelephense)
+  (const phpactor)
+  string (repeat string))
+  :safe (lambda (v) (cond
+ ((stringp v) (file-exists-p v))
+ ((listp v) (cl-every #'stringp v))
+ ((assq v php-eglot-lsp-command-alist)
+
+;;;###autoload
+(defun php-eglot-server-program ()
+  "Return a list of command to execute LSP Server."
+  (cond
+   ((stringp php-eglot-executable) (list php-eglot-executable))
+   ((listp php-eglot-executable) php-eglot-executable)
+   ((when-let (command (assq php-eglot-executable php-eglot-lsp-command-alist))
+  (cond
+   ((functionp command) (funcall command))
+   ((listp command) command))
+
+(defun php-eglot-ensure ()
+  "Start PHP-specific Eglot session for current buffer if there isn't one."
+  (when-let (server-program (php-eglot-server-program))
+(setq-local eglot-server-programs (list (cons major-mode server-program
+  (setq-local project-find-functions (list 
#'php-project-project-find-function))
+  (add-function :after (local 'eglot--managed-mode) 
#'php-eglot--eglot--managed-mode-a

[nongnu] elpa/php-mode updated (8e874a8fd8 -> 47e0813079)

[ELPA Syncer]

elpasync pushed a change to branch elpa/php-mode.

  from  8e874a8fd8 Merge pull request #733 from 
emacs-php/feature/php-format-disable-async-format
   new  5d3e9462a2 Fix doc comment
   new  67d818928a Add php-ide-phpactor.el
   new  acde9abad2 Add php-eglot.el
   new  bb5bec31ee Add php-ide.el
   new  e45fa0766f Add lsp-bridge
   new  6d4ca45093 Add php-ide-mode-hooks
   new  91cd91a107 Remove php-eglot.el
   new  657a7b803d Update CHANGELOG
   new  a01bb220bf Add php-ide-eglot-server-program command
   new  ece3dd51ce Add php-ide-mode-functions instead of php-ide-mode-hooks
   new  c68e18c06b Merge pull request #709 from emacs-php/feature/php-ide
   new  bed4d8ced3 Bump up version 1.24.3
   new  c601f75fb9 Merge pull request #734 from emacs-php/release/v1.24.3
   new  2714393979 Make PHP Mode requires Emacs 26.1+
   new  47e0813079 Merge pull request #736 from emacs-php/drop/emacs-25


Summary of changes:
 .github/workflows/test.yml |   3 -
 CHANGELOG.md   |   8 +-
 Cask   |   6 +-
 Makefile   |   2 +
 README.ja.md   |   2 +-
 README.md  |   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-format.el |   2 +-
 lisp/php-ide-phpactor.el   | 127 
 lisp/php-ide.el| 240 +
 lisp/php-mode-debug.el |   2 +-
 lisp/php-mode.el   |   6 +-
 lisp/php-project.el|   2 +-
 lisp/php.el|   2 +-
 18 files changed, 395 insertions(+), 19 deletions(-)
 create mode 100644 lisp/php-ide-phpactor.el
 create mode 100644 lisp/php-ide.el

[nongnu] elpa/php-mode e45fa0766f 05/15: Add lsp-bridge

[ELPA Syncer]

branch: elpa/php-mode
commit e45fa0766f277df50b1b5a8bda2d8ac49d42cabd
Author: USAMI Kenta 
Commit: USAMI Kenta 

Add lsp-bridge
---
 lisp/php-ide.el | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lisp/php-ide.el b/lisp/php-ide.el
index e19de0b219..1342c1564e 100644
--- a/lisp/php-ide.el
+++ b/lisp/php-ide.el
@@ -43,6 +43,8 @@
 ;;  Does not launch any IDE features.
 ;;  - eglot
 ;;  https://github.com/joaotavora/eglot
+;;  - lsp-bridge
+;;  https://github.com/manateelazycat/lsp-bridge
 ;;  - lsp-mode
 ;;  https://emacs-lsp.github.io/lsp-mode/
 ;;  https://github.com/emacs-lsp/lsp-mode
@@ -88,6 +90,7 @@
   (require 'cl-lib)
   (require 'php-ide-phpactor)
   (defvar eglot-server-programs)
+  (declare-function lsp-bridge-mode "ext:lsp-bridge" ())
   (declare-function eglot-ensure "ext:eglot" ())
   (declare-function eglot--managed-mode-off "ext:eglot" ())
   (declare-function phpactor--find-executable "ext:phpactor" ()))
@@ -102,6 +105,9 @@
 (eglot :test (lambda () (and (require 'eglot nil t) (featurep 'eglot)))
:activate eglot-ensure
:deactivate eglot--managed-mode-off)
+(lsp-bridge :test (lambda () (and (require 'lsp-bridge nil t) (featurep 
'lsp-bridge)))
+:activate (lambda () (lsp-bridge-mode +1))
+:deactivate (lambda () (lsp-bridge-mode -1)))
 (lsp-mode :test (lambda () (and (require 'lsp nil t) (featurep 'lsp)))
   :activate lsp
   :deactivate lsp-workspace-shutdown)))
@@ -161,7 +167,7 @@
 (defun php-ide-turn-on ()
   "Turn on PHP IDE-FEATURES and execute `php-ide-mode'."
   (unless php-ide-features
-(user-error "No PHP-IDE feature is installed.  Install the lsp-mode, eglot 
or phpactor package"))
+(user-error "No PHP-IDE feature is installed.  Install the lsp-mode, 
lsp-bridge, eglot or phpactor package"))
   (php-ide-mode +1))
 
 (defun php-ide--activate-buffer (name ide-plist)

[nongnu] elpa/php-mode 67d818928a 02/15: Add php-ide-phpactor.el

[ELPA Syncer]

branch: elpa/php-mode
commit 67d818928af5b5748021f26ebc0ea1d02420e932
Author: USAMI Kenta 
Commit: USAMI Kenta 

Add php-ide-phpactor.el
---
 Cask |   2 +
 Makefile |   1 +
 lisp/php-ide-phpactor.el | 127 +++
 3 files changed, 130 insertions(+)

diff --git a/Cask b/Cask
index 1d85fe4990..b0e67ed774 100644
--- a/Cask
+++ b/Cask
@@ -11,9 +11,11 @@
  "lisp/php-format.el"
  "lisp/php-project.el"
  "lisp/php-local-manual.el"
+ "lisp/php-ide-phpactor.el"
  "lisp/php-mode-debug.el")
 
 (development
+ (depends-on "phpactor")
  (depends-on "pkg-info")
  (depends-on "projectile")
  (depends-on "smart-jump")
diff --git a/Makefile b/Makefile
index 12aadcda33..dc60f90034 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,7 @@ ELS += lisp/php-defs.el
 ELS += lisp/php-face.el
 ELS += lisp/php-flymake.el
 ELS += lisp/php-format.el
+ELS += lisp/php-ide-phpactor.el
 ELS += lisp/php-local-manual.el
 ELS += lisp/php-mode-debug.el
 ELS += lisp/php-mode.el
diff --git a/lisp/php-ide-phpactor.el b/lisp/php-ide-phpactor.el
new file mode 100644
index 00..3f73c80e75
--- /dev/null
+++ b/lisp/php-ide-phpactor.el
@@ -0,0 +1,127 @@
+;;; php-ide-phpactor.el --- PHP-IDE feature using Phpactor RPC -*- 
lexical-binding: t; -*-
+
+;; Copyright (C) 2023  Friends of Emacs-PHP development
+
+;; Author: USAMI Kenta 
+;; Keywords: tools, files
+;; URL: https://github.com/emacs-php/php-mode
+;; Version: 1.24.0
+;; License: GPL-3.0-or-later
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see .
+
+;;; Commentary:
+
+;; PHP-IDE implementation to integrate Phpactor (phpactor.el).
+;; This feature depends on .
+
+;;; Code:
+(require 'phpactor nil t)
+(require 'popup nil t)
+(require 'smart-jump nil t)
+(eval-when-compile
+  (require 'cl-lib))
+
+(defvar-local php-ide-phpactor-buffer nil)
+(defvar-local php-ide-phpactor-hover-last-pos nil)
+(defvar-local php-ide-phpactor-hover-last-msg nil)
+
+(declare-function phpactor--command-argments "ext:phpactor" (&rest arg-keys))
+(declare-function phpactor--parse-json "ext:phpactor" (buffer))
+(declare-function phpactor--rpc-async "ext:phpactor" (action arguments 
callback))
+(declare-function phpactor-goto-definition "ext:phpactor" ())
+(declare-function popup-tip "ext:popup" (string))
+(declare-function smart-jump-back "ext:smart-jump" ())
+(declare-function smart-jump-go "ext:smart-jump" (&optional smart-list 
continue))
+(declare-function smart-jump-references "ext:smart-jump" (&optional smart-list 
continue))
+
+(defgroup php-ide-phpactor nil
+  "UI support for PHP developing."
+  :tag "PHP-IDE Phpactor"
+  :prefix "php-ide-phpactor-"
+  :group 'php-ide)
+
+(defcustom php-ide-phpactor-activate-features '(all)
+  "A set of Phpactor features you want to enable."
+  :tag "PHP-IDE Phpactor Activate Features"
+  :type '(set (const all :tag "All")
+  (const hover)
+  (const navigation))
+  :safe (lambda (v) (and (listp v)))
+  :group 'php-ide-phpactor)
+
+(defvar php-ide-phpactor-timer nil
+  "Timer object for execute Phpactor and display hover message.")
+
+(defvar php-ide-phpactor-disable-hover-at-point-functions
+  '(php-in-string-or-comment-p))
+
+(defun php-ide-phpactor--disable-hover-at-point-p ()
+  "Return non-NIL if any function return non-NIL for disable to hover at 
point."
+  (cl-loop for f in php-ide-phpactor-disable-hover-at-point-functions
+   never (not (funcall f
+
+(defun php-ide-phpactor-hover ()
+  "Show brief information about the symbol underneath the cursor."
+  (interactive)
+  (when (and php-ide-phpactor-buffer (not 
(php-ide-phpactor--disable-hover-at-point-p)))
+(if (eq (point) php-ide-phpactor-hover-last-pos)
+(when php-ide-phpactor-hover-last-msg
+  (let ((msg php-ide-phpactor-hover-last-msg))
+(setq php-ide-phpactor-hover-last-msg nil)
+(popup-tip msg)))
+  (setq php-ide-phpactor-hover-last-pos (point))
+  (let ((main-buffer (current-buffer)))
+(phpactor--rpc-async "hover" (phpactor--command-argments :source 
:offset)
+  (lambda (proc)
+(let* ((response (phpactor--parse-json (process-buffer proc)))
+   (msg (plist-get (plist-get response :parameters) :message)))
+  (with-current-buffer main-buffer
+(setq ph

[nongnu] elpa/php-mode bed4d8ced3 12/15: Bump up version 1.24.3

[ELPA Syncer]

branch: elpa/php-mode
commit bed4d8ced39ecbfd6ac4961d88cb1ba9ddbaa939
Author: USAMI Kenta 
Commit: USAMI Kenta 

Bump up version 1.24.3
---
 CHANGELOG.md   | 4 +++-
 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-mode-debug.el | 2 +-
 lisp/php-mode.el   | 4 ++--
 lisp/php-project.el| 2 +-
 lisp/php.el| 2 +-
 11 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 21fa2d8c16..3652ffd09b 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
+
+
+## [1.24.3] - 2023-03-19
 
 ### Added
 
diff --git a/Cask b/Cask
index a52d38faaf..822f910126 100644
--- a/Cask
+++ b/Cask
@@ -1,4 +1,4 @@
-(package "php-mode" "1.24.2" "Major mode for editing PHP code")
+(package "php-mode" "1.24.3" "Major mode for editing PHP code")
 (source melpa)
 
 (package-file "lisp/php-mode.el")
diff --git a/lisp/php-align.el b/lisp/php-align.el
index b1ea3bf49d..bed857979e 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.2
+;; Version: 1.24.3
 ;; 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 e289943a2f..1decb6f8de 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.2
+;; Version: 1.24.3
 ;; 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 fc9e59c812..7b402db0fe 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.2
+;; Version: 1.24.3
 ;; 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 1106035c9a..73f9f15c7d 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.2
+;; Version: 1.24.3
 ;; 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 822336e589..28649dc31c 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.2
+;; Version: 1.24.3
 ;; Keywords: tools, languages, php
 
 ;; 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 9c69e2050b..dcbea71fb9 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.2
+;; Version: 1.24.3
 ;; 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 012f21ee29..626904895d 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.2
+;; Version: 1.24.3
 ;; Package-Requires: ((emacs "25.2"))
 ;; License: GPL-3.0-or-later
 
 (eval-and-compile
   (make-obsolete-variable
-   (defconst php-mode-version-number "1.24.2" "PHP Mode version number.")
+   (defconst php-mode-version-number "1.24.3" "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 f862a6720b..c338fa2f0d 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.2
+;; Version: 1.24.3
 ;; 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 3bff893b01..ae6ad647de 100644
--- a/lisp/php.el
+++ b/lisp/php.el
@@ -5,7 +5,7 @@
 
 ;; Author: USAMI Kenta 
 ;; Created: 5 Dec 2018
-;; Version: 1.24.2
+;; Version: 1.24.3
 ;; Keywords: languages, php
 ;; Homepage: https://github.com/emacs-php/php-mode
 ;; License: GPL-3.0-or-later

[nongnu] elpa/php-mode 2714393979 14/15: Make PHP Mode requires Emacs 26.1+

[ELPA Syncer]

branch: elpa/php-mode
commit 271439397990da38c045a99cadafc13ddfa7b9eb
Author: USAMI Kenta 
Commit: USAMI Kenta 

Make PHP Mode requires Emacs 26.1+
---
 .github/workflows/test.yml | 3 ---
 README.ja.md   | 2 +-
 README.md  | 2 +-
 lisp/php-mode.el   | 2 +-
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e9467d278d..b6eed3957a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -13,10 +13,7 @@ jobs:
 strategy:
   matrix:
 emacs_version:
-  - "25.2"
-  - "25.3"
   - "26.1"
-  - "26.2"
   - "26.3"
   - "27.1"
   - "27.2"
diff --git a/README.ja.md b/README.ja.md
index b97f06b895..65e31d7f6b 100644
--- a/README.ja.md
+++ b/README.ja.md
@@ -18,7 +18,7 @@ A powerful and flexible Emacs major mode for editing PHP 
scripts
 インストール
 
 
-**PHP ModeはEmacs 25.2以降で動作します**。古いバージョンのEmacsでも動作するかもしれませんが、保証外です。 
古いバージョンのEmacsのPHPモードを使用することによる問題のバグ報告は積極的に対応しません。現在のサポートポリシーは[Supported 
Version]のページをご覧ください。
+**PHP ModeはEmacs 26.1以降で動作します**。古いバージョンのEmacsでも動作するかもしれませんが、保証外です。 
古いバージョンのEmacsのPHPモードを使用することによる問題のバグ報告は積極的に対応しません。現在のサポートポリシーは[Supported 
Version]のページをご覧ください。
 
 ### **(推奨)** NonGNU ELPAからのインストール
 
diff --git a/README.md b/README.md
index 8b94717af6..9527810cb5 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ Please submit any bug reports or feature requests by creating 
issues on [the Git
 Installation
 
 
-**PHP Mode works on Emacs 25.2 or later.**  PHP Mode may work with older 
versions of Emacs but this is not guaranteed.  Bug reports for problems related 
to using PHP Mode with older versions of Emacs will most like *not* be 
addressed.
+**PHP Mode works on Emacs 26.1 or later.**  PHP Mode may work with older 
versions of Emacs but this is not guaranteed.  Bug reports for problems related 
to using PHP Mode with older versions of Emacs will most like *not* be 
addressed.
 
 The current support policy can be found on the [Supported Version] page.
 
diff --git a/lisp/php-mode.el b/lisp/php-mode.el
index 626904895d..dc854675d4 100644
--- a/lisp/php-mode.el
+++ b/lisp/php-mode.el
@@ -10,7 +10,7 @@
 ;; URL: https://github.com/emacs-php/php-mode
 ;; Keywords: languages php
 ;; Version: 1.24.3
-;; Package-Requires: ((emacs "25.2"))
+;; Package-Requires: ((emacs "26.1"))
 ;; License: GPL-3.0-or-later
 
 (eval-and-compile

[nongnu] elpa/php-mode ece3dd51ce 10/15: Add php-ide-mode-functions instead of php-ide-mode-hooks

[ELPA Syncer]

branch: elpa/php-mode
commit ece3dd51ce8ef349335042097a836ef4cd2ff03a
Author: USAMI Kenta 
Commit: USAMI Kenta 

Add php-ide-mode-functions instead of php-ide-mode-hooks
---
 lisp/php-ide.el | 30 ++
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/lisp/php-ide.el b/lisp/php-ide.el
index 8d6cc758a6..bd61e6ada3 100644
--- a/lisp/php-ide.el
+++ b/lisp/php-ide.el
@@ -57,9 +57,18 @@
 ;;
 ;; Put follows code into your .emacs (~/.emacs.d/init.el) file:
 ;;
-;; (defun my-php-mode-setup ()
+;; (defun init-php-mode-setup ()
 ;;   (add-hook 'hack-local-variables-hook #'php-ide-mode t t))
 ;;
+;; (defun init-php-ide-mode-setup (feature activate)
+;; (pcase feature
+;;   (`lsp-bridge
+;;(if activate
+;;(progn (yas-minor-mode +1)
+;;   (corfu-mode -1))
+;;  (yas-minor-mode -1)
+;;  (corfu-mode +1)
+;;
 ;; (with-eval-after-load 'php-ide
 ;;   (custom-set-variables
 ;;'(php-ide-features . 'eglot) ;; and/or 'none, 'phpactor, 'lsp-mode
@@ -67,7 +76,8 @@
 ;;;; If you want to hide php-ide-mode from the mode line, set an empty 
string
 ;;'(php-ide-mode-lighter ""))
 ;;
-;;   (add-hook 'php-mode #'my-php-mode-setup))
+;;   (add-hook 'php-mode-hook #'init-php-mode-setup)
+;;   (add-hook 'php-ide-mode-functions #'init-php-ide-mode-setup))
 ;;
 ;; If you don't enable IDE support by default, set '(php-ide-feature 'none)
 ;;
@@ -168,7 +178,19 @@
   :type 'string
   :safe #'stringp)
 
-(defvar php-ide-mode-hooks nil)
+(defcustom php-ide-mode-functions nil
+  "Hook functions called when before activating or deactivating PHP-IDE.
+Notice that two arguments (FEATURE ACTIVATE) are given.
+
+FEATURE: A symbol, like 'lsp-mode.
+ACTIVATE: T is given when activeting, NIL when deactivating PHP-IDE."
+  :tag "PHP-IDE Mode Functions"
+  :group 'php-ide
+  :type '(repeat function)
+  :safe (lambda (functions)
+  (and (listp functions)
+   (cl-loop for function in functions
+always (functionp function)
 
 ;;;###autoload
 (define-minor-mode php-ide-mode
@@ -182,11 +204,11 @@
   ide-features
   (mapconcat (lambda (feature) (concat "'" (symbol-name 
feature)))
  (php-ide--avilable-features) ", ")))
-(run-hooks 'php-ide-mode-hooks)
 (cl-loop for feature in ide-features
  for ide-plist = (cdr-safe (assq feature php-ide-feature-alist))
  do (if (null ide-plist)
 (message "Please set `php-ide-feature' variable in 
.dir-locals.el or custom variable")
+  (run-hook-with-args 'php-ide-mode-functions feature 
php-ide-mode)
   (if php-ide-mode
   (php-ide--activate-buffer feature ide-plist)
 (php-ide--deactivate-buffer ide-plist))

[nongnu] elpa/php-mode a01bb220bf 09/15: Add php-ide-eglot-server-program command

[ELPA Syncer]

branch: elpa/php-mode
commit a01bb220bfa1bf3991dbc79d50ea49342d7a6833
Author: USAMI Kenta 
Commit: USAMI Kenta 

Add php-ide-eglot-server-program command
---
 lisp/php-ide.el | 27 ++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/lisp/php-ide.el b/lisp/php-ide.el
index c0bf2e6876..8d6cc758a6 100644
--- a/lisp/php-ide.el
+++ b/lisp/php-ide.el
@@ -84,10 +84,10 @@
 ;;
 
 ;;; Code:
+(require 'cl-lib)
 (require 'php-project)
 
 (eval-when-compile
-  (require 'cl-lib)
   (require 'php-ide-phpactor)
   (defvar eglot-server-programs)
   (declare-function lsp-bridge-mode "ext:lsp-bridge" ())
@@ -136,6 +136,31 @@
   :safe (lambda (v) (cl-loop for feature in (if (listp v) v (list v))
  always (symbolp feature
 
+;;;###autoload
+(defcustom php-ide-eglot-executable nil
+  "Command name or path to the command of Eglot LSP executable."
+  :tag "PHP-IDE Eglot Executable"
+  :group 'php-ide
+  :type '(choice
+  (const intelephense)
+  (const phpactor)
+  string (repeat string))
+  :safe (lambda (v) (cond
+ ((stringp v) (file-exists-p v))
+ ((listp v) (cl-every #'stringp v))
+ ((assq v php-ide-lsp-command-alist)
+
+;;;###autoload
+(defun php-ide-eglot-server-program ()
+  "Return a list of command to execute LSP Server."
+  (cond
+   ((stringp php-ide-eglot-executable) (list php-ide-eglot-executable))
+   ((listp php-ide-eglot-executable) php-ide-eglot-executable)
+   ((when-let (command (assq php-ide-eglot-executable 
php-ide-lsp-command-alist))
+  (cond
+   ((functionp command) (funcall command))
+   ((listp command) command))
+
 (defcustom php-ide-mode-lighter " PHP-IDE"
   "A symbol of PHP-IDE feature."
   :tag "PHP-IDE Mode Lighter"

[nongnu] elpa/php-mode 47e0813079 15/15: Merge pull request #736 from emacs-php/drop/emacs-25

[ELPA Syncer]

branch: elpa/php-mode
commit 47e0813079cea6243139da2b6efedd36940367c8
Merge: c601f75fb9 2714393979
Author: USAMI Kenta 
Commit: GitHub 

Merge pull request #736 from emacs-php/drop/emacs-25

Make PHP Mode requires Emacs 26.1+
---
 .github/workflows/test.yml | 3 ---
 README.ja.md   | 2 +-
 README.md  | 2 +-
 lisp/php-mode.el   | 2 +-
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e9467d278d..b6eed3957a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -13,10 +13,7 @@ jobs:
 strategy:
   matrix:
 emacs_version:
-  - "25.2"
-  - "25.3"
   - "26.1"
-  - "26.2"
   - "26.3"
   - "27.1"
   - "27.2"
diff --git a/README.ja.md b/README.ja.md
index b97f06b895..65e31d7f6b 100644
--- a/README.ja.md
+++ b/README.ja.md
@@ -18,7 +18,7 @@ A powerful and flexible Emacs major mode for editing PHP 
scripts
 インストール
 
 
-**PHP ModeはEmacs 25.2以降で動作します**。古いバージョンのEmacsでも動作するかもしれませんが、保証外です。 
古いバージョンのEmacsのPHPモードを使用することによる問題のバグ報告は積極的に対応しません。現在のサポートポリシーは[Supported 
Version]のページをご覧ください。
+**PHP ModeはEmacs 26.1以降で動作します**。古いバージョンのEmacsでも動作するかもしれませんが、保証外です。 
古いバージョンのEmacsのPHPモードを使用することによる問題のバグ報告は積極的に対応しません。現在のサポートポリシーは[Supported 
Version]のページをご覧ください。
 
 ### **(推奨)** NonGNU ELPAからのインストール
 
diff --git a/README.md b/README.md
index 8b94717af6..9527810cb5 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ Please submit any bug reports or feature requests by creating 
issues on [the Git
 Installation
 
 
-**PHP Mode works on Emacs 25.2 or later.**  PHP Mode may work with older 
versions of Emacs but this is not guaranteed.  Bug reports for problems related 
to using PHP Mode with older versions of Emacs will most like *not* be 
addressed.
+**PHP Mode works on Emacs 26.1 or later.**  PHP Mode may work with older 
versions of Emacs but this is not guaranteed.  Bug reports for problems related 
to using PHP Mode with older versions of Emacs will most like *not* be 
addressed.
 
 The current support policy can be found on the [Supported Version] page.
 
diff --git a/lisp/php-mode.el b/lisp/php-mode.el
index 626904895d..dc854675d4 100644
--- a/lisp/php-mode.el
+++ b/lisp/php-mode.el
@@ -10,7 +10,7 @@
 ;; URL: https://github.com/emacs-php/php-mode
 ;; Keywords: languages php
 ;; Version: 1.24.3
-;; Package-Requires: ((emacs "25.2"))
+;; Package-Requires: ((emacs "26.1"))
 ;; License: GPL-3.0-or-later
 
 (eval-and-compile

[nongnu] elpa/php-mode c68e18c06b 11/15: Merge pull request #709 from emacs-php/feature/php-ide

[ELPA Syncer]

branch: elpa/php-mode
commit c68e18c06b911a4d87607eb9991fc3b8dd3729ec
Merge: 5d3e9462a2 ece3dd51ce
Author: USAMI Kenta 
Commit: GitHub 

Merge pull request #709 from emacs-php/feature/php-ide

Experimental feature: PHP-IDE
---
 CHANGELOG.md |   4 +
 Cask |   4 +
 Makefile |   2 +
 lisp/php-ide-phpactor.el | 127 +
 lisp/php-ide.el  | 240 +++
 5 files changed, 377 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index de0f8d111b..21fa2d8c16 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,9 @@ All notable changes of the PHP Mode 1.19.1 release series are 
documented in this
  * **Net feature**: `php-format` ([#731])
* Add `php-format-project` and `php-format-this-buffer-file` commands
* Add `php-format-auto-mode` minor mode
+ * **Experimental feature: `php-ide`** ([#709])
+   * Add `php-ide-phpactor` as simple IDE feature without LSP clients
+   * Add `php-ide-mode` minor mode for binding IDE-like features
 
 ### Fixed
 
@@ -19,6 +22,7 @@ All notable changes of the PHP Mode 1.19.1 release series are 
documented in this
  * No longer highlights `'link` in PHPDoc ([#724])
* Please use `goto-address-prog-mode` minor mode
 
+[#709]: https://github.com/emacs-php/php-mode/pull/709
 [#724]: https://github.com/emacs-php/php-mode/pull/724
 [#726]: https://github.com/emacs-php/php-mode/pull/726
 [#731]: https://github.com/emacs-php/php-mode/pull/731
diff --git a/Cask b/Cask
index 1d85fe4990..a52d38faaf 100644
--- a/Cask
+++ b/Cask
@@ -11,9 +11,13 @@
  "lisp/php-format.el"
  "lisp/php-project.el"
  "lisp/php-local-manual.el"
+ "lisp/php-ide-phpactor.el"
+ "lisp/php-ide.el"
  "lisp/php-mode-debug.el")
 
 (development
+ ;;(depends-on "lsp-mode")
+ (depends-on "phpactor")
  (depends-on "pkg-info")
  (depends-on "projectile")
  (depends-on "smart-jump")
diff --git a/Makefile b/Makefile
index 12aadcda33..77474be14d 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,8 @@ ELS += lisp/php-defs.el
 ELS += lisp/php-face.el
 ELS += lisp/php-flymake.el
 ELS += lisp/php-format.el
+ELS += lisp/php-ide-phpactor.el
+ELS += lisp/php-ide.el
 ELS += lisp/php-local-manual.el
 ELS += lisp/php-mode-debug.el
 ELS += lisp/php-mode.el
diff --git a/lisp/php-ide-phpactor.el b/lisp/php-ide-phpactor.el
new file mode 100644
index 00..3f73c80e75
--- /dev/null
+++ b/lisp/php-ide-phpactor.el
@@ -0,0 +1,127 @@
+;;; php-ide-phpactor.el --- PHP-IDE feature using Phpactor RPC -*- 
lexical-binding: t; -*-
+
+;; Copyright (C) 2023  Friends of Emacs-PHP development
+
+;; Author: USAMI Kenta 
+;; Keywords: tools, files
+;; URL: https://github.com/emacs-php/php-mode
+;; Version: 1.24.0
+;; License: GPL-3.0-or-later
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see .
+
+;;; Commentary:
+
+;; PHP-IDE implementation to integrate Phpactor (phpactor.el).
+;; This feature depends on .
+
+;;; Code:
+(require 'phpactor nil t)
+(require 'popup nil t)
+(require 'smart-jump nil t)
+(eval-when-compile
+  (require 'cl-lib))
+
+(defvar-local php-ide-phpactor-buffer nil)
+(defvar-local php-ide-phpactor-hover-last-pos nil)
+(defvar-local php-ide-phpactor-hover-last-msg nil)
+
+(declare-function phpactor--command-argments "ext:phpactor" (&rest arg-keys))
+(declare-function phpactor--parse-json "ext:phpactor" (buffer))
+(declare-function phpactor--rpc-async "ext:phpactor" (action arguments 
callback))
+(declare-function phpactor-goto-definition "ext:phpactor" ())
+(declare-function popup-tip "ext:popup" (string))
+(declare-function smart-jump-back "ext:smart-jump" ())
+(declare-function smart-jump-go "ext:smart-jump" (&optional smart-list 
continue))
+(declare-function smart-jump-references "ext:smart-jump" (&optional smart-list 
continue))
+
+(defgroup php-ide-phpactor nil
+  "UI support for PHP developing."
+  :tag "PHP-IDE Phpactor"
+  :prefix "php-ide-phpactor-"
+  :group 'php-ide)
+
+(defcustom php-ide-phpactor-activate-features '(all)
+  "A set of Phpactor features you want to enable."
+  :tag "PHP-IDE Phpactor Activate Features"
+  :type '(set (const all :tag "All")
+  (const hover)
+  (const navigation))
+  :safe (lambda (v) (and (listp v)))
+  :group 'php-ide-phpactor)
+
+(defvar php-ide-phpactor-timer nil
+  "Timer object for execute Phpactor and

[nongnu] elpa/xah-fly-keys 7e0d33170c: xah-fly-command-mode-activate now bound to too. (works in gui emacs only.) reason:

[ELPA Syncer]

branch: elpa/xah-fly-keys
commit 7e0d33170c05ed3fe364430df7e8cdb4a36bfd70
Author: Xah Lee 
Commit: Xah Lee 

xah-fly-command-mode-activate now bound to  too. (works in gui 
emacs only.) reason:

advantage of making esc key do activate command mode:

- familiar to most people
- one less key. (if you use home key, it's an extra key on your physical 
keyboard but otherwise the Home key function isn't much used these days.)

disadvantage:

- esc by default is at hard to press spot. induces Repetitive Strain Injury.
- by emacs quirk,  means esc key in gui mode only. while ESC means 
esc key in both gui and terminal, but binding ESC, will break arrow keys and f1 
f2 etc keys, due to how terminal works (terminal keys are actually esc 
sequences).

in the end, i decided to bind it. you should esc key position on your 
keyboard capslock position, or, when pressing esc on the left corner, don't 
twist your wrist, but move whole hand to it. and, when in terminal, no choice 
but to press other keys to activate command mode, such as M-SPC.
---
 xah-fly-keys.el | 15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/xah-fly-keys.el b/xah-fly-keys.el
index 787908f333..0bd988f5a5 100644
--- a/xah-fly-keys.el
+++ b/xah-fly-keys.el
@@ -4,7 +4,7 @@
 
 ;; Author: Xah Lee ( http://xahlee.info/ )
 ;; Maintainer: Xah Lee 
-;; Version: 23.0.20230310115257
+;; Version: 23.1.20230318191051
 ;; Created: 10 Sep 2013
 ;; Package-Requires: ((emacs "24.1"))
 ;; Keywords: convenience, emulations, vim, ergoemacs
@@ -25,9 +25,9 @@
 
 ;; Important command/insert mode switch keys:
 
-;; xah-fly-command-mode-activate (press  or F8 or Alt+Space or 
Ctrl+Space or menu key)
+;; `xah-fly-command-mode-activate' (press  or  or F8 or 
Alt+Space or Ctrl+Space or menu key. Note: escape only works when in GUI mode, 
by design.)
 
-;; xah-fly-insert-mode-activate (when in command mode, press qwerty letter key 
f.)
+;; `xah-fly-insert-mode-activate' (when in command mode, press qwerty letter 
key f.)
 
 ;; When in command mode:
 
@@ -2598,7 +2598,7 @@ Backup filename is “‹name›~‹dateTimeStamp›~”. Existing 
file of the s
 Call `xah-open-last-closed' to open the backup file.
 
 URL `http://xahlee.info/emacs/emacs/elisp_delete-current-file.html'
-Version: 2018-05-15 2021-08-31 2021-09-27 2022-07-08"
+Version: 2018-05-15 2021-08-31 2021-09-27 2022-07-08 2023-03-15"
   (interactive)
   (if (string-equal 'dired-mode major-mode)
   (message "In dired. Nothing is done.")
@@ -2616,8 +2616,10 @@ Version: 2018-05-15 2021-08-31 2021-09-27 2022-07-08"
 (delete-file xfname))
 (progn
   (widen)
-  (kill-new  (buffer-string
-  (kill-buffer (current-buffer)
+  (kill-new (buffer-string
+  (kill-buffer (current-buffer))
+  (when (eq major-mode 'dired-mode)
+(revert-buffer)
 
 
 
@@ -3056,6 +3058,7 @@ Version 2022-10-31"
  xah-fly-shared-map
  '(("" . xah-fly-command-mode-activate)
("" . xah-fly-command-mode-activate)
+   ("" . xah-fly-command-mode-activate)
("" . xah-fly-command-mode-activate))
  :direct)
 

[nongnu] elpa/meow fb61ce5943: Add visual-line versions of some MEOW operations/entities (#416)

[ELPA Syncer]

branch: elpa/meow
commit fb61ce5943d7ad11f4a7350e4b561947bbbaea71
Author: Benjamin Slade 
Commit: GitHub 

Add visual-line versions of some MEOW operations/entities (#416)

- `meow-visual-line` as visual-line counterpart to `meow-line`
- `visual-line` as a new 'meow-thing
- `meow-open-below-visual` as visual-line counterpart to `meow-open-below`
- `meow-open-above-visual` as visual-line counterpart to `meow-open-above`
---
 meow-command.el | 105 
 meow-thing.el   |   6 
 meow-var.el |   1 +
 3 files changed, 112 insertions(+)

diff --git a/meow-command.el b/meow-command.el
index 13602c6ffd..978e7ae44c 100644
--- a/meow-command.el
+++ b/meow-command.el
@@ -468,6 +468,19 @@ This command supports `meow-selection-command-fallback'."
 ;;   (insert "\n"))
 (indent-according-to-mode)))
 
+(defun meow-open-above-visual ()
+  "Open a newline above and switch to INSERT state."
+  (interactive)
+  (if meow--temp-normal
+  (progn
+(message "Quit temporary normal mode")
+(meow--switch-state 'motion))
+(meow--switch-state 'insert)
+(goto-char (meow--visual-line-beginning-position))
+(save-mark-and-excursion
+  (newline))
+(indent-according-to-mode)))
+
 (defun meow-open-below ()
   "Open a newline below and switch to INSERT state."
   (interactive)
@@ -479,6 +492,17 @@ This command supports `meow-selection-command-fallback'."
 (goto-char (line-end-position))
 (meow--execute-kbd-macro "RET")))
 
+(defun meow-open-below-visual ()
+  "Open a newline below and switch to INSERT state."
+  (interactive)
+  (if meow--temp-normal
+  (progn
+(message "Quit temporary normal mode")
+(meow--switch-state 'motion))
+(meow--switch-state 'insert)
+(goto-char (meow--visual-line-end-position))
+(meow--execute-kbd-macro "RET")))
+
 (defun meow-change ()
   "Kill current selection and switch to INSERT state.
 
@@ -944,6 +968,87 @@ This command will expand line selection."
   (meow--select (> orig-p beg)))
 (recenter)))
 
+;; visual line versions
+(defun meow--visual-line-beginning-position ()
+  (save-excursion
+(beginning-of-visual-line)
+(point)))
+
+(defun meow--visual-line-end-position ()
+  (save-excursion
+(end-of-visual-line)
+(point)))
+
+(defun meow--forward-visual-line-1 ()
+  (let ((orig (point)))
+(line-move-visual 1)
+(if meow--expanding-p
+(progn
+  (goto-char (meow--visual-line-end-position))
+  (meow--visual-line-end-position))
+  (when (< orig (meow--visual-line-beginning-position))
+(meow--visual-line-beginning-position)
+
+(defun meow--backward-visual-line-1 ()
+  (line-move-visual -1)
+  (meow--visual-line-beginning-position))
+
+(defun meow-visual-line (n &optional expand)
+  "Select the current visual line, eol is not included.
+
+Create selection with type (expand . line).
+For the selection with type (expand . line), expand it by line.
+For the selection with other types, cancel it.
+
+Prefix:
+numeric, repeat times.
+"
+  (interactive "p")
+  (unless (or expand (equal '(expand . line) (meow--selection-type)))
+(meow--cancel-selection))
+  (let* ((orig (mark t))
+ (n (if (meow--direction-backward-p)
+(- n)
+  n))
+ (forward (> n 0)))
+(cond
+ ((region-active-p)
+  (let (p)
+(save-mark-and-excursion
+  (line-move-visual n)
+  (goto-char
+   (if forward
+   (setq p (meow--visual-line-end-position))
+ (setq p (meow--visual-line-beginning-position)
+(thread-first
+  (meow--make-selection '(expand . line) orig p expand)
+  (meow--select))
+(meow--maybe-highlight-num-positions '(meow--backward-visual-line-1 . 
meow--forward-visual-line-1
+ (t
+  (let ((m (if forward
+   (meow--visual-line-beginning-position)
+ (meow--visual-line-end-position)))
+(p (save-mark-and-excursion
+ (if forward
+ (progn
+   (line-move-visual (1- n))
+   (meow--visual-line-end-position))
+   (progn
+ (line-move-visual (1+ n))
+ (when (meow--empty-line-p)
+   (backward-char 1))
+ (meow--visual-line-beginning-position))
+(thread-first
+  (meow--make-selection '(expand . line) m p expand)
+  (meow--select))
+(meow--maybe-highlight-num-positions '(meow--backward-visual-line-1 . 
meow--forward-visual-line-1)))
+
+(defun meow-visual-line-expand (n)
+  "Like `meow-line', but always expand."
+  (interactive "p")
+  (meow-visual-line n t))
+
+
 ;;
 ;;; BLOCK
 ;
diff -

[nongnu] elpa/doc-show-inline 261554a788: Exclude commands from evil-mode repeat

[ELPA Syncer]

branch: elpa/doc-show-inline
commit 261554a788e9cc6c0ba538a732667e514fab70c6
Author: Campbell Barton 
Commit: Campbell Barton 

Exclude commands from evil-mode repeat
---
 changelog.rst  |  3 +++
 doc-show-inline.el | 14 ++
 2 files changed, 17 insertions(+)

diff --git a/changelog.rst b/changelog.rst
index d13f06cd97..75d0f1fa46 100644
--- a/changelog.rst
+++ b/changelog.rst
@@ -3,6 +3,9 @@
 Change Log
 ##
 
+- 2023-03-19
+  - Exclude commands from evil-mode repeat.
+
 - 2022-11-20
   - Fix use with ``eglot``.
 
diff --git a/doc-show-inline.el b/doc-show-inline.el
index 5c10f3cc67..e1d8adad6f 100644
--- a/doc-show-inline.el
+++ b/doc-show-inline.el
@@ -162,6 +162,9 @@ When unset, the :filter property from 
`doc-show-inline-mode-defaults' is used.")
 
 (defvar-local doc-show-inline--idle-timer nil)
 
+;; List of interactive commands.
+(defconst doc-show-inline--commands (list 'doc-show-inline-buffer 
'doc-show-inline-mode))
+
 
 ;; ---
 ;; Idle Overlay (Package Development / Debugging Only)
@@ -973,6 +976,17 @@ When IS-INTERACTIVE is true, use 
`doc-show-inline-idle-delay-init'."
(t
 (doc-show-inline--mode-disable
 
+;; Evil Mode (setup if in use).
+;;
+;; Don't let these commands repeat as they are for the UI, not editor.
+;;
+;; Notes:
+;; - Package lint complains about using this command,
+;;   however it's needed to avoid issues with `evil-mode'.
+(declare-function evil-declare-not-repeat "ext:evil-common")
+(with-eval-after-load 'evil
+  (mapc #'evil-declare-not-repeat doc-show-inline--commands))
+
 (provide 'doc-show-inline)
 ;; Local Variables:
 ;; fill-column: 99