2 files changed, 5 insertions, 8 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;
 int diff_main(int argc ATTRIBUTE_UNUSED, char **argv)
 {
        bool gotstdin = 0;
-        char *U_opt;
        char *f1, *f2;
        llist_t *L_arg = NULL;
        INIT_G();
-        /* exactly 2 params; collect multiple -L <label> */
+        /* exactly 2 params; collect multiple -L <label>; -U N */
-        opt_complementary = "=2:L::";
+        opt_complementary = "=2:L::U+";
        getopt32(argv, "abdiL:NqrsS:tTU:wu"
                        "p" /* ignored (for compatibility) */,
-                        &L_arg, &start, &U_opt);
+                        &L_arg, &start, &context);
        /*argc -= optind;*/
        argv += optind;
        while (L_arg) {
@@ -1233,8 +1232,6 @@ int diff_main(int argc ATTRIBUTE_UNUSED, char **argv)
                /* we leak L_arg here... */
                L_arg = L_arg->link;
        }
-        if (option_mask32 & FLAG_U)
-                context = xatoi_u(U_opt);
        /*
         * Do sanity checks, fill in stb1 and stb2 and call the appropriate
diff --git a/editors/ed.c b/editors/ed.c
index 15f0147be..9606cfdde 100644
--- a/editors/ed.c
+++ b/editors/ed.c
@@ -89,7 +89,7 @@ static char *skip_blank(const char *cp)
 int ed_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int ed_main(int argc, char **argv)
+int ed_main(int argc ATTRIBUTE_UNUSED, char **argv)
 {
        INIT_G();
@@ -99,7 +99,7 @@ int ed_main(int argc, char **argv)
        lines.next = &lines;
        lines.prev = &lines;
-        if (argc > 1) {
+        if (argv[1]) {
                fileName = xstrdup(argv[1]);
                if (!readLines(fileName, 1)) {
                        return EXIT_SUCCESS;