diff options
author | Phillip Lord <phillip.lord@russet.org.uk> | 2016-05-21 10:06:12 +0100 |
---|---|---|
committer | Phillip Lord <phillip.lord@russet.org.uk> | 2016-05-23 09:12:49 +0100 |
commit | c0139e32f1f3bb287b04e02a69a7848d6a040003 (patch) | |
tree | bb3f6f0038516f4ef0a41b6c49497c9f5070aa4c /lisp/emulation/viper-init.el | |
parent | 920d76c2084f0621dec8664840dd3fb2e9b34891 (diff) | |
download | emacs-c0139e32f1f3bb287b04e02a69a7848d6a040003.tar.gz |
Fix viper undo breakage from undo-boundary changes
* lisp/simple.el (undo-auto-disable-boundaries): New variable
* lisp/emulation/viper-init.el (viper-undo-in-complex-command,
viper-undo-needs-adjustment): Rename
variable to reflect new purpose,
(viper-buffer-undo-list-mark): Remove
* lisp/emulation/viper-cmd.el (viper-set-complex-command-for-undo):
Add undo using `undo-boundary', disable default undo-boundary
addition.
* lisp/emulation/viper-cmd.el
(viper-complete-complex-command-for-undo,viper-adjust-undo):
Change function name, remove old undo list manipulation.
* lisp/emulation/viper-cmd.el (viper-undo,viper-repeat,
viper-change-state-to-vi,viper-change-state):
Update for function name change.
Addresses Bug #22295
Diffstat (limited to 'lisp/emulation/viper-init.el')
-rw-r--r-- | lisp/emulation/viper-init.el | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el index 104245b7571..c1e76629477 100644 --- a/lisp/emulation/viper-init.el +++ b/lisp/emulation/viper-init.el @@ -370,13 +370,8 @@ 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-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) +(viper-deflocalvar viper-undo-in-complex-command nil) +(put 'viper-undo-in-complex-command 'permanent-local t) (defcustom viper-keep-point-on-undo nil "Non-nil means not to move point while undoing commands. |