diffutils/diffutils.patch@d2d0020cfafa (annotated)
diffutils/diffutils.patch
Tue, 28 Aug 2012 18:29:30 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Tue, 28 Aug 2012 18:29:30 +0200
- changeset 534
- d2d0020cfafa
- permissions
- -rw-r--r--
Update from Drupal 6.x to 7.x and introduce several new HTML5 themes. Because
many themes from Drupal 6.x have since been abandoned, left unmaintained, or
not ported to Drupal 7.x, this package has changed in size and utility.
| michael@458 | 1 | Index: lib/c-stack.c |
| michael@458 | 2 | --- lib/c-stack.c.orig 2011-08-28 13:55:52.000000000 +0200 |
| michael@458 | 3 | +++ lib/c-stack.c 2012-05-12 10:06:32.000000000 +0200 |
| michael@458 | 4 | @@ -35,6 +35,10 @@ |
| michael@458 | 5 | |
| michael@458 | 6 | #include <config.h> |
| michael@458 | 7 | |
| michael@458 | 8 | +#if defined(__FreeBSD__) |
| michael@458 | 9 | +#include <sys/types.h> |
| michael@458 | 10 | +#endif |
| michael@458 | 11 | + |
| michael@458 | 12 | #ifndef __attribute__ |
| michael@458 | 13 | # if __GNUC__ < 3 |
| michael@458 | 14 | # define __attribute__(x) |
| michael@458 | 15 | Index: man/diff3.1 |
| michael@458 | 16 | --- man/diff3.1.orig 2011-09-02 17:19:12.000000000 +0200 |
| michael@458 | 17 | +++ man/diff3.1 2012-05-12 10:06:32.000000000 +0200 |
| michael@458 | 18 | @@ -39,6 +39,9 @@ |
| michael@458 | 19 | \fB\-a\fR, \fB\-\-text\fR |
| michael@458 | 20 | treat all files as text |
| michael@458 | 21 | .TP |
| michael@458 | 22 | +\fB\-O\fR |
| michael@458 | 23 | +Always show content of OLDFILE in bracketing output of unmerged changes. (OpenPKG only) |
| michael@458 | 24 | +.TP |
| michael@458 | 25 | \fB\-\-strip\-trailing\-cr\fR |
| michael@458 | 26 | strip trailing carriage return on input |
| michael@458 | 27 | .TP |
| michael@458 | 28 | Index: src/diff3.c |
| michael@458 | 29 | --- src/diff3.c.orig 2011-07-03 22:42:54.000000000 +0200 |
| michael@458 | 30 | +++ src/diff3.c 2012-05-12 10:06:32.000000000 +0200 |
| michael@458 | 31 | @@ -158,6 +158,9 @@ |
| michael@458 | 32 | /* If nonzero, show information for DIFF_2ND diffs. */ |
| michael@458 | 33 | static bool show_2nd; |
| michael@458 | 34 | |
| michael@458 | 35 | +/* If nonzero, show information for DIFF_2ND on overlaps, too. */ |
| michael@458 | 36 | +static bool show_2nd_on_overlap; |
| michael@458 | 37 | + |
| michael@458 | 38 | /* If nonzero, include `:wq' at the end of the script |
| michael@458 | 39 | to write out the file being edited. */ |
| michael@458 | 40 | static bool finalwrite; |
| michael@458 | 41 | @@ -237,7 +240,7 @@ |
| michael@458 | 42 | textdomain (PACKAGE); |
| michael@458 | 43 | c_stack_action (0); |
| michael@458 | 44 | |
| michael@458 | 45 | - while ((c = getopt_long (argc, argv, "aeimvx3AEL:TX", longopts, 0)) != -1) |
| michael@458 | 46 | + while ((c = getopt_long (argc, argv, "aeimvx3AEL:TXO", longopts, 0)) != -1) |
| michael@458 | 47 | { |
| michael@458 | 48 | switch (c) |
| michael@458 | 49 | { |
| michael@458 | 50 | @@ -272,6 +275,9 @@ |
| michael@458 | 51 | case 'e': |
| michael@458 | 52 | incompat++; |
| michael@458 | 53 | break; |
| michael@458 | 54 | + case 'O': |
| michael@458 | 55 | + show_2nd_on_overlap = true; |
| michael@458 | 56 | + break; |
| michael@458 | 57 | case 'T': |
| michael@458 | 58 | initial_tab = true; |
| michael@458 | 59 | break; |
| michael@458 | 60 | @@ -1547,7 +1553,7 @@ |
| michael@458 | 61 | leading_dot = false; |
| michael@458 | 62 | if (type == DIFF_ALL) |
| michael@458 | 63 | { |
| michael@458 | 64 | - if (show_2nd) |
| michael@458 | 65 | + if (show_2nd || show_2nd_on_overlap) |
| michael@458 | 66 | { |
| michael@458 | 67 | /* Append lines from FILE1. */ |
| michael@458 | 68 | fprintf (outputfile, "||||||| %s\n", file1); |
| michael@458 | 69 | @@ -1686,7 +1692,7 @@ |
| michael@458 | 70 | D_RELLEN (b, mapping[FILE0], i), outputfile); |
| michael@458 | 71 | } |
| michael@458 | 72 | |
| michael@458 | 73 | - if (show_2nd) |
| michael@458 | 74 | + if (show_2nd || show_2nd_on_overlap) |
| michael@458 | 75 | { |
| michael@458 | 76 | /* Put in lines from FILE1 with bracket. */ |
| michael@458 | 77 | fprintf (outputfile, format_2nd, file1); |
