Mercurial > emacs
comparison lisp/dired.el @ 91204:53108e6cea98
Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-294
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Thu, 06 Dec 2007 09:51:45 +0000 |
| parents | 1251cabc40b7 93df56120f01 |
| children | 2fcaae6177a5 |
comparison
equal
deleted
inserted
replaced
| 91203:db40129142b2 | 91204:53108e6cea98 |
|---|---|
| 593 ;; the dialog code knows we want directories. Some dialogs can | 593 ;; the dialog code knows we want directories. Some dialogs can |
| 594 ;; only select directories or files when popped up, not both. | 594 ;; only select directories or files when popped up, not both. |
| 595 (if (next-read-file-uses-dialog-p) | 595 (if (next-read-file-uses-dialog-p) |
| 596 (read-directory-name (format "Dired %s(directory): " str) | 596 (read-directory-name (format "Dired %s(directory): " str) |
| 597 nil default-directory nil) | 597 nil default-directory nil) |
| 598 (read-file-name (format "Dired %s(directory): " str) | 598 (let ((default (and buffer-file-name |
| 599 nil default-directory nil))))) | 599 (abbreviate-file-name buffer-file-name)))) |
| 600 (minibuffer-with-setup-hook | |
| 601 (lambda () (setq minibuffer-default default)) | |
| 602 (read-file-name (format "Dired %s(directory): " str) | |
| 603 nil default-directory nil))))))) | |
| 600 | 604 |
| 601 ;;;###autoload (define-key ctl-x-map "d" 'dired) | 605 ;;;###autoload (define-key ctl-x-map "d" 'dired) |
| 602 ;;;###autoload | 606 ;;;###autoload |
| 603 (defun dired (dirname &optional switches) | 607 (defun dired (dirname &optional switches) |
| 604 "\"Edit\" directory DIRNAME--delete, rename, print, etc. some files in it. | 608 "\"Edit\" directory DIRNAME--delete, rename, print, etc. some files in it. |
| 3262 ("Cancel" . nil))))))) | 3266 ("Cancel" . nil))))))) |
| 3263 (if action | 3267 (if action |
| 3264 (dired-dnd-handle-local-file uri action) | 3268 (dired-dnd-handle-local-file uri action) |
| 3265 nil))) | 3269 nil))) |
| 3266 | 3270 |
| 3271 (declare-function dired-relist-entry "dired-aux" (file)) | |
| 3272 (declare-function make-symbolic-link "fileio.c") | |
| 3273 | |
| 3267 (defun dired-dnd-handle-local-file (uri action) | 3274 (defun dired-dnd-handle-local-file (uri action) |
| 3268 "Copy, move or link a file to the dired directory. | 3275 "Copy, move or link a file to the dired directory. |
| 3269 URI is the file to handle, ACTION is one of copy, move, link or ask. | 3276 URI is the file to handle, ACTION is one of copy, move, link or ask. |
| 3270 Ask means pop up a menu for the user to select one of copy, move or link." | 3277 Ask means pop up a menu for the user to select one of copy, move or link." |
| 3271 (require 'dired-aux) | 3278 (require 'dired-aux) |