aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/dired.el15
1 files changed, 7 insertions, 8 deletions
diff --git a/lisp/dired.el b/lisp/dired.el
index f87f02a6958..efdd09dcd4b 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1154,14 +1154,13 @@ Optional arg NO-ERROR-IF-NOT-FILEP means return nil if no filename on
1154 ;; This is the UNIX version. 1154 ;; This is the UNIX version.
1155 (or eol (setq eol (progn (end-of-line) (point)))) 1155 (or eol (setq eol (progn (end-of-line) (point))))
1156 (beginning-of-line) 1156 (beginning-of-line)
1157 (if (and (re-search-forward dired-move-to-filename-regexp eol t) 1157 (or (if (re-search-forward dired-move-to-filename-regexp eol t)
1158 (looking-at " \\([0-9][0-9]:[0-9][0-9]\\| [0-9]+\\|[0-9]+ \\) ")) 1158 (progn
1159 (progn 1159 (goto-char (match-end 0))
1160 (goto-char (match-end 0)) 1160 (if (= 7 (skip-chars-forward " 0-9:" (+ (point) 7)))
1161 (point)) 1161 (point))))
1162 (if raise-error 1162 (if raise-error
1163 (error "No file on this line") 1163 (error "No file on this line"))))
1164 nil)))
1165 1164
1166(defun dired-move-to-end-of-filename (&optional no-error) 1165(defun dired-move-to-end-of-filename (&optional no-error)
1167 ;; Assumes point is at beginning of filename, 1166 ;; Assumes point is at beginning of filename,