diff options
| author | Glenn Morris <rgm@gnu.org> | 2020-10-02 09:38:24 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2020-10-02 09:38:24 -0700 |
| commit | 726eb835ddcbc209545f681d7272ebaa13788b33 (patch) | |
| tree | 48a8efe3696f67cdd5c1258bf83b85d39ab949e9 /lisp/jsonrpc.el | |
| parent | bd080957b069e4ed0e31ce5f029a529432524f46 (diff) | |
| parent | 78eacf31e8fe182801ad1943fac717b75fcf286b (diff) | |
| download | emacs-726eb835ddcbc209545f681d7272ebaa13788b33.tar.gz | |
Merge from origin/emacs-27
78eacf31e8 ; Fix many typos in symbols in docs and comments
d5d12707d6 * doc/misc/flymake.texi (Using Flymake): Fix a typo. (Bug...
# Conflicts:
# lisp/allout.el
# lisp/progmodes/ebrowse.el
Diffstat (limited to 'lisp/jsonrpc.el')
| -rw-r--r-- | lisp/jsonrpc.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/jsonrpc.el b/lisp/jsonrpc.el index b319bf6e924..ffbc253a976 100644 --- a/lisp/jsonrpc.el +++ b/lisp/jsonrpc.el @@ -239,8 +239,8 @@ JSON object. The caller can expect SUCCESS-FN or ERROR-FN to be called with a JSONRPC `:result' or `:error' object, respectively. If this doesn't happen after TIMEOUT seconds (defaults to -`jsonrpc-request-timeout'), the caller can expect TIMEOUT-FN to be -called with no arguments. The default values of SUCCESS-FN, +`jrpc-default-request-timeout'), the caller can expect TIMEOUT-FN +to be called with no arguments. The default values of SUCCESS-FN, ERROR-FN and TIMEOUT-FN simply log the events into `jsonrpc-events-buffer'. @@ -649,7 +649,7 @@ TIMEOUT is nil)." (if (jsonrpc-connection-ready-p connection deferred) ;; Server is ready, we jump below and send it immediately. (remhash (list deferred buf) (jsonrpc--deferred-actions connection)) - ;; Otherwise, save in `eglot--deferred-actions' and exit non-locally + ;; Otherwise, save in `jsonrpc--deferred-actions' and exit non-locally (unless old-id (jsonrpc--debug connection `(:deferring ,method :id ,id :params ,params))) |