299 |
((eq type 'MODIFIED) |
((eq type 'MODIFIED) |
300 |
(ediff-buffers |
(ediff-buffers |
301 |
(find-file-noselect tmp-file) |
(find-file-noselect tmp-file) |
302 |
(find-file-noselect (cvs-fileinfo->full-path fileinfo)) |
(if (featurep 'xemacs) |
303 |
|
;; XEmacs doesn't seem to have cvs-fileinfo->full-name |
304 |
|
(find-file-noselect (cvs-fileinfo->full-path fileinfo)) |
305 |
|
(find-file-noselect (cvs-fileinfo->full-name fileinfo))) |
306 |
nil ; startup-hooks |
nil ; startup-hooks |
307 |
'ediff-revisions))) |
'ediff-revisions))) |
308 |
(if (stringp tmp-file) (delete-file tmp-file)) |
(if (stringp tmp-file) (delete-file tmp-file)) |