feature/android b36dc0815ba 2/2: Merge remote-tracking branch 'origin/master' into feature/android

[Po Lu]

branch: feature/android
commit b36dc0815ba753bc98b1e0b0fd21bb50ba90d8ae
Merge: 674373bed86 3c01060c023
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Merge remote-tracking branch 'origin/master' into feature/android
---
 lisp/progmodes/eglot.el | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index c5a58d7ace6..7d5d786dea3 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -3586,11 +3586,10 @@ at point.  With prefix argument, prompt for 
ACTION-KIND."
   (server (_method (eql workspace/didChangeWatchedFiles)) id)
   "Handle dynamic unregistration of workspace/didChangeWatchedFiles."
   (maphash (lambda (dir watch-and-ids)
-             (when (member id (cdr watch-and-ids))
-               (setcdr watch-and-ids (delete id (cdr watch-and-ids)))
-               (when (null (cdr watch-and-ids))
-                 (file-notify-rm-watch (car watch-and-ids))
-                 (remhash dir (eglot--file-watches server)))))
+             (setcdr watch-and-ids (delete id (cdr watch-and-ids)))
+             (when (null (cdr watch-and-ids))
+               (file-notify-rm-watch (car watch-and-ids))
+               (remhash dir (eglot--file-watches server))))
            (eglot--file-watches server))
   (list t "OK"))