diff options
Diffstat (limited to 'editors/diff.c')
-rw-r--r-- | editors/diff.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/editors/diff.c b/editors/diff.c index f9e82ba02..486077847 100644 --- a/editors/diff.c +++ b/editors/diff.c | |||
@@ -1208,17 +1208,16 @@ int diff_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | |||
1208 | int diff_main(int argc ATTRIBUTE_UNUSED, char **argv) | 1208 | int diff_main(int argc ATTRIBUTE_UNUSED, char **argv) |
1209 | { | 1209 | { |
1210 | bool gotstdin = 0; | 1210 | bool gotstdin = 0; |
1211 | char *U_opt; | ||
1212 | char *f1, *f2; | 1211 | char *f1, *f2; |
1213 | llist_t *L_arg = NULL; | 1212 | llist_t *L_arg = NULL; |
1214 | 1213 | ||
1215 | INIT_G(); | 1214 | INIT_G(); |
1216 | 1215 | ||
1217 | /* exactly 2 params; collect multiple -L <label> */ | 1216 | /* exactly 2 params; collect multiple -L <label>; -U N */ |
1218 | opt_complementary = "=2:L::"; | 1217 | opt_complementary = "=2:L::U+"; |
1219 | getopt32(argv, "abdiL:NqrsS:tTU:wu" | 1218 | getopt32(argv, "abdiL:NqrsS:tTU:wu" |
1220 | "p" /* ignored (for compatibility) */, | 1219 | "p" /* ignored (for compatibility) */, |
1221 | &L_arg, &start, &U_opt); | 1220 | &L_arg, &start, &context); |
1222 | /*argc -= optind;*/ | 1221 | /*argc -= optind;*/ |
1223 | argv += optind; | 1222 | argv += optind; |
1224 | while (L_arg) { | 1223 | while (L_arg) { |
@@ -1233,8 +1232,6 @@ int diff_main(int argc ATTRIBUTE_UNUSED, char **argv) | |||
1233 | /* we leak L_arg here... */ | 1232 | /* we leak L_arg here... */ |
1234 | L_arg = L_arg->link; | 1233 | L_arg = L_arg->link; |
1235 | } | 1234 | } |
1236 | if (option_mask32 & FLAG_U) | ||
1237 | context = xatoi_u(U_opt); | ||
1238 | 1235 | ||
1239 | /* | 1236 | /* |
1240 | * Do sanity checks, fill in stb1 and stb2 and call the appropriate | 1237 | * Do sanity checks, fill in stb1 and stb2 and call the appropriate |