2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 588c14d8bec..2fc7694ec61 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2002-09-15  Markus Rost  <rost@math.ohio-state.edu>
+
+        * dired.el (dired-move-to-filename): Fix previous change.
+
 2002-09-14  Kim F. Storm  <storm@cua.dk>
 
         * emulation/keypad.el (keypad-setup, keypad-shifted-setup)
diff --git a/lisp/dired.el b/lisp/dired.el
index f0306d32d7a..43941bc17aa 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1589,7 +1589,8 @@ regardless of the language.")
   ;; First try assuming `ls --dired' was used.
   (let ((change (next-single-property-change (point) 'dired-filename
                                              nil eol)))
-    (if change (goto-char change)
+    (if (and change (< change eol))
+        (goto-char change)
       (if (re-search-forward dired-move-to-filename-regexp eol t)
           (goto-char (match-end 0))
         (if raise-error