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

[Michael Kifer]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Michael Kifer <address@hidden>  02/03/20 01:36:18

Modified files:
        lisp           : ediff.el ediff-util.el ediff-ptch.el 
                         ediff-mult.el ediff-init.el ediff-diff.el 
                         cus-load.el ChangeLog 

Log message:
        * 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 highliting.
        (ediff-select-difference): take highlighting style into account.
        (ediff-clone-buffer-for-region-comparison): new function.
        (ediff-inferior-compare-regions): added comparison of current diff
        regions.
        
        * ediff.el (ediff-clone-buffer-for-region-comparison,
        ediff-clone-buffer-for-window-comparison): moved to ediff-util.el.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/ediff.el.diff?tr1=1.56&tr2=1.57&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/ediff-util.el.diff?tr1=1.42&tr2=1.43&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/ediff-ptch.el.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/ediff-mult.el.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/ediff-init.el.diff?tr1=1.56&tr2=1.57&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/ediff-diff.el.diff?tr1=1.34&tr2=1.35&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/cus-load.el.diff?tr1=1.40&tr2=1.41&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/ChangeLog.diff?tr1=1.3601&tr2=1.3602&r1=text&r2=text