Source

ediff / ediff-ptch.el

Author Commit Message Labels Comments Date
michaelk
* ediff-init.el (ediff-quit-hook,ediff-suspend-hook): changed initialization; use add-hook. (ediff-file-remote-p): use file-local-copy. * ediff-ptch.el (ediff-prompt-for-patch-buffer): improved defaults. * ediff.el (ediff-patch-buffer): bug fix. (ediff-revision): allow selection of the file at the prompt.
michaelk
* ediff-diff.el: Moved variables around to have it compile under NT. * ediff-help.el (ediff-use-long-help-message): made it customizable. * ediff-init.el (ediff-abbrev-jobname): use capitalize. * ediff-wind.el (ediff-skip-unsuitable-frames): deleted the redundant skip-small-frames test.
michaelk
* ediff*el: replaced old-style backquotes. * ediff-merge (ediff-looks-like-combined-merge,ediff-get-combined-region): changed to support the new format for ediff-combination-pattern. * ediff-diff (ediff-set-fine-overlays-in-one-buffer): changed to support the new format for ediff-combination-pattern. * ediff.texi: Describe the new format for ediff-combination-pattern.
michaelk
* ediff-diff.el (ediff-cmp-options): new var. (ediff-same-file-contents): use ediff-cmp-options. * ediff-util.el (ediff-file-checked-in-p): don't consider CVS files checked in. (ediff-make-temp-file,ediff-make-empty-tmp-file): Make sure you are writing to a newly created empty file. * ediff.texi: minor improvements.
michaelk
Changed error message.
michaelk
Wed Oct 14 01:49:52 1998 Michael Kifer <kifer@cs.sunysb.edu> * ediff-util.el (ediff-cleanup-mess): fixed the case of dead windows. make sure you are in a good frame before deleting other windows. * ediff-mult.el (ediff-show-session-group-hook): new default. * ediff-vers.el (ediff-pcl-cvs-view-revision): first cd to the file directory. reportedly works better with remote files. * ediff-vers.e…
steve
Created
Tags
xemacs