--- doc/sed.1.orig 2006-02-03 01:27:35.000000000 -0800 +++ doc/sed.1 2006-08-29 01:44:35.000000000 -0700 @@ -44,7 +44,7 @@ .IP disable all GNU extensions. .HP -\fB\-r\fR, \fB\-\-regexp\-extended\fR +\fB\-E\fR, \fB\-r\fR, \fB\-\-regexp\-extended\fR .IP use extended regular expressions in the script. .HP --- doc/sed-in.texi.orig 2006-01-29 23:27:12.000000000 -0800 +++ doc/sed-in.texi 2006-08-29 01:45:30.000000000 -0700 @@ -277,8 +277,10 @@ extension, you can set the @code{POSIXLY_CORRECT} variable to a non-empty value. -@item -r +@item -E +@itemx -r @itemx --regexp-extended +@opindex -E @opindex -r @opindex --regexp-extended @cindex Extended regular expressions, choosing --- sed/sed.c.orig 2005-06-21 07:09:47.000000000 -0700 +++ sed/sed.c 2006-08-29 01:44:35.000000000 -0700 @@ -111,7 +111,7 @@ specify the desired line-wrap length for the `l' command\n")); fprintf(out, _(" --posix\n\ disable all GNU extensions.\n")); - fprintf(out, _(" -r, --regexp-extended\n\ + fprintf(out, _(" -E, -r, --regexp-extended\n\ use extended regular expressions in the script.\n")); fprintf(out, PERL_HELP); fprintf(out, _(" -s, --separate\n\ @@ -142,9 +142,9 @@ char **argv; { #ifdef REG_PERL -#define SHORTOPTS "snrRue:f:l:i::V:" +#define SHORTOPTS "snErRue:f:l:i::V:" #else -#define SHORTOPTS "snrue:f:l:i::V:" +#define SHORTOPTS "snErue:f:l:i::V:" #endif static struct option longopts[] = { @@ -241,6 +241,7 @@ posixicity = POSIXLY_BASIC; break; + case 'E': case 'r': if (extended_regexp_flags) usage(4);