Mercurial > emacs

comparison lisp/ediff-vers.el @ 26585:3ec5a485d0ab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author Michael Kifer <kifer@cs.stonybrook.edu>
date Thu, 25 Nov 1999 04:34:23 +0000
parents 4f315ca65976
children 6306740f6938
comparison
equal deleted inserted replaced
26584:7547a144b80a 26585:3ec5a485d0ab
55 (or (string= rev2 "") ; use current buffer 55 (or (string= rev2 "") ; use current buffer
56 (vc-version-other-window rev2)) 56 (vc-version-other-window rev2))
57 (setq rev2buf (current-buffer) 57 (setq rev2buf (current-buffer)
58 file2 (buffer-file-name))) 58 file2 (buffer-file-name)))
59 (setq startup-hooks 59 (setq startup-hooks
60 (cons (` (lambda () 60 (cons `(lambda ()
61 (delete-file (, file1)) 61 (delete-file ,file1)
62 (or (, (string= rev2 "")) (delete-file (, file2))) 62 (or ,(string= rev2 "") (delete-file ,file2)))
63 ))
64 startup-hooks)) 63 startup-hooks))
65 (ediff-buffers 64 (ediff-buffers
66 rev1buf rev2buf 65 rev1buf rev2buf
67 startup-hooks 66 startup-hooks
68 'ediff-revision))) 67 'ediff-revision)))
163 (setq ancestor-rev (vc-workfile-version buffer-file-name))) 162 (setq ancestor-rev (vc-workfile-version buffer-file-name)))
164 (vc-version-other-window ancestor-rev) 163 (vc-version-other-window ancestor-rev)
165 (setq ancestor-buf (current-buffer)))) 164 (setq ancestor-buf (current-buffer))))
166 (setq startup-hooks 165 (setq startup-hooks
167 (cons 166 (cons
168 (` (lambda () 167 `(lambda ()
169 (delete-file (, (buffer-file-name buf1))) 168 (delete-file ,(buffer-file-name buf1))
170 (or (, (string= rev2 "")) 169 (or ,(string= rev2 "")
171 (delete-file (, (buffer-file-name buf2)))) 170 (delete-file ,(buffer-file-name buf2)))
172 (or (, (string= ancestor-rev "")) 171 (or ,(string= ancestor-rev "")
173 (, (not ancestor-rev)) 172 ,(not ancestor-rev)
174 (delete-file (, (buffer-file-name ancestor-buf)))) 173 (delete-file ,(buffer-file-name ancestor-buf)))
175 )) 174 )
176 startup-hooks)) 175 startup-hooks))
177 (if ancestor-rev 176 (if ancestor-rev
178 (ediff-merge-buffers-with-ancestor 177 (ediff-merge-buffers-with-ancestor
179 buf1 buf2 ancestor-buf 178 buf1 buf2 ancestor-buf
180 startup-hooks 'ediff-merge-revisions-with-ancestor merge-buffer-file) 179 startup-hooks 'ediff-merge-revisions-with-ancestor merge-buffer-file)