* dired.el (dired-mode-map): Use command remapping (bug#6632).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2ef5d1509c08eb0089fab6e6ec0e3e402529f09f..ff3648d1824046574a285db3e1de81fced227ffd 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-22  Teemu Likonen  <tlikonen@iki.fi>  (tiny change)
+
+       * dired.el (dired-mode-map): Use command remapping (bug#6632).
+
 2010-07-22  Lawrence Mitchell  <wence@gmx.li>
 
        * term/vt100.el (vt100-wide-mode): Fix :init-value keyword (bug#6620).

diff --git a/lisp/dired.el b/lisp/dired.el
index 4fe804dd46de7bba923cc8fc433e5a68609aea39..15cb1b1facd7313769e3d691b616e1bd0b70d00f 100644 (file)
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1380,10 +1380,8 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST."
     (define-key map ">" 'dired-next-dirline)
     (define-key map "^" 'dired-up-directory)
     (define-key map " "  'dired-next-line)
-    (define-key map "\C-n" 'dired-next-line)
-    (define-key map "\C-p" 'dired-previous-line)
-    (define-key map [down] 'dired-next-line)
-    (define-key map [up] 'dired-previous-line)
+    (define-key map [remap next-line] 'dired-next-line)
+    (define-key map [remap previous-line] 'dired-previous-line)
     ;; hiding
     (define-key map "$" 'dired-hide-subdir)
     (define-key map "\M-$" 'dired-hide-all)
@@ -1393,7 +1391,7 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST."
     (define-key map (kbd "M-s f C-s")   'dired-isearch-filenames)
     (define-key map (kbd "M-s f M-C-s") 'dired-isearch-filenames-regexp)
     ;; misc
-    (define-key map "\C-x\C-q" 'dired-toggle-read-only)
+    (define-key map [remap toggle-read-only] 'dired-toggle-read-only)
     (define-key map "?" 'dired-summary)
     (define-key map "\177" 'dired-unmark-backward)
     (define-key map [remap undo] 'dired-undo)