diff options
| author | Yuuki Harano <masm+github@masm11.me> | 2021-11-11 00:39:53 +0900 |
|---|---|---|
| committer | Yuuki Harano <masm+github@masm11.me> | 2021-11-11 00:39:53 +0900 |
| commit | 4dd1f56f29fc598a8339a345c2f8945250600602 (patch) | |
| tree | af341efedffe027e533b1bcc0dbf270532e48285 /lisp/jsonrpc.el | |
| parent | 4c49ec7f865bdad1629d2f125f71f4e506b258f2 (diff) | |
| parent | 810fa21d26453f898de9747ece7205dfe6de9d08 (diff) | |
| download | emacs-4dd1f56f29fc598a8339a345c2f8945250600602.tar.gz emacs-4dd1f56f29fc598a8339a345c2f8945250600602.tar.bz2 emacs-4dd1f56f29fc598a8339a345c2f8945250600602.zip | |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs into feature/pgtk
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 f1fb6c1ddaf..02db199c7f7 100644 --- a/lisp/jsonrpc.el +++ b/lisp/jsonrpc.el @@ -219,7 +219,7 @@ object, using the keywords `:code', `:message' and `:data'." (jsonrpc-error-message . ,msg)))) (cl-destructuring-bind (&key code message data) args (signal 'jsonrpc-error - `(,(format "[jsonrpc] error ") + `("[jsonrpc] error " (jsonrpc-error-code . ,code) (jsonrpc-error-message . ,message) (jsonrpc-error-data . ,data)))))) @@ -239,7 +239,7 @@ 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 `jrpc-default-request-timeout'), the caller can expect TIMEOUT-FN -to be called with no arguments. The default values of SUCCESS-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'. @@ -363,7 +363,7 @@ expected to understand JSONRPC messages with basic HTTP-style enveloping headers such as \"Content-Length:\". :ON-SHUTDOWN (optional), a function of one argument, the -connection object, called when the process dies .") +connection object, called when the process dies.") (cl-defmethod initialize-instance ((conn jsonrpc-process-connection) slots) (cl-call-next-method) |