From: João Távora <joaotavora@gmail.com>
Date: Sat, 9 Jun 2018 20:13:19 +0000 (+0100)
Subject: Merge branch 'master' into jsonrpc-refactor
X-Git-Tag: emacs-29.0.90~1616^2~524^2~4^2~489^2~5
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dbf42e651aff5a1b5bd19faa7cde5e43e3967901;p=emacs.git

Merge branch 'master' into jsonrpc-refactor
---

dbf42e651aff5a1b5bd19faa7cde5e43e3967901
diff --cc lisp/progmodes/eglot.el
index 70d133bc49f,4d3a46970e3..60a03228dd1
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@@ -1316,10 -1635,10 +1328,10 @@@ If SKIP-SIGNATURE, don't try to send te
               ((and (memq action '(created changed deleted))
                     (cl-find file globs
                              :test (lambda (f glob)
-                                     (string-match (wildcard-to-regexp
+                                     (string-match (eglot--wildcard-to-regexp
                                                     (expand-file-name glob))
                                                    f))))
 -              (eglot--notify
 +              (jsonrpc-notify
                 server :workspace/didChangeWatchedFiles
                 `(:changes ,(vector `(:uri ,(eglot--path-to-uri file)
                                            :type ,(cl-case action