Mercurial > emacs
diff lisp/emulation/viper-cmd.el @ 85890:d505125b0b46
2007-11-02 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-ex.el (viper-ex): do not ignore the region.
* viper-cmd.el (viper-prev-destructive-command)
(viper-insert-prev-from-insertion-ring): use ring-copy instead of
copy-sequence.
* ediff-util.el (ediff-make-current-diff-overlay): do not use face-name.
Got rid of ediff-copy-list.
* ediff-diff.el (ediff-set-fine-diff-properties-in-one-buffer): do not
use face-name.
(ediff-test-utility,ediff-diff-mandatory-option)
(ediff-reset-diff-options): removed to simplify yhe mandatory option
handling on windows.
(ediff-set-diff-options): added.
(ediff-diff-options): changed.
* ediff-vers.el (ediff-vc-internal): use ediff-vc-revision-other-window.
(ediff-vc-merge-internal): use ediff-vc-revision-other-window and
ediff-vc-working-revision.
Require vc-hooks.
author | Michael Kifer <kifer@cs.stonybrook.edu> |
---|---|
date | Fri, 02 Nov 2007 06:03:12 +0000 |
parents | ff85cbd27ee2 |
children | 51aa47312c4b |
line wrap: on
line diff
--- a/lisp/emulation/viper-cmd.el Fri Nov 02 03:42:05 2007 +0000 +++ b/lisp/emulation/viper-cmd.el Fri Nov 02 06:03:12 2007 +0000 @@ -1902,7 +1902,7 @@ (setq viper-intermediate-command 'repeating-display-destructive-command) ;; first search through command history--set temp ring - (setq viper-temp-command-ring (copy-sequence viper-command-ring))) + (setq viper-temp-command-ring (ring-copy viper-command-ring))) (setq cmd (if next (viper-special-ring-rotate1 viper-temp-command-ring 1) (viper-special-ring-rotate1 viper-temp-command-ring -1))) @@ -1936,7 +1936,7 @@ (length viper-last-inserted-string-from-insertion-ring)))) ) ;;first search through insertion history - (setq viper-temp-insertion-ring (copy-sequence viper-insertion-ring))) + (setq viper-temp-insertion-ring (ring-copy viper-insertion-ring))) (setq this-command 'viper-insert-from-insertion-ring) ;; so that things will be undone properly (setq buffer-undo-list (cons nil buffer-undo-list)) @@ -2790,6 +2790,7 @@ (defun viper-next-line-carefully (arg) (condition-case nil + ;; do not use forward-line! need to keep column (next-line arg) (error nil))) @@ -3089,6 +3090,7 @@ (let ((val (viper-p-val arg)) (com (viper-getCom arg))) (if com (viper-move-marker-locally 'viper-com-point (point))) + ;; do not use forward-line! need to keep column (next-line val) (if viper-ex-style-motion (if (and (eolp) (not (bolp))) (backward-char 1))) @@ -3132,6 +3134,7 @@ (let ((val (viper-p-val arg)) (com (viper-getCom arg))) (if com (viper-move-marker-locally 'viper-com-point (point))) + ;; do not use forward-line! need to keep column (previous-line val) (if viper-ex-style-motion (if (and (eolp) (not (bolp))) (backward-char 1)))