/[emacs]/emacs/lisp/ediff-vers.el
ViewVC logotype

Diff of /emacs/lisp/ediff-vers.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.22 by ttn, Sat Aug 6 22:13:42 2005 UTC revision 1.23 by kifer, Tue Sep 20 17:47:28 2005 UTC
# Line 299  Line 299 
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))

Legend:
Removed from v.1.22  
changed lines
  Added in v.1.23

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26