(dired-move-to-filename): Don't output a message if

raise-error is non-nil.  Fix return position and value.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c972f8ca8abbea3af38ac17a6c49ab3758404f3c..029affde9b8d62ab1ee3a30ed2fac8543b009c29 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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>

diff --git a/lisp/dired.el b/lisp/dired.el
index 43eec9408d4d2cb94ddfcd43a5a506ebdbbd4d92..d7e68c398456baf9f9fd47469193aac84d755985 100644 (file)
--- 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")))))