[Emacs-commit] emacs/lisp ediff.el ediff-util.el ediff-mult.el...

[Michael Kifer]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Michael Kifer <address@hidden>  03/05/18 13:18:09

Modified files:
        lisp           : ediff.el ediff-util.el ediff-mult.el ChangeLog 

Log message:
        2003-05-18  Michael Kifer  <address@hidden>
        
        * ediff-mult.el (ediff-default-filtering-regexp): new variable.
        
        * ediff-util.el (ediff-maybe-save-and-delete-merge): change in a
        message.
        
        * ediff.el (ediff-directories,ediff-directory-revisions,
        ediff-directories3,ediff-merge-directories,
        ediff-merge-directories-with-ancestor,ediff-merge-directory-revisions,
        ediff-merge-directory-revisions-with-ancestor): make use of the new
        ediff-default-filtering-regexp variable.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/ediff.el.diff?tr1=1.61&tr2=1.62&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/ediff-util.el.diff?tr1=1.48&tr2=1.49&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/ediff-mult.el.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/ChangeLog.diff?tr1=1.5129&tr2=1.5130&r1=text&r2=text