diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 1999-11-25 04:34:23 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 1999-11-25 04:34:23 +0000 |
| commit | 086171bf0b8c34abca3f4eed0512d2d1e4235d9d (patch) | |
| tree | d0bbc28d532df4f764a779ca75fa3e960df43a80 /lisp/ediff-vers.el | |
| parent | ba7394febc752024269693ac231be8de0ff988c6 (diff) | |
| download | emacs-086171bf0b8c34abca3f4eed0512d2d1e4235d9d.tar.gz | |
*** empty log message ***
Diffstat (limited to 'lisp/ediff-vers.el')
| -rw-r--r-- | lisp/ediff-vers.el | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/lisp/ediff-vers.el b/lisp/ediff-vers.el index e73386b180f..dac4cecef02 100644 --- a/lisp/ediff-vers.el +++ b/lisp/ediff-vers.el @@ -57,10 +57,9 @@ (setq rev2buf (current-buffer) file2 (buffer-file-name))) (setq startup-hooks - (cons (` (lambda () - (delete-file (, file1)) - (or (, (string= rev2 "")) (delete-file (, file2))) - )) + (cons `(lambda () + (delete-file ,file1) + (or ,(string= rev2 "") (delete-file ,file2))) startup-hooks)) (ediff-buffers rev1buf rev2buf @@ -165,14 +164,14 @@ (setq ancestor-buf (current-buffer)))) (setq startup-hooks (cons - (` (lambda () - (delete-file (, (buffer-file-name buf1))) - (or (, (string= rev2 "")) - (delete-file (, (buffer-file-name buf2)))) - (or (, (string= ancestor-rev "")) - (, (not ancestor-rev)) - (delete-file (, (buffer-file-name ancestor-buf)))) - )) + `(lambda () + (delete-file ,(buffer-file-name buf1)) + (or ,(string= rev2 "") + (delete-file ,(buffer-file-name buf2))) + (or ,(string= ancestor-rev "") + ,(not ancestor-rev) + (delete-file ,(buffer-file-name ancestor-buf))) + ) startup-hooks)) (if ancestor-rev (ediff-merge-buffers-with-ancestor |