(dired-find-file): Bind find-file-run-dired around the call to find-file.

From Dan Nicolaescu <dann@ics.uci.edu>.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3a8e0c52fb65b83225ecddd0ff644db0565b3dbb..5a5494c5a134cd29006c7db1f5eb7890dc01d942 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-24  Pavel Jan\e,Bm\e(Bk  <Pavel@Janik.cz>
+
+       * dired.el (dired-find-file): Bind find-file-run-dired around the
+       call to find-file.  From Dan Nicolaescu <dann@ics.uci.edu>.
+
 2002-06-18  Juanma Barranquero  <lektu@terra.es>
 
        * eshell/em-pred.el (eshell-modifier-help-string): Fix typos.

diff --git a/lisp/dired.el b/lisp/dired.el
index 5361bdd22bf57e3ef12eaa55c6596db90cf42952..df8ff1daed2705acf014782d698e03feb19dc2ac 100644 (file)
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1360,7 +1360,10 @@ Creates a buffer if necessary."
 (defun dired-find-file ()
   "In dired, visit the file or directory named on this line."
   (interactive)
-  (let ((file-name (file-name-sans-versions (dired-get-filename) t)))
+  (let ((file-name (file-name-sans-versions (dired-get-filename) t))
+       ;; bind it so that the command works on directories too,
+       ;; independent of of the user's setting
+       (find-file-run-dired t))
     (if (file-exists-p file-name)
        (find-file file-name)
       (if (file-symlink-p file-name)