xdiff
Section: PJL TOOLS (1)
Updated: March 28, 1996
Index
Return to Main Contents
NAME
xdiff - graphical diff for X
SYNOPSIS
xdiff
[-toolkitoption]
[-bEiTvw]
filename1 filename2
DESCRIPTION
xdiff
provides a graphical front-end for
diff(1)
showing two files side-by-side
with differences highlighted in color.
By default,
matching lines are white
and different lines are red.
Lines that are in one file but not the other are green
and ``holes'' in the other file are dark gray.
OPTIONS
Xdiff
accepts all of the standard X Toolkit command line options
along with the additional options listed below.
In general,
relevant options from
diff(1)
have the same letters.
- -b
-
Ignores trailing blanks (spaces and tabs)
and treats other strings of blanks as equivalent.
- -E
-
Exit immediately, without opening a window,
if the two files are identical.
- -i
-
Ignores the case of letters;
for example, ``A'' will compare equal to ``a''.
- -T
-
Prints a 165-column wide text-only version to stdout.
(The code was useful for debugging, so I left it in there.)
Files are separated by the | (pipe) character.
For each file,
matching lines are preceded by two spaces,
different lines are preceded by ``C~'',
Lines that are in file1 only are preceded by ``<~'',
in file2 only, ``>~'',
and ``holes'' are preceded by``X~''.
- -v
-
Print the version number to stderr and exit.
- -w
-
Ignores all blanks (space and tab characters)
and treats all other strings of blanks as equivalent;
for example,
```if~(~a~==~b~)'' will compare equal to ``if(a==b)''.
X DEFAULTS
The application class name is XDiff.
It understands all of the core resource names and classes as well as:
- sameForeground (class SameForeground)
-
The foreground (text) color used when lines are the same.
Default: white.
- sameBackground (class SameBackground)
-
The background color used when lines are the same.
Default: black.
- diffForeground (class DiffForeground)
-
The foreground (text) color used when lines are different.
Default: red.
- diffBackground (class DiffBackground)
-
The background color used when lines are different.
Default: black.
- newForeground (class NewForeground)
-
The foreground (text) color used when lines are new.
Default: green.
- newBackground (class NewBackground)
-
The background color used when lines are new.
Default: black.
- holeColor (class HoleColor)
-
The color used for ``holes'' in files, i.e.,
lines that do not exist.
ACTIONS
Xdiff
provides the following actions for use in event translations:
- quit()
-
Causes the application to quit immediately.
The default translation table is:
- *translations: #override None<Key>q: quit()
NOTES
The geometry specification is interpreted as
<columns>x<rows> like an
xterm(1)
except that the <columns> specifies
the number of columns for one file or half the window.
Thus, a geometry specification of 80x24 will result in a window
wide enough to contain two 80 by 24 windows.
SEE ALSO
diff(1),
gdiff(SGI),
sdiff(1),
X(1),
xterm(1)
AUTHOR
Paul J. Lucas
Index
- NAME
-
- SYNOPSIS
-
- DESCRIPTION
-
- OPTIONS
-
- X DEFAULTS
-
- ACTIONS
-
- NOTES
-
- SEE ALSO
-
- AUTHOR
-
This document was created by
man2html,
using the manual pages.
Time: 23:34:46 GMT, September 27, 2019