[Emacs-diffs] /srv/bzr/emacs/trunk r100864: * dired.el (dired-mode-map): Use command remapping (bug#6632).

[Juanma Barranquero]

------------------------------------------------------------
revno: 100864
author: Teemu Likonen <address@hidden>
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Thu 2010-07-22 13:54:27 +0200
message:
  * dired.el (dired-mode-map): Use command remapping (bug#6632).
modified:
  lisp/ChangeLog
  lisp/dired.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-07-22 11:09:52 +0000
+++ b/lisp/ChangeLog    2010-07-22 11:54:27 +0000
@@ -1,3 +1,7 @@
+2010-07-22  Teemu Likonen  <address@hidden>  (tiny change)
+
+       * dired.el (dired-mode-map): Use command remapping (bug#6632).
+
 2010-07-22  Lawrence Mitchell  <address@hidden>
 
        * term/vt100.el (vt100-wide-mode): Fix :init-value keyword (bug#6620).

=== modified file 'lisp/dired.el'
--- a/lisp/dired.el     2010-05-27 23:30:11 +0000
+++ b/lisp/dired.el     2010-07-22 11:54:27 +0000
@@ -1380,10 +1380,8 @@
     (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 @@
     (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)