(insert-directory): Only look for error lines in

inserted text.  Don't move too far after processing --dired
markers.

diff --git a/lisp/files.el b/lisp/files.el
index a4a102c9586d03ff48d3b637d25990755ca9c9c9..cdaa7a5adb8bed40ebb0b835ba39feb96ca0821a 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -4560,7 +4560,7 @@ normally equivalent short `-D' option is just passed on to
                    error-lines)
                ;; Find all the lines that are error messages,
                ;; and record the bounds of each one.
-               (goto-char (point-min))
+               (goto-char beg)
                (while (< (point) linebeg)
                  (or (eql (following-char) ?\s)
                      (push (list (point) (line-end-position)) error-lines))
@@ -4586,11 +4586,9 @@ normally equivalent short `-D' option is just passed on to
                      (end-of-line))))
                (goto-char end)
                (beginning-of-line)
-               (delete-region (point) (progn (forward-line 2) (point))))
-             (forward-line 1)
+               (delete-region (point) (progn (forward-line 1) (point))))
              (if (looking-at "//DIRED-OPTIONS//")
-                 (delete-region (point) (progn (forward-line 1) (point)))
-               (forward-line 1))))
+                 (delete-region (point) (progn (forward-line 1) (point))))))
 
          ;; Now decode what read if necessary.
          (let ((coding (or coding-system-for-read