diff -r 4a1db75550bd -r 4a8edf69dd64 eric6/Documentation/Source/eric6.UI.DiffDialog.html
--- a/eric6/Documentation/Source/eric6.UI.DiffDialog.html Sun Oct 11 17:54:52 2020 +0200
+++ b/eric6/Documentation/Source/eric6.UI.DiffDialog.html Sun Oct 11 17:56:02 2020 +0200
@@ -46,15 +46,7 @@
<h3>Functions</h3>
<table>
-
-<tr>
-<td><a href="#context_diff">context_diff</a></td>
-<td>Compare two sequences of lines; generate the delta as a context diff.</td>
-</tr>
-<tr>
-<td><a href="#unified_diff">unified_diff</a></td>
-<td>Compare two sequences of lines; generate the delta as a unified diff.</td>
-</tr>
+<tr><td>None</td></tr>
</table>
<hr />
<hr />
@@ -352,196 +344,4 @@
</dl>
<div align="right"><a href="#top">Up</a></div>
<hr />
-<hr />
-<a NAME="context_diff" ID="context_diff"></a>
-<h2>context_diff</h2>
-<b>context_diff</b>(<i>a, b, fromfile='', tofile='', fromfiledate='', tofiledate='', n=3, lineterm='\n'</i>)
-
-<p>
- Compare two sequences of lines; generate the delta as a context diff.
-</p>
-<p>
- Context diffs are a compact way of showing line changes and a few
- lines of context. The number of context lines is set by 'n' which
- defaults to three.
-</p>
-<p>
- By default, the diff control lines (those with *** or ---) are
- created with a trailing newline. This is helpful so that inputs
- created from file.readlines() result in diffs that are suitable for
- file.writelines() since both the inputs and outputs have trailing
- newlines.
-</p>
-<p>
- For inputs that do not have trailing newlines, set the lineterm
- argument to "" so that the output will be uniformly newline free.
-</p>
-<p>
- The context diff format normally has a header for filenames and
- modification times. Any or all of these may be specified using
- strings for 'fromfile', 'tofile', 'fromfiledate', and 'tofiledate'.
- The modification times are normally expressed in the format returned
- by time.ctime(). If not specified, the strings default to blanks.
-</p>
-<p>
- Example:
-</p>
-<p>
- <pre>
- >>> print ''.join(
- ... context_diff('one\ntwo\nthree\nfour\n'.splitlines(1),
- ... 'zero\none\ntree\nfour\n'.splitlines(1), 'Original', 'Current',
- ... 'Sat Jan 26 23:30:50 1991', 'Fri Jun 06 10:22:46 2003')),
- *** Original Sat Jan 26 23:30:50 1991
- --- Current Fri Jun 06 10:22:46 2003
- ***************
- *** 1,4 ****
- one
- ! two
- ! three
- four
- --- 1,4 ----
- + zero
- one
- ! tree
- four
- </pre>
-</p>
-<dl>
-
-<dt><i>a</i></dt>
-<dd>
-first sequence of lines (list of strings)
-</dd>
-<dt><i>b</i></dt>
-<dd>
-second sequence of lines (list of strings)
-</dd>
-<dt><i>fromfile</i></dt>
-<dd>
-filename of the first file (string)
-</dd>
-<dt><i>tofile</i></dt>
-<dd>
-filename of the second file (string)
-</dd>
-<dt><i>fromfiledate</i></dt>
-<dd>
-modification time of the first file (string)
-</dd>
-<dt><i>tofiledate</i></dt>
-<dd>
-modification time of the second file (string)
-</dd>
-<dt><i>n</i></dt>
-<dd>
-number of lines of context (integer)
-</dd>
-<dt><i>lineterm</i></dt>
-<dd>
-line termination string (string)
-</dd>
-</dl>
-<dl>
-<dt>Returns:</dt>
-<dd>
-a generator yielding lines of differences
-</dd>
-</dl>
-<div align="right"><a href="#top">Up</a></div>
-<hr />
-<hr />
-<a NAME="unified_diff" ID="unified_diff"></a>
-<h2>unified_diff</h2>
-<b>unified_diff</b>(<i>a, b, fromfile='', tofile='', fromfiledate='', tofiledate='', n=3, lineterm='\n'</i>)
-
-<p>
- Compare two sequences of lines; generate the delta as a unified diff.
-</p>
-<p>
- Unified diffs are a compact way of showing line changes and a few
- lines of context. The number of context lines is set by 'n' which
- defaults to three.
-</p>
-<p>
- By default, the diff control lines (those with ---, +++, or @@) are
- created with a trailing newline. This is helpful so that inputs
- created from file.readlines() result in diffs that are suitable for
- file.writelines() since both the inputs and outputs have trailing
- newlines.
-</p>
-<p>
- For inputs that do not have trailing newlines, set the lineterm
- argument to "" so that the output will be uniformly newline free.
-</p>
-<p>
- The unidiff format normally has a header for filenames and modification
- times. Any or all of these may be specified using strings for
- 'fromfile', 'tofile', 'fromfiledate', and 'tofiledate'. The modification
- times are normally expressed in the format returned by time.ctime().
-</p>
-<p>
- Example:
-</p>
-<p>
- <pre>
- >>> for line in unified_diff('one two three four'.split(),
- ... 'zero one tree four'.split(), 'Original', 'Current',
- ... 'Sat Jan 26 23:30:50 1991', 'Fri Jun 06 10:20:52 2003',
- ... lineterm=''):
- ... print line
- --- Original Sat Jan 26 23:30:50 1991
- +++ Current Fri Jun 06 10:20:52 2003
-@ -1,4 +1,4 @@
- +zero
- one
- -two
- -three
- +tree
- four
- </pre>
-</p>
-<dl>
-
-<dt><i>a</i></dt>
-<dd>
-first sequence of lines (list of strings)
-</dd>
-<dt><i>b</i></dt>
-<dd>
-second sequence of lines (list of strings)
-</dd>
-<dt><i>fromfile</i></dt>
-<dd>
-filename of the first file (string)
-</dd>
-<dt><i>tofile</i></dt>
-<dd>
-filename of the second file (string)
-</dd>
-<dt><i>fromfiledate</i></dt>
-<dd>
-modification time of the first file (string)
-</dd>
-<dt><i>tofiledate</i></dt>
-<dd>
-modification time of the second file (string)
-</dd>
-<dt><i>n</i></dt>
-<dd>
-number of lines of context (integer)
-</dd>
-<dt><i>lineterm</i></dt>
-<dd>
-line termination string (string)
-</dd>
-</dl>
-<dl>
-<dt>Returns:</dt>
-<dd>
-a generator yielding lines of differences
-</dd>
-</dl>
-<div align="right"><a href="#top">Up</a></div>
-<hr />
</body></html>
\ No newline at end of file
