hiro/emacs-ipython-notebook
1
0
Fork 0
mirror of https://github.com/vale981/emacs-ipython-notebook synced 2025-03-05 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Why define a variable if we aren't going to use it?

Browse source 
Modifying ein:%which-cell% when the cell hasn't changed can lead to an obscure
error.

Also, probably unnecessary, but make sure buffer-undo-list is not t (which is a
valid value for this variable) when unshifting.
This commit is contained in:
John Miller 2019-12-06 16:30:55 -06:00
parent 7f66b95a73
commit aefa088010
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lisp/ein-worksheet.el
View file

@ -171,7 +171,8 @@ Normalize `buffer-undo-list' by removing extraneous details, and update the ein:
(ein:and-let* ((old-cell-id (car change-cell-id))
(new-cell-id (cdr change-cell-id))
(changed-p (not (eq old-cell-id new-cell-id))))
(setq ein:%which-cell% (-replace old-cell-id new-cell-id ein:%which-cell%)))
(when changed-p
(setq ein:%which-cell% (-replace old-cell-id new-cell-id ein:%which-cell%))))
(let ((fill (- (length buffer-undo-list) (length ein:%which-cell%))))
(if (> (abs fill) 1)
(progn
@ -187,12 +188,13 @@ Normalize `buffer-undo-list' by removing extraneous details, and update the ein:
(ein:display-warning msg :error)
(error "ein:worksheet--jigger-undo-list: aborting")))
(if (< fill 0)
(setq ein:%which-cell% (nthcdr (- fill) ein:%which-cell%))
(setq ein:%which-cell% (nthcdr (- fill) ein:%which-cell%))
(if (> fill 0)
(setq ein:%which-cell%
(nconc (make-list fill (car ein:%which-cell%))
ein:%which-cell%))))))
(cl-assert (= (length buffer-undo-list) (length ein:%which-cell%)) t
(cl-assert (= (length buffer-undo-list) (length ein:%which-cell%))
t
"ein:worksheet--jigger-undo-list %d != %d"
(length buffer-undo-list) (length ein:%which-cell%)))
@ -200,7 +202,7 @@ Normalize `buffer-undo-list' by removing extraneous details, and update the ein:
"Adjust `buffer-undo-list' for adding CELL. Unshift in list parlance means prepending to list."
(unless old-cell
(setq old-cell cell))
(when buffer-local-enable-undo
(when (and (listp buffer-undo-list) buffer-local-enable-undo)
(ein:with-live-buffer (ein:cell-buffer cell)
(let* ((opl (ein:worksheet--prompt-length old-cell t))
(ool (ein:worksheet--output-length old-cell t))