Merge branch 'master' of git://github.com/ebanner/emacs-ipython-notebook into ebanner-master

This commit is contained in:
John Miller 2018-02-26 06:16:56 -06:00
commit e9f7274ebf

View file

@ -89,14 +89,14 @@ session, along with the login token."
(assert (processp %ein:jupyter-server-session%) t "Jupyter server has not started!") (assert (processp %ein:jupyter-server-session%) t "Jupyter server has not started!")
(condition-case err (condition-case err
(with-current-buffer (process-buffer %ein:jupyter-server-session%) ;;ein:jupyter-server-buffer-name (with-current-buffer (process-buffer %ein:jupyter-server-session%) ;;ein:jupyter-server-buffer-name
(goto-char (point-min)) (goto-char (point-max))
(re-search-forward "\\(https?://.*:[0-9]+\\)/\\?token=\\(.*\\)" nil) (re-search-backward "\\(https?://.*:[0-9]+\\)/\\?token=\\(.*\\)" nil)
(let ((url-or-port (match-string 1)) (let ((url-or-port (match-string 1))
(token (match-string 2))) (token (match-string 2)))
(list url-or-port token))) (list url-or-port token)))
(error (with-current-buffer (process-buffer %ein:jupyter-server-session%) (error (with-current-buffer (process-buffer %ein:jupyter-server-session%)
(goto-char (point-min)) (goto-char (point-max))
(if (re-search-forward "\\(https?://.*:[0-9]+\\)" nil t) (if (re-search-backward "\\(https?://.*:[0-9]+\\)" nil t)
(list (match-string 1) nil) (list (match-string 1) nil)
(list nil nil)))))) (list nil nil))))))