bug#7126: 24.0.50; [PATCH] `dired-goto-file' fails when `dired' is passed a cons with absolutefile names

["Drew Adams" <drew.adams@oracle.com>]

[-- Attachment #1: Type: text/plain, Size: 92 bytes --]

I think the attached patch takes care of it.
But it would be good if others also tested it.

[-- Attachment #2: dired-2010-09-28.patch --]
[-- Type: application/octet-stream, Size: 2004 bytes --]

diff -cw dired.el dired-patched-2010-09-28.el
*** dired.el	Tue Sep 28 16:42:22 2010
--- dired-patched-2010-09-28.el	Tue Sep 28 16:48:48 2010
***************
*** 2480,2486 ****
--- 2480,2498 ----
      (setq dir (or (file-name-directory file)
  		  (error "File name `%s' is not absolute" file)))
      (save-excursion
+       (goto-char (point-min))
+       (let ((search-string  (replace-regexp-in-string "\^m" "\\^m" file nil t)))
+         (setq search-string  (replace-regexp-in-string "\\\\" "\\\\" search-string nil t))
+         (while (and (not (eobp)) (not found))
+           (if (search-forward (concat " " search-string) nil 'NO-ERROR)
+               ;; Must move to filename since an (actually correct) match could have been
+               ;; elsewhere on the line (e.g. "-" would match somewhere in permission bits).
+               (setq found  (dired-move-to-filename))
+             ;; If this isn't the right line, move forward to avoid trying this line again.
+             (forward-line 1)))))
+     (unless found
        ;; The hair here is to get the result of dired-goto-subdir
+       (save-excursion
          ;; without really calling it if we don't have any subdirs.
          (if (if (string= dir (expand-file-name default-directory))
                  (goto-char (point-min))
***************
*** 2509,2515 ****
  		  (setq found (dired-move-to-filename))
  		;; If this isn't the right line, move forward to avoid
  		;; trying this line again.
! 		(forward-line 1))))))
      (and found
  	 ;; return value of point (i.e., FOUND):
  	 (goto-char found))))
--- 2521,2527 ----
                      (setq found (dired-move-to-filename))
                    ;; If this isn't the right line, move forward to avoid
                    ;; trying this line again.
!                   (forward-line 1)))))))
      (and found
  	 ;; return value of point (i.e., FOUND):
  	 (goto-char found))))

Diff finished.  Tue Sep 28 16:49:01 2010