procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Restore initial undo boundary with viper

Browse source 
* lisp/emulation/viper-cmd.el (viper-adjust-undo): Add back last undo
  boundary if it has been removed.

Addresses Bug#22295.
This commit is contained in:
Phillip Lord 2016-06-10 22:59:55 +01:00
parent 291fe0aade
commit 12e009e52f
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lisp/emulation/viper-cmd.el
View file

@ -1715,8 +1715,9 @@ invokes the command before that, etc."
(let ((inhibit-quit t)
tmp tmp2)
(setq viper-undo-needs-adjustment nil)
(if (listp buffer-undo-list)
(if (setq tmp (memq viper-buffer-undo-list-mark buffer-undo-list))
(when (listp buffer-undo-list)
(let ((had-boundary (null (car buffer-undo-list))))
(if (setq tmp (memq viper-buffer-undo-list-mark buffer-undo-list))
(progn
(setq tmp2 (cdr tmp)) ; the part after mark
@ -1729,8 +1730,11 @@ invokes the command before that, etc."
(delq viper-buffer-undo-list-mark buffer-undo-list))
;; restore tail of buffer-undo-list
(setq buffer-undo-list (nconc buffer-undo-list tmp2)))
(setq buffer-undo-list (delq nil buffer-undo-list)))))
))
(setq buffer-undo-list (delq nil buffer-undo-list)))
;; The top-level loop only adds boundaries if there has been
;; modifications in the buffer, so make sure we don't accidentally
;; drop the "final" boundary (bug#22295).
(if had-boundary (undo-boundary)))))))
(defun viper-set-complex-command-for-undo ()