Source

ediff / ediff-ptch.el

Author Commit Message Labels Comments Date
michaelk
*** empty log message ***
michaelk
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take the current highlighting style into account. (ediff-forward-word-function,ediff-whitespace,ediff-word-1, ediff-word-2,ediff-word-3,ediff-word-4): make them buffer local. * ediff-init.el (ediff-patch-job): new macro. * ediff-mult.el (ediff-make-new-meta-list-header): new API function. (ediff-intersect-directories): use ediff-make-new-meta-list-header. * ediff-ptch.el (ediff-map-patch-buffer): use ediff-make-new-meta-list-header. (ediff-fixup-patch-map): use the meta-list API from ediff-mult.el. * ediff-util.el (ediff-toggle-hilit): fix toggling of highlit…
michaelk
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu> * ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs. * ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs. * ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new macro designed to be used in many places where ediff-emacs-p or ediff-xemacs-p was previously used. Reduces the number of warnings. Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue of edif…
michaelk
* ediff-util.el (ediff-file-checked-out-p,ediff-file-checked-in-p): check if vc-state is available. (ediff-make-temp-file): use ediff-coding-system-for-write. * ediff-init.el (ediff-coding-system-for-read): from ediff-diff.el (ediff-coding-system-for-write): new variable. (ediff-highest-priority): fixed the bug having to do with disappearing overlays. (ediff-file-remote-p): use file-remote-p, if available. (ediff-listable-file): new function. (ediff-file-attributes): use ediff-listable-file. * ediff-mult.el (ediff-meta-insert-file-info1): use …
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