[Emacs-diffs] Changes to emacs/lisp/dired.el

[Jan Djärv]

Index: emacs/lisp/dired.el
diff -c emacs/lisp/dired.el:1.295 emacs/lisp/dired.el:1.296
*** emacs/lisp/dired.el:1.295   Tue Nov  2 07:57:52 2004
--- emacs/lisp/dired.el Thu Nov  4 15:21:59 2004
***************
*** 546,553 ****
            (if current-prefix-arg
                (read-string "Dired listing switches: "
                             dired-listing-switches))
!           (read-directory-name (format "Dired %s(directory): " str)
!                           nil default-directory nil))))
  
  ;;;###autoload (define-key ctl-x-map "d" 'dired)
  ;;;###autoload
--- 546,559 ----
            (if current-prefix-arg
                (read-string "Dired listing switches: "
                             dired-listing-switches))
!           ;; If a dialog is about to be used, call read-directory-name so
!           ;; the dialog code knows we want directories.  Some dialogs can
!           ;; only select directories or files when popped up, not both.
!           (if (next-read-file-uses-dialog-p)
!               (read-directory-name (format "Dired %s(directory): " str)
!                                    nil default-directory nil)
!             (read-file-name (format "Dired %s(directory): " str)
!                             nil default-directory nil)))))
  
  ;;;###autoload (define-key ctl-x-map "d" 'dired)
  ;;;###autoload