mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

; Fix merge snafus

Browse source 
* lisp/jsonrpc.el:
* lisp/progmodes/eglot.el: Fix merge snafus.
This commit is contained in:
Eli Zaretskii 2024-01-20 06:37:09 -05:00
parent 1b31a784bf
commit 8bb5525b62
2 changed files with 3 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lisp/jsonrpc.el
View file

@ -689,6 +689,9 @@ With optional CLEANUP, kill any associated buffers."
(when-let (p (slot-value connection '-autoport-inferior)) (delete-process p))
(funcall (jsonrpc--on-shutdown connection) connection)))))
(defvar jsonrpc--in-process-filter nil
"Non-nil if inside `jsonrpc--process-filter'.")
(cl-defun jsonrpc--process-filter (proc string)
"Called when new data STRING has arrived for PROC."
(when jsonrpc--in-process-filter