# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 756621658 0
# Node ID 883c241eed1b2f3cb5484977fe50a0167e3c512d
# Parent  1b3421a9f072461b32f9593ace5de996aea6fd65
(dired-in-this-tree): Call expand-file-name.

(dired-goto-file): Call expand-file-name.

diff -r 1b3421a9f072 -r 883c241eed1b lisp/dired.el
--- a/lisp/dired.el	Thu Dec 23 04:40:13 1993 +0000
+++ b/lisp/dired.el	Thu Dec 23 04:40:58 1993 +0000
@@ -1259,7 +1259,7 @@
 (defun dired-in-this-tree (file dir)
   ;;"Is FILE part of the directory tree starting at DIR?"
   (let (case-fold-search)
-    (string-match (concat "^" (regexp-quote dir)) file)))
+    (string-match (concat "^" (regexp-quote (expand-file-name dir))) file)))
 
 (defun dired-normalize-subdir (dir)
   ;; Prepend default-directory to DIR if relative path name.
@@ -1400,7 +1400,7 @@
     (save-excursion
       ;; The hair here is to get the result of dired-goto-subdir
       ;; without really calling it if we don't have any subdirs.
-      (if (if (string= dir default-directory)
+      (if (if (string= dir (expand-file-name default-directory))
 	      (goto-char (point-min))
 	    (and (cdr dired-subdir-alist)
 		 (dired-goto-subdir dir)))