-
michaelk authored
* 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.el (ediff-pcl-cvs-internal, ediff-pcl-cvs-merge-internal): use file-name-nondirectory when passing files to CVS. * ediff-help.el (ediff-long-help-message-merge): default changed. * ediff-util.el (ediff-status-info): updated. (ediff-toggle-skip-changed-regions): new function. (ediff-next-difference, ediff-previous-difference): now skips white space correctly in the merge mode. (ediff-write-merge-buffer-and-maybe-kill, ediff-maybe-save-and-delete-merge): changed to give more options to the user. (ediff-other-buffer): no longer skips mail buffers. * ediff-merg.el (ediff-skip-merge-regions-that-differ-from-default): new variable. (ediff-skip-merge-region-if-changed-from-default-p, ediff-merge-changed-from-default-p): new functions. * ediff-wind.el (ediff-control-frame-parameters): improved, to reduce distraction. (ediff-skip-unsuitable-frames): make it skip small windows. * ediff-diff.el, ediff-init.el: Improved comments. * ediff-mult.el (ediff-hide-marked-sessions): make it redraw the meta buffer. (ediff-collect-custom-diffs): make the diff buffer read-only, not modified. (ediff-mark-for-hiding, ediff-mark-for-operation): renamed to *-at-pos. (ediff-mark-session-for-hiding, ediff-mark-session-for-operation, ediff-unmark-all-for-operation, ediff-unmark-all-for-hiding): new functions. (ediff-setup-meta-map): changed bindings. * ediff.el, ediff-init.el, ediff-ptch.el, ediff-help.el, ediff-diff.el, ediff-tbar.el, ediff-wind.el, ediff-mult.el: Removed function quotes around lambdas. * ediff.texi: add section about $*.
525d217b3e93
Loading