More dired-x cleanup.

* lisp/dired-x.el (dired-mode-map, dired-extra-startup):
Remove dired-copy-filename-as-kill since it's already in dired.el.

2 files changed, 5 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 10ca65a55a9..65453b44c22 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-16  Leo  <sdl.web@gmail.com>
+
+        * dired-x.el (dired-mode-map, dired-extra-startup):
+        Remove dired-copy-filename-as-kill since it's already in dired.el.
+
 2011-02-16  Glenn Morris  <rgm@gnu.org>
 
         * dired-x.el (dired-bind-jump, dired-bind-man, dired-bind-info):
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index fa064898ed4..0d16eef1c28 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -245,7 +245,6 @@ to nil: a pipe using `zcat' or `gunzip -c' will be used."
 (define-key dired-mode-map "*(" 'dired-mark-sexp)
 (define-key dired-mode-map "*." 'dired-mark-extension)
 (define-key dired-mode-map "\M-!" 'dired-smart-shell-command)
-(define-key dired-mode-map "w" 'dired-copy-filename-as-kill)
 (define-key dired-mode-map "\M-G" 'dired-goto-subdir)
 (define-key dired-mode-map "F" 'dired-do-find-marked-files)
 (define-key dired-mode-map "Y"  'dired-do-relsymlink)
@@ -308,8 +307,6 @@ files"]
   \\[dired-do-find-marked-files]\t-- visit all marked files simultaneously
   \\[dired-omit-mode]\t-- toggle omitting of files
   \\[dired-mark-sexp]\t-- mark by Lisp expression
-  \\[dired-copy-filename-as-kill]\t-- copy the file or subdir names into the kill ring;
-  \t   you can feed it to other commands using \\[yank]
 
 To see the options you can set, use M-x customize-group RET dired-x RET.
 See also the functions: