sakura/en/Diff

Diff

The difference of each line by DIFF is displayed.

Diff.exe is necessary to use the DIFF difference display.
Diff.exe is not included in the package.
Please download it from the software distribution site etc. separately.

Note:
GNU DIFF 2.5/2.7 is necessary.
Diff of the WinCVS 1.2 attachment cannot not correctly treat the space under passing and do not use it, please.

At the obtaining destination: GNU diff http://www.fsci.fuk.kindai.ac.jp/kakuto/soft.html

When the difference is displayed, the state of the difference is displayed at the left of the line number.
The meaning of the state of the difference is as follows.

• "+" Add :
  It doesn't exist in the other party file though it exists in the file while the line is editing it.
• "!" Upd :
  It is different because of the file and the other party file while the line is editing it. It is likely to be included before and behind the line.
• "^"(Up) Del :
  There is a line that doesn't exist in the file while editing it though it exists in the other party file between the line and the previous line.
• "v"(Down) Del :
  There is a line that doesn't exist in the file while editing it though it exists in the other party file next to the line. It becomes since EOF.

It sets it to the color of the line number of the difference display according to the type It is possible to set it in 'Color' property.

Hint:
It is necessary to put diff.exe on the same folder as the main body of the Sakura-Editor.
Diff.exe should not be DOS version (= WinCUI version) ..interchangeable GNU diff 2.5/2.7...
Please note that there is a thing that passing including space cannot be treated, too.

Macro Syntax

• Syntax
  DiffDialog( );

• Record
  Not support

• Syntax
  Diff( str1 :String, int2 :Integer );
  • str1 : Filename
  • int2 : Option

• Record
  Not support

• Remarks
  The combination of the following values can be specified for the option.
  • 0x01 : Case insensitive.
  • 0x02 : Ignore blank.
  • 0x04 : Ignore modify blank.
  • 0x08 : Ignore blank line.
  • 0x10 : TAB-SPACE convert.
  • 0x20 : The file under the edit old files it.
  • 0x40 : The message is displayed when there is no DIFF difference.
  • 0x80 : - No Use -