diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2009-11-08 00:32:18 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2009-11-08 00:32:18 +0000 |
| commit | bedd8a58d891cda65802614838c353c0dbbc9900 (patch) | |
| tree | e918b69fd912739154bffd9fbae1f24f62226a6a /lisp/dired.el | |
| parent | c0df13a6e3e1cf0d5bd2c3aac1be059b6ab2dd24 (diff) | |
| download | emacs-bedd8a58d891cda65802614838c353c0dbbc9900.tar.gz | |
* dired-aux.el (dired-query): Place cursor in echo area and allow
C-g.
* dired.el (dired-mode-map): Disable dired-maybe-insert-subdir
menu item if not on a directory (Bug#4701).
Diffstat (limited to 'lisp/dired.el')
| -rw-r--r-- | lisp/dired.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/dired.el b/lisp/dired.el index 14fe286c82f..34c17ea4f5d 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -1388,8 +1388,9 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST." :help "Move to previous directory-file line")) (define-key map [menu-bar subdir insert] '(menu-item "Insert This Subdir" dired-maybe-insert-subdir - :help "Insert contents of subdirectory")) - + :help "Insert contents of subdirectory" + :enable (let ((f (dired-get-filename nil t))) + (and f (file-directory-p f))))) (define-key map [menu-bar immediate] (cons "Immediate" (make-sparse-keymap "Immediate"))) @@ -3454,7 +3455,7 @@ Ask means pop up a menu for the user to select one of copy, move or link." ;;;;;; dired-run-shell-command dired-do-shell-command dired-do-async-shell-command ;;;;;; dired-clean-directory dired-do-print dired-do-touch dired-do-chown ;;;;;; dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff -;;;;;; dired-diff) "dired-aux" "dired-aux.el" "6c7ccd455c2cd50d48164ebd5c52e216") +;;;;;; dired-diff) "dired-aux" "dired-aux.el" "e207e02ac395d10ee4a09e208081a0ce") ;;; Generated autoloads from dired-aux.el (autoload 'dired-diff "dired-aux" "\ |