Mercurial > emacs

comparison lisp/emulation/viper-ex.el @ 85890:d505125b0b46

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
85889:683a6a9e56ab 85890:d505125b0b46
649 (+ reg-beg-line (count-lines reg-beg reg-end) -1))))) 649 (+ reg-beg-line (count-lines reg-beg reg-end) -1)))))
650 (if reg-beg-line 650 (if reg-beg-line
651 (setq initial-str (format "%d,%d" reg-beg-line reg-end-line))) 651 (setq initial-str (format "%d,%d" reg-beg-line reg-end-line)))
652 652
653 (setq com-str 653 (setq com-str
654 (or string (viper-read-string-with-history 654 (if string
655 ":" 655 (concat initial-str string)
656 initial-str 656 (viper-read-string-with-history
657 'viper-ex-history 657 ":"
658 ;; no default when working on region 658 initial-str
659 (if initial-str 659 'viper-ex-history
660 nil 660 ;; no default when working on region
661 (car viper-ex-history)) 661 (if initial-str
662 map 662 nil
663 (if initial-str 663 (car viper-ex-history))
664 " [Type command to execute on current region]")))) 664 map
665 (if initial-str
666 " [Type command to execute on current region]"))))
665 (save-window-excursion 667 (save-window-excursion
666 ;; just a precaution 668 ;; just a precaution
667 (setq viper-ex-work-buf (get-buffer-create viper-ex-work-buf-name)) 669 (setq viper-ex-work-buf (get-buffer-create viper-ex-work-buf-name))
668 (set-buffer viper-ex-work-buf) 670 (set-buffer viper-ex-work-buf)
669 (delete-region (point-min) (point-max)) 671 (delete-region (point-min) (point-max))