Mercurial > emacs
changeset 57228:445f56b6dc24
(dired-move-to-filename): Don't output a message if
raise-error is non-nil. Fix return position and value.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Sat, 25 Sep 2004 18:35:53 +0000 |
| parents | fab51779f86b |
| children | fb9de0d75bef |
| files | lisp/ChangeLog lisp/dired.el |
| diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Sep 25 15:29:35 2004 +0000 +++ b/lisp/ChangeLog Sat Sep 25 18:35:53 2004 +0000 @@ -1,5 +1,8 @@ 2004-09-25 Stefan <monnier@iro.umontreal.ca> + * dired.el (dired-move-to-filename): Don't output a message if + raise-error is non-nil. Fix return position and value. + * files.el (insert-directory): Obey --dired even with symlinks. 2004-09-25 Lars Hansen <larsh@math.ku.dk>
--- a/lisp/dired.el Sat Sep 25 15:29:35 2004 +0000 +++ b/lisp/dired.el Sat Sep 25 18:35:53 2004 +0000 @@ -1774,8 +1774,10 @@ (goto-char (match-end 0))) ((re-search-forward dired-permission-flags-regexp eol t) ;; Ha! There *is* a file. Our regexp-from-hell just failed to find it. - (funcall (if raise-error 'error 'message) - "Unrecognized line! Check dired-move-to-filename-regexp")) + (if raise-error + (error "Unrecognized line! Check dired-move-to-filename-regexp")) + (beginning-of-line) + nil) (raise-error (error "No file on this line")))))