commit e0244f58042740c8fe914e7abe5b02611b176bc2 (HEAD, refs/remotes/origin/master)
Author: Eshel Yaron <me@eshelyaron.com>
Date:   Sat Jun 24 17:16:19 2023 +0300

    ; * lisp/progmodes/project.el (project-current): Doc fix.
    
    Avoid saying that 'project-current' asks specifically for a
    directory, as it can also ask for a project's directory by other
    identifiers, such as the project's name, when 'project-prompter'
    is set to a different value than the default
    'project-prompt-project-dir'.  (Bug#64266)

diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index 1d5a5fa5c63..03ed966cc45 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -219,8 +219,10 @@ project-current
 
 When no project is found in that directory, the result depends on
 the value of MAYBE-PROMPT: if it is nil or omitted, return nil,
-else ask the user for a directory in which to look for the
-project, and if no project is found there, return a \"transient\"
+else prompt the user for the project to use.  To prompt for a
+project, call the function specified by `project-prompter', which
+returns the directory in which to look for the project.  If no
+project is found in that directory, return a \"transient\"
 project instance.
 
 The \"transient\" project instance is a special kind of value

commit d861de72289464e336c772f1741016a90a2118c5
Author: Po Lu <luangruo@yahoo.com>
Date:   Wed Jul 12 18:07:53 2023 +0800

    Minor correction to X error handling
    
    * src/xterm.c (x_error_handler): Clear fail->selection_serial
    after reporting an error during selection transfer, in case any
    other outstanding requests within the protected section also
    report errors.

diff --git a/src/xterm.c b/src/xterm.c
index d65a6829b45..9ecead03b08 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -26439,9 +26439,18 @@ x_error_handler (Display *display, XErrorEvent *event)
 
 	  /* If a selection transfer is the cause of this error,
 	     remove the selection transfer now.  */
+
 	  if (fail->selection_serial)
-	    x_handle_selection_error (fail->selection_serial,
-				      event);
+	    {
+	      x_handle_selection_error (fail->selection_serial,
+					event);
+
+	      /* Clear selection_serial to prevent
+		 x_handle_selection_error from being called again if
+		 any more requests within the protected section cause
+		 errors to be reported.  */
+	      fail->selection_serial = 0;
+	    }
 
 	  return 0;
 	}

commit 82edb3fdb00df69e9631d6506c61d5e86477b403
Author: Po Lu <luangruo@yahoo.com>
Date:   Wed Jul 12 18:04:03 2023 +0800

    Improve commentary
    
    * src/xterm.c (x_ignore_errors_for_next_request): Reword
    description of SELECTION_SERIAL.

diff --git a/src/xterm.c b/src/xterm.c
index f84eaeb8cbd..d65a6829b45 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -25848,10 +25848,12 @@ x_clean_failable_requests (struct x_display_info *dpyinfo)
 				    + (last - first));
 }
 
-/* Protect a section of X requests: ignore errors generated by X
-   requests made from now until `x_stop_ignoring_errors'.  Each call
-   must be paired with a call to `x_stop_ignoring_errors', and
-   recursive calls inside the protected section are not allowed.
+/* Protect a section of X requests.
+
+   Ignore errors generated by X requests made from now until
+   `x_stop_ignoring_errors'.  Each call must be paired with a call to
+   `x_stop_ignoring_errors', and recursive calls inside the protected
+   section are not allowed.
 
    The advantage over x_catch_errors followed by
    x_uncatch_errors_after_check is that this function does not sync to
@@ -25859,11 +25861,10 @@ x_clean_failable_requests (struct x_display_info *dpyinfo)
    those two functions for catching errors around requests that do not
    require a reply.
 
-   As a special feature intended to support xselect.c,
-   SELECTION_SERIAL may be an arbitrary number greater than zero: when
-   that is the case, x_select_handle_selection_error is called with
-   the specified number to delete the selection request that
-   encountered the error.  */
+   If SELECTION_SERIAL is an arbitrary number greater than zero,
+   x_select_handle_selection_error is called with the specified number
+   after any errors within the protected section are received to
+   delete the selection request that encountered errors.  */
 
 void
 x_ignore_errors_for_next_request (struct x_display_info *dpyinfo,

commit bc1e7b9b8e681346e407c4dc32272a0bf4decd68
Author: João Távora <joaotavora@gmail.com>
Date:   Wed Jul 12 10:11:34 2023 +0100

    Eglot: fix advertisement of textDocument.codeAction.resolveSupport
    
    See https://github.com/joaotavora/eglot/issues/1255.
    
    * lisp/progmodes/eglot.el (eglot-client-capabilities):
    Use correct format for textDocument.codeAction.resolveSupport.

diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index 0c46e4a5290..8ac21638a5b 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -828,7 +828,8 @@ eglot-client-capabilities
              :documentHighlight  `(:dynamicRegistration :json-false)
              :codeAction         (list
                                   :dynamicRegistration :json-false
-                                  :resolveSupport t :dataSupport t
+                                  :resolveSupport `(:properties ["edit" "command"])
+                                  :dataSupport t
                                   :codeActionLiteralSupport
                                   '(:codeActionKind
                                     (:valueSet