aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schwab2005-01-04 15:25:43 +0000
committerAndreas Schwab2005-01-04 15:25:43 +0000
commit11bd2f9c9b6e1d2af39f2aab177614086e5a0aa4 (patch)
tree6101bb84daf0236e36011dc48cc381ac81e8e5f9
parent69ba53f79228c78cfa735d56df666ba721edab1c (diff)
downloademacs-11bd2f9c9b6e1d2af39f2aab177614086e5a0aa4.tar.gz
emacs-11bd2f9c9b6e1d2af39f2aab177614086e5a0aa4.zip
(insert-directory): Only look for error lines in
inserted text. Don't move too far after processing --dired markers.
-rw-r--r--lisp/files.el8
1 files changed, 3 insertions, 5 deletions
diff --git a/lisp/files.el b/lisp/files.el
index a4a102c9586..cdaa7a5adb8 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -4560,7 +4560,7 @@ normally equivalent short `-D' option is just passed on to
4560 error-lines) 4560 error-lines)
4561 ;; Find all the lines that are error messages, 4561 ;; Find all the lines that are error messages,
4562 ;; and record the bounds of each one. 4562 ;; and record the bounds of each one.
4563 (goto-char (point-min)) 4563 (goto-char beg)
4564 (while (< (point) linebeg) 4564 (while (< (point) linebeg)
4565 (or (eql (following-char) ?\s) 4565 (or (eql (following-char) ?\s)
4566 (push (list (point) (line-end-position)) error-lines)) 4566 (push (list (point) (line-end-position)) error-lines))
@@ -4586,11 +4586,9 @@ normally equivalent short `-D' option is just passed on to
4586 (end-of-line)))) 4586 (end-of-line))))
4587 (goto-char end) 4587 (goto-char end)
4588 (beginning-of-line) 4588 (beginning-of-line)
4589 (delete-region (point) (progn (forward-line 2) (point)))) 4589 (delete-region (point) (progn (forward-line 1) (point))))
4590 (forward-line 1)
4591 (if (looking-at "//DIRED-OPTIONS//") 4590 (if (looking-at "//DIRED-OPTIONS//")
4592 (delete-region (point) (progn (forward-line 1) (point))) 4591 (delete-region (point) (progn (forward-line 1) (point))))))
4593 (forward-line 1))))
4594 4592
4595 ;; Now decode what read if necessary. 4593 ;; Now decode what read if necessary.
4596 (let ((coding (or coding-system-for-read 4594 (let ((coding (or coding-system-for-read