2 files changed, 4 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c644bba15df..9bf1efb7bf9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2006-05-21  Romain Francoise  <romain@orebokech.com>
+
+        * dired-x.el (dired-mode-map): Don't bind M-g.
+
 2006-05-20  Richard Stallman  <rms@gnu.org>
 
         * dired.el (dired-mode-map): Put dired-goto-file on j, not M-g.
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index 0a467920f11..4d3734bbd5a 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -251,7 +251,6 @@ to nil: a pipe using `zcat' or `gunzip -c' will be used."
 (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-file)
 (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)