Merge pull request #48 from dickmao/dev

more grief regarding undo
This commit is contained in:
dickmao 2019-11-09 07:53:21 -05:00 committed by GitHub
commit 13fe38862b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 18 deletions

View file

@ -7,8 +7,8 @@
.. COMMENTARY (see Makefile)
.. |build-status|
image:: https://secure.travis-ci.org/dickmao/emacs-ipython-notebook.png?branch=master
:target: http://travis-ci.org/dickmao/emacs-ipython-notebook
image:: https://secure.travis-ci.com/dickmao/emacs-ipython-notebook.png?branch=master
:target: http://travis-ci.com/dickmao/emacs-ipython-notebook
:alt: Build Status
.. |melpa-dev|
image:: http://melpa.milkbox.net/packages/ein-badge.svg

View file

@ -14,8 +14,8 @@ EIN was originally written by `[tkf]`_. A jupyter Babel_ backend was first
introduced by `[gregsexton]`_.
.. |build-status|
image:: https://secure.travis-ci.org/dickmao/emacs-ipython-notebook.png?branch=master
:target: http://travis-ci.org/dickmao/emacs-ipython-notebook
image:: https://secure.travis-ci.com/dickmao/emacs-ipython-notebook.png?branch=master
:target: http://travis-ci.com/dickmao/emacs-ipython-notebook
:alt: Build Status
.. |melpa-dev|
image:: http://melpa.milkbox.net/packages/ein-badge.svg
@ -69,7 +69,6 @@ Notebook server ``M-x ein:log-pop-to-request-buffer``.
Kernel messaging (must be run from notebook buffer) ``M-x ein:dev-pop-to-debug-channels``.
.. _spacemacs layer: https://github.com/syl20bnr/spacemacs/tree/master/layers/%2Blang/ipython-notebook
.. _auto-complete: https://github.com/auto-complete/auto-complete
.. _company-mode: https://github.com/company-mode/company-mode
.. _jupyterhub: https://github.com/jupyterhub/jupyterhub

View file

@ -838,8 +838,7 @@ If END is non-`nil', return the location of next element."
;; (ein:flush-clear-timeout)
(setf (slot-value cell 'outputs)
(append (slot-value cell 'outputs) (list json)))
(with-current-buffer (ewoc-buffer (slot-value cell 'ewoc))
(ein:with-live-buffer (ein:cell-buffer cell)
(let* ((inhibit-read-only t)
(buffer-undo-list t) ; disable undo recording
(ewoc (slot-value cell 'ewoc))

View file

@ -1056,13 +1056,14 @@ Do not clear input prompts when the prefix argument is given."
:cell-p #'ein:codecell-p)))
(ein:kernel-when-ready (slot-value ws 'kernel)
(apply-partially
(lambda (ws* cell* buffer kernel)
(with-current-buffer buffer
(lambda (ws* cell* kernel)
(ein:with-live-buffer (ein:cell-buffer cell*)
(let ((buffer-undo-list t))
(ein:cell-execute cell*)
(oset ws* :dirty t))
(ein:worksheet--unshift-undo-list cell*)))
ws cell (current-buffer)))
(oset ws* :dirty t)))
;; unshift-undo calls ein:with-live-buffer
(ein:worksheet--unshift-undo-list cell*))
ws cell))
cell)
(defun ein:worksheet-execute-cell-and-goto-next (ws cell &optional insert)