diff options
| author | Stefan Monnier <[email protected]> | 2004-09-25 18:35:53 +0000 |
|---|---|---|
| committer | Stefan Monnier <[email protected]> | 2004-09-25 18:35:53 +0000 |
| commit | 1f3b4d04d097914748cfb14636241d831e6d5ae8 (patch) | |
| tree | bcf252f69f7e618f47db6f6e30fbd59c60fbd3b0 /lisp | |
| parent | 52e281e87aaed70dc4e999e95b260b792d9cef64 (diff) | |
(dired-move-to-filename): Don't output a message if
raise-error is non-nil. Fix return position and value.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/dired.el | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c972f8ca8a..029affde9b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2004-09-25 Stefan <[email protected]> + * 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 <[email protected]> diff --git a/lisp/dired.el b/lisp/dired.el index 43eec9408d..d7e68c3984 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -1774,8 +1774,10 @@ regardless of the language.") (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"))))) |