[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/files.el
From: |
Luc Teirlinck |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/files.el |
Date: |
Sun, 23 Jan 2005 15:40:23 -0500 |
Index: emacs/lisp/files.el
diff -c emacs/lisp/files.el:1.742 emacs/lisp/files.el:1.743
*** emacs/lisp/files.el:1.742 Tue Jan 4 15:25:43 2005
--- emacs/lisp/files.el Sun Jan 23 20:40:21 2005
***************
*** 4550,4594 ****
(when (if (stringp switches)
(string-match "--dired\\>" switches)
(member "--dired" switches))
(forward-line -2)
(when (looking-at "//SUBDIRED//")
(delete-region (point) (progn (forward-line 1) (point)))
(forward-line -1))
! (when (looking-at "//DIRED//")
! (let ((end (line-end-position))
! (linebeg (point))
! error-lines)
! ;; Find all the lines that are error messages,
! ;; and record the bounds of each one.
! (goto-char beg)
! (while (< (point) linebeg)
! (or (eql (following-char) ?\s)
! (push (list (point) (line-end-position)) error-lines))
! (forward-line 1))
! (setq error-lines (nreverse error-lines))
! ;; Now read the numeric positions of file names.
! (goto-char linebeg)
! (forward-word 1)
! (forward-char 3)
! (while (< (point) end)
! (let ((start (insert-directory-adj-pos
(+ beg (read (current-buffer)))
! error-lines))
! (end (insert-directory-adj-pos
! (+ beg (read (current-buffer)))
! error-lines)))
! (if (memq (char-after end) '(?\n ?\ ))
! ;; End is followed by \n or by " -> ".
! (put-text-property start end 'dired-filename t)
! ;; It seems that we can't trust ls's output as to
! ;; byte positions of filenames.
! (put-text-property beg (point) 'dired-filename nil)
! (end-of-line))))
! (goto-char end)
! (beginning-of-line)
! (delete-region (point) (progn (forward-line 1) (point))))
! (if (looking-at "//DIRED-OPTIONS//")
! (delete-region (point) (progn (forward-line 1) (point))))))
;; Now decode what read if necessary.
(let ((coding (or coding-system-for-read
--- 4550,4603 ----
(when (if (stringp switches)
(string-match "--dired\\>" switches)
(member "--dired" switches))
+ ;; The following overshoots by one line for an empty
+ ;; directory listed with "--dired", but without "-a"
+ ;; switch, where the ls output contains a
+ ;; "//DIRED-OPTIONS//" line, but no "//DIRED//" line.
+ ;; We take care of that case later.
(forward-line -2)
(when (looking-at "//SUBDIRED//")
(delete-region (point) (progn (forward-line 1) (point)))
(forward-line -1))
! (if (looking-at "//DIRED//")
! (let ((end (line-end-position))
! (linebeg (point))
! error-lines)
! ;; Find all the lines that are error messages,
! ;; and record the bounds of each one.
! (goto-char beg)
! (while (< (point) linebeg)
! (or (eql (following-char) ?\s)
! (push (list (point) (line-end-position)) error-lines))
! (forward-line 1))
! (setq error-lines (nreverse error-lines))
! ;; Now read the numeric positions of file names.
! (goto-char linebeg)
! (forward-word 1)
! (forward-char 3)
! (while (< (point) end)
! (let ((start (insert-directory-adj-pos
! (+ beg (read (current-buffer)))
! error-lines))
! (end (insert-directory-adj-pos
(+ beg (read (current-buffer)))
! error-lines)))
! (if (memq (char-after end) '(?\n ?\ ))
! ;; End is followed by \n or by " -> ".
! (put-text-property start end 'dired-filename t)
! ;; It seems that we can't trust ls's output as to
! ;; byte positions of filenames.
! (put-text-property beg (point) 'dired-filename nil)
! (end-of-line))))
! (goto-char end)
! (beginning-of-line)
! (delete-region (point) (progn (forward-line 1) (point))))
! ;; Take care of the case where the ls output contains a
! ;; "//DIRED-OPTIONS//"-line, but no "//DIRED//"-line
! ;; and we went one line too far back (see above).
! (forward-line 1))
! (if (looking-at "//DIRED-OPTIONS//")
! (delete-region (point) (progn (forward-line 1) (point)))))
;; Now decode what read if necessary.
(let ((coding (or coding-system-for-read