diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2016-06-19 00:53:51 +0200 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-06-19 00:53:51 +0200 |
commit | d9088290efb49a352c3c23da25a734ed3e269923 (patch) | |
tree | e9c09623885e31c90756c0c74373b2e7886674e7 /lisp/emulation | |
parent | 8085d5fcc4240a39458ead26ae2279590bb9f629 (diff) | |
parent | 2317c61868044dc1fea58d9e81f35d354f24fd69 (diff) | |
download | emacs-d9088290efb49a352c3c23da25a734ed3e269923.tar.gz |
Merge from origin/emacs-25
2317c61 Fix last todo-mode change
5d4d8a3 Improve last todo-mode fix
d7084f2 Fix todo-mode use of minibuffer completion keymap (bug#23695).
27dec52 * src/alloc.c (ALIGN): Avoid error on DragonFly BSD. (Bug#23...
f526191 * lisp/emacs-lisp/nadvice.el (advice--make-docstring): Avoid ...
e881070 * lisp/help-fns.el (describe-function-1): Avoid reporting adv...
d308aa1 Minor grammar fix (bug#23746)
20de667 Doc fixes for grammar and typos (bug#23746)
a67a4e5 * doc/lispref/processes.texi (Process Buffers): Minor rewordi...
27f440e Add cross-reference to ELisp manual
10802d8 ; make change-history-commit
4b2d77d * lisp/emacs-lisp/macroexp.el (macroexp--expand-all): Fix (bu...
12e009e Restore initial undo boundary with viper
291fe0a Revert "Fix viper undo breakage from undo-boundary changes"
6921f4a Fix dbus crash on 32-bit Cygwin
Diffstat (limited to 'lisp/emulation')
-rw-r--r-- | lisp/emulation/viper-cmd.el | 47 | ||||
-rw-r--r-- | lisp/emulation/viper-init.el | 9 |
2 files changed, 42 insertions, 14 deletions
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el index 72fc89817a1..3d9d1cc59f2 100644 --- a/lisp/emulation/viper-cmd.el +++ b/lisp/emulation/viper-cmd.el @@ -631,7 +631,7 @@ (viper-over-whitespace-line)) (indent-to-left-margin)) (viper-add-newline-at-eob-if-necessary) - (viper-complete-complex-command-for-undo) + (viper-adjust-undo) (if (eq viper-current-state 'emacs-state) (viper-restore-cursor-color 'after-emacs-mode) @@ -1570,7 +1570,7 @@ If the prefix argument ARG is non-nil, it is used instead of `val'." (if (and (eolp) (not (bolp))) (backward-char 1)) )) - (viper-complete-complex-command-for-undo) ; take care of undo + (viper-adjust-undo) ; take care of undo ;; If the prev cmd was rotating the command ring, this means that `.' has ;; just executed a command from that ring. So, push it on the ring again. ;; If we are just executing previous command , then don't push viper-d-com @@ -1670,7 +1670,6 @@ invokes the command before that, etc." (undo-start) (undo-more 2) - (viper-complete-complex-command-for-undo) ;;(setq undo-beg-posn (or undo-beg-posn (point)) ;; undo-end-posn (or undo-end-posn (point))) ;;(setq undo-beg-posn (or undo-beg-posn before-undo-pt) @@ -1710,17 +1709,41 @@ invokes the command before that, etc." ;; The following two functions are used to set up undo properly. ;; In VI, unlike Emacs, if you open a line, say, and add a bunch of lines, ;; they are undone all at once. -(defun viper-complete-complex-command-for-undo () - (setq undo-auto-disable-boundaries nil) - (setq viper-undo-in-complex-command nil) - (undo-boundary)) +(defun viper-adjust-undo () + (if viper-undo-needs-adjustment + (let ((inhibit-quit t) + tmp tmp2) + (setq viper-undo-needs-adjustment nil) + (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 + + ;; cut tail from buffer-undo-list temporarily by direct + ;; manipulation with pointers in buffer-undo-list + (setcdr tmp nil) + + (setq buffer-undo-list (delq nil buffer-undo-list)) + (setq buffer-undo-list + (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))) + ;; 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 () - (when (not viper-undo-in-complex-command) - (setq undo-auto-disable-boundaries t) - (setq viper-undo-in-complex-command t) - (undo-boundary))) + (if (listp buffer-undo-list) + (if (not viper-undo-needs-adjustment) + (let ((inhibit-quit t)) + (setq buffer-undo-list + (cons viper-buffer-undo-list-mark buffer-undo-list)) + (setq viper-undo-needs-adjustment t))))) + ;;; Viper's destructive Command ring utilities @@ -2588,7 +2611,7 @@ These keys are ESC, RET, and LineFeed." (delete-char 1 t) (insert char)) - (viper-complete-complex-command-for-undo) + (viper-adjust-undo) (backward-char arg) )) diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el index ef662366b88..cd71925590a 100644 --- a/lisp/emulation/viper-init.el +++ b/lisp/emulation/viper-init.el @@ -370,8 +370,13 @@ Use `\\[viper-set-expert-level]' to change this.") ;; VI-style Undo ;; Used to 'undo' complex commands, such as replace and insert commands. -(viper-deflocalvar viper-undo-in-complex-command nil) -(put 'viper-undo-in-complex-command 'permanent-local t) +(viper-deflocalvar viper-undo-needs-adjustment nil) +(put 'viper-undo-needs-adjustment 'permanent-local t) + +;; A mark that Viper puts on buffer-undo-list. Marks the beginning of a +;; complex command that must be undone atomically. If inserted, it is +;; erased by viper-change-state-to-vi and viper-repeat. +(defconst viper-buffer-undo-list-mark 'viper) (defcustom viper-keep-point-on-undo nil "Non-nil means not to move point while undoing commands. |