]> git.eshelyaron.com Git - emacs.git/commit
Merge branch 'cquery-support' into master
authorJoão Távora <joaotavora@gmail.com>
Sat, 26 May 2018 18:10:45 +0000 (19:10 +0100)
committerJoão Távora <joaotavora@gmail.com>
Sat, 26 May 2018 18:10:45 +0000 (19:10 +0100)
commitd366cc04b706d02e26016fba470240ba2fa7a8a2
treeef90cca6c6fc11d664c65e0c5c12a8e067c74d3d
parent004702460d4516306d5a1bae640bce9a367715f1
parent9c14cfd179b43f1de87bbb0aca83ba0c34288eb4
Merge branch 'cquery-support' into master

The conflicts in eglot.el where fixed by calling the new eglot--debug
helper coming from 'cquery-support'. This helper was converted to
allow a non-string format passed directly to eglot--log-event.

Also fixed some compilation warnings.

* eglot.el (eglot--debug): Allow non-string FORMAT to be a JSON
object.  (eglot-handle-notification :$cquery/progress)
(eglot-handle-notification :$cquery/setInactiveRegions)
(eglot-handle-notification :$cquery/publishSemanticHighlighting):
Solve compilation warnings.
lisp/progmodes/eglot.el