diff options
| author | Kim F. Storm <storm@cua.dk> | 2006-05-05 23:36:32 +0000 |
|---|---|---|
| committer | Kim F. Storm <storm@cua.dk> | 2006-05-05 23:36:32 +0000 |
| commit | 640ad75b3c4549394eec314b3305ca576d185965 (patch) | |
| tree | 52b9e29bd8a0c609dfa45a2da595dee4ad1564cd /lisp/ediff.el | |
| parent | 6b04bd6eec639d158e3dbb4de3d77b2b8dde3e6a (diff) | |
| download | emacs-640ad75b3c4549394eec314b3305ca576d185965.tar.gz | |
(ediff-files, ediff-files3, ediff-merge-files)
(ediff-merge-files-with-ancestor): Use add-to-history.
Diffstat (limited to 'lisp/ediff.el')
| -rw-r--r-- | lisp/ediff.el | 68 |
1 files changed, 30 insertions, 38 deletions
diff --git a/lisp/ediff.el b/lisp/ediff.el index bb6cfc6b72e..14f634f0cd2 100644 --- a/lisp/ediff.el +++ b/lisp/ediff.el @@ -210,12 +210,11 @@ ediff-last-dir-B (file-name-directory f))) (progn - (setq file-name-history - (cons (ediff-abbreviate-file-name - (expand-file-name - (file-name-nondirectory f) - dir-B)) - file-name-history)) + (add-to-history 'file-name-history + (ediff-abbreviate-file-name + (expand-file-name + (file-name-nondirectory f) + dir-B))) (ediff-get-default-file-name f 1))) ))) (ediff-files-internal file-A @@ -246,25 +245,22 @@ ediff-last-dir-B (file-name-directory f))) (progn - (setq file-name-history - (cons - (ediff-abbreviate-file-name - (expand-file-name - (file-name-nondirectory f) - dir-B)) - file-name-history)) + (add-to-history 'file-name-history + (ediff-abbreviate-file-name + (expand-file-name + (file-name-nondirectory f) + dir-B))) (ediff-get-default-file-name f 1)))) (ediff-read-file-name "File C to compare" (setq dir-C (if ediff-use-last-dir ediff-last-dir-C (file-name-directory ff))) (progn - (setq file-name-history - (cons (ediff-abbreviate-file-name - (expand-file-name - (file-name-nondirectory ff) - dir-C)) - file-name-history)) + (add-to-history 'file-name-history + (ediff-abbreviate-file-name + (expand-file-name + (file-name-nondirectory ff) + dir-C))) (ediff-get-default-file-name ff 2))) ))) (ediff-files-internal file-A @@ -1109,12 +1105,11 @@ lines. For small regions, use `ediff-regions-wordwise'." ediff-last-dir-B (file-name-directory f))) (progn - (setq file-name-history - (cons (ediff-abbreviate-file-name - (expand-file-name - (file-name-nondirectory f) - dir-B)) - file-name-history)) + (add-to-history 'file-name-history + (ediff-abbreviate-file-name + (expand-file-name + (file-name-nondirectory f) + dir-B))) (ediff-get-default-file-name f 1))) ))) (setq startup-hooks (cons 'ediff-merge-on-startup startup-hooks)) @@ -1153,13 +1148,11 @@ lines. For small regions, use `ediff-regions-wordwise'." ediff-last-dir-B (file-name-directory f))) (progn - (setq file-name-history - (cons - (ediff-abbreviate-file-name - (expand-file-name - (file-name-nondirectory f) - dir-B)) - file-name-history)) + (add-to-history 'file-name-history + (ediff-abbreviate-file-name + (expand-file-name + (file-name-nondirectory f) + dir-B))) (ediff-get-default-file-name f 1)))) (ediff-read-file-name "Ancestor file" (setq dir-ancestor @@ -1167,12 +1160,11 @@ lines. For small regions, use `ediff-regions-wordwise'." ediff-last-dir-ancestor (file-name-directory ff))) (progn - (setq file-name-history - (cons (ediff-abbreviate-file-name - (expand-file-name - (file-name-nondirectory ff) - dir-ancestor)) - file-name-history)) + (add-to-history 'file-name-history + (ediff-abbreviate-file-name + (expand-file-name + (file-name-nondirectory ff) + dir-ancestor))) (ediff-get-default-file-name ff 2))) ))) (setq startup-hooks (cons 'ediff-merge-on-startup startup-hooks)) |