Various insignificant changes

This commit is contained in:
Nathaniel Nicandro 2018-01-22 19:24:26 -06:00
parent 5365052273
commit db3a73d48f

View file

@ -142,7 +142,7 @@ connection is terminated before initializing."
;; parent-instance, see if the parent instance has it ;; parent-instance, see if the parent instance has it
(or (ignore-errors (oref client conn-info)) (or (ignore-errors (oref client conn-info))
(signal 'unbound-slot (signal 'unbound-slot
(list 'json-plist client 'conn-info)))))) (list 'conn-info client))))))
(cl-destructuring-bind (cl-destructuring-bind
(&key shell_port iopub_port stdin_port hb_port ip (&key shell_port iopub_port stdin_port hb_port ip
key transport signature_scheme key transport signature_scheme
@ -686,10 +686,10 @@ REQ, MSG-TYPE, and CB have the same meaning as in
seconds, return the message that caused CB to return non-nil. If seconds, return the message that caused CB to return non-nil. If
CB never returns a non-nil value within TIMEOUT, return nil. Note CB never returns a non-nil value within TIMEOUT, return nil. Note
that if no TIMEOUT is given, `jupyter-default-timeout' is used." that if no TIMEOUT is given, `jupyter-default-timeout' is used."
(declare (indent 1)) (declare (indent 2))
(setq timeout (or timeout jupyter-default-timeout)) (setq timeout (or timeout jupyter-default-timeout))
(cl-check-type timeout number) (cl-check-type timeout number)
(let ((msg nil)) (let (msg)
(jupyter-add-callback req (jupyter-add-callback req
msg-type (lambda (m) (setq msg (when (funcall cb m) m)))) msg-type (lambda (m) (setq msg (when (funcall cb m) m))))
(with-timeout (timeout nil) (with-timeout (timeout nil)
@ -1114,8 +1114,7 @@ If RESTART is non-nil, request a restart instead of a complete shutdown."
content content
(jupyter-handle-update-display-data (jupyter-handle-update-display-data
client req data metadata transient))) client req data metadata transient)))
(_ (_ (warn "Message type not handled (%s)" (jupyter-message-type msg))))))
(warn "Message type not handled (%s)" (jupyter-message-type msg))))))
(cl-defgeneric jupyter-handle-stream ((_client jupyter-kernel-client) (cl-defgeneric jupyter-handle-stream ((_client jupyter-kernel-client)
_req _req