1 files changed, 9 insertions, 17 deletions

diff --git a/editors/sed.c b/editors/sed.c
index f8ca5d351..3a0d917aa 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -330,7 +330,7 @@ static int get_address(const char *my_str, int *linenum, regex_t ** regex)
                 next = index_of_next_unescaped_regexp_delim(delimiter, ++pos);
                 temp = copy_parsing_escapes(pos, next);
                 *regex = xzalloc(sizeof(regex_t));
-                xregcomp(*regex, temp, G.regex_type|REG_NEWLINE);
+                xregcomp(*regex, temp, G.regex_type);
                 free(temp);
                 /* Move position to next character after last delimiter */
                 pos += (next+1);
@@ -649,6 +649,12 @@ static void add_cmd(const char *cmdstr)
                 sed_cmd->cmd = *cmdstr++;
                 cmdstr = parse_cmd_args(sed_cmd, cmdstr);
 
+                /* cmdstr now points past args.
+                 * GNU sed requires a separator, if there are more commands,
+                 * else it complains "char N: extra characters after command".
+                 * Example: "sed 'p;d'". We also allow "sed 'pd'".
+                 */
+
                 /* Add the command to the command array */
                 *G.sed_cmd_tail = sed_cmd;
                 G.sed_cmd_tail = &sed_cmd->next;
@@ -1371,7 +1377,7 @@ static void process_files(void)
 /* It is possible to have a command line argument with embedded
  * newlines.  This counts as multiple command lines.
  * However, newline can be escaped: 's/e/z\<newline>z/'
- * We check for this.
+ * add_cmd() handles this.
  */
 
 static void add_cmd_block(char *cmdstr)
@@ -1381,22 +1387,8 @@ static void add_cmd_block(char *cmdstr)
         cmdstr = sv = xstrdup(cmdstr);
         do {
                 eol = strchr(cmdstr, '\n');
- next:
-                if (eol) {
-                        /* Count preceding slashes */
-                        int slashes = 0;
-                        char *sl = eol;
-
-                        while (sl != cmdstr && *--sl == '\\')
-                                slashes++;
-                        /* Odd number of preceding slashes - newline is escaped */
-                        if (slashes & 1) {
-                                overlapping_strcpy(eol - 1, eol);
-                                eol = strchr(eol, '\n');
-                                goto next;
-                        }
+                if (eol)
                         *eol = '\0';
-                }
                 add_cmd(cmdstr);
                 cmdstr = eol + 1;
         } while (eol);