view lisp/toolbar/fld_open.xpm @ 44028:182881d68883

* 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.

/* XPM */
static char *magick[] = {
/* columns rows colors chars-per-pixel */
"24 24 4 1",
"  c Gray0",
". c #909090909090",
"X c #fefefefefefe",
"o c None",
/* pixels */
"oooooooooooooooooooooooo",
"oooooooooooooooooooooooo",
"oooooooooooooooooooooooo",
"oooooooooooooooooooooooo",
"oooooooooooooooooooooooo",
"oooooooooooooo  oooooooo",
"ooooooooooo   .. ooooooo",
"oooo  oo   ....XXo   ooo",
"ooo ..  ....XXXX  .. ooo",
"ooo .....XXXXX  .... ooo",
"oooo ..XXXXX  ...... ooo",
"oooo ..XXX  ........ ooo",
"ooooo .XX .......... ooo",
"ooooo ..X .......... ooo",
"oooooo .X .......... ooo",
"oooooo .. ........  oooo",
"ooooooo . ......  oooooo",
"ooooooo . ..... oooooooo",
"oooooooo  ...  ooooooooo",
"oooooooo  .  ooooooooooo",
"ooooooooo  ooooooooooooo",
"oooooooooooooooooooooooo",
"oooooooooooooooooooooooo",
"oooooooooooooooooooooooo"
};