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

2007-11-02 Michael Kifer <kifer@cs.stonybrook.edu>

Browse source 
* 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.
This commit is contained in:
Michael Kifer 2007-11-02 06:03:12 +00:00
parent 246a4316de
commit 33468a59c6
6 changed files with 79 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1902,7 +1902,7 @@ With prefix argument, find next destructive command."
(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 @@ to in the global map, instead of cycling through the insertion ring."
(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 @@ On reaching beginning of line, stop and signal error."
(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 @@ On reaching beginning of line, stop and signal error."
(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 @@ If point is on a widget or a button, simulate clicking on that widget/button."
(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)))

24
lisp/emulation/viper-ex.el
View file

@ -651,17 +651,19 @@ reversed."
(setq initial-str (format "%d,%d" reg-beg-line reg-end-line)))
(setq com-str
(or string (viper-read-string-with-history
":"
initial-str
'viper-ex-history
;; no default when working on region
(if initial-str
nil
(car viper-ex-history))
map
(if initial-str
" [Type command to execute on current region]"))))
(if string
(concat initial-str string)
(viper-read-string-with-history
":"
initial-str
'viper-ex-history
;; no default when working on region
(if initial-str
nil
(car viper-ex-history))
map
(if initial-str
" [Type command to execute on current region]"))))
(save-window-excursion
;; just a precaution
(setq viper-ex-work-buf (get-buffer-create viper-ex-work-buf-name))