Mercurial > emacs
comparison lisp/ediff-util.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 | baa28899f76f |
| children | 51aa47312c4b |
comparison
equal
deleted
inserted
replaced
| 85889:683a6a9e56ab | 85890:d505125b0b46 |
|---|---|
| 3800 (defun ediff-make-current-diff-overlay (type) | 3800 (defun ediff-make-current-diff-overlay (type) |
| 3801 (if (ediff-has-face-support-p) | 3801 (if (ediff-has-face-support-p) |
| 3802 (let ((overlay (ediff-get-symbol-from-alist | 3802 (let ((overlay (ediff-get-symbol-from-alist |
| 3803 type ediff-current-diff-overlay-alist)) | 3803 type ediff-current-diff-overlay-alist)) |
| 3804 (buffer (ediff-get-buffer type)) | 3804 (buffer (ediff-get-buffer type)) |
| 3805 (face (face-name | 3805 (face (ediff-get-symbol-from-alist |
| 3806 (ediff-get-symbol-from-alist | 3806 type ediff-current-diff-face-alist))) |
| 3807 type ediff-current-diff-face-alist)))) | |
| 3808 (set overlay | 3807 (set overlay |
| 3809 (ediff-make-bullet-proof-overlay (point-max) (point-max) buffer)) | 3808 (ediff-make-bullet-proof-overlay (point-max) (point-max) buffer)) |
| 3810 (ediff-set-overlay-face (symbol-value overlay) face) | 3809 (ediff-set-overlay-face (symbol-value overlay) face) |
| 3811 (ediff-overlay-put (symbol-value overlay) 'ediff ediff-control-buffer)) | 3810 (ediff-overlay-put (symbol-value overlay) 'ediff ediff-control-buffer)) |
| 3812 )) | 3811 )) |
| 4290 (defun ediff-add-to-history (history-var newelt) | 4289 (defun ediff-add-to-history (history-var newelt) |
| 4291 (if (fboundp 'add-to-history) | 4290 (if (fboundp 'add-to-history) |
| 4292 (add-to-history history-var newelt) | 4291 (add-to-history history-var newelt) |
| 4293 (set history-var (cons newelt (symbol-value history-var))))) | 4292 (set history-var (cons newelt (symbol-value history-var))))) |
| 4294 | 4293 |
| 4295 (if (fboundp 'copy-sequence) | 4294 (defalias 'ediff-copy-list 'copy-sequence) |
| 4296 (defalias 'ediff-copy-list 'copy-sequence) | |
| 4297 (defun ediff-copy-list (list) | |
| 4298 (if (consp list) | |
| 4299 ;;;(let ((res nil)) | |
| 4300 ;;; (while (consp list) (push (pop list) res)) | |
| 4301 ;;; (prog1 (nreverse res) (setcdr res list))) | |
| 4302 (let (res elt) | |
| 4303 (while (consp list) | |
| 4304 (setq elt (car list) | |
| 4305 res (cons elt res) | |
| 4306 list (cdr list))) | |
| 4307 (nreverse res)) | |
| 4308 (car list)))) | |
| 4309 | 4295 |
| 4310 | 4296 |
| 4311 ;; don't report error if version control package wasn't found | 4297 ;; don't report error if version control package wasn't found |
| 4312 ;;(ediff-load-version-control 'silent) | 4298 ;;(ediff-load-version-control 'silent) |
| 4313 | 4299 |