* dired-x.el (dired-mode-map): Rebind dired-omit-mode to C-x M-o

to avoid shadowning global key.

Fixes: debbugs:16354

2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 551ef51d2e5..e85ea060a0d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-06  Leo Liu  <sdl.web@gmail.com>
+
+        * dired-x.el (dired-mode-map): Rebind dired-omit-mode to C-x M-o
+        to avoid shadowning global key.  (Bug#16354)
+
 2014-01-06  Daniel Colascione  <dancol@dancol.org>
 
         * textmodes/rst.el (rst-mode): Set electric-indent-inhibit for
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index fa1f753c43b..a1ee1fa2e07 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -241,7 +241,7 @@ to nil: a pipe using `zcat' or `gunzip -c' will be used."
 
 ;;; KEY BINDINGS.
 
-(define-key dired-mode-map "\M-o" 'dired-omit-mode)
+(define-key dired-mode-map "\C-c\M-o" 'dired-omit-mode)
 (define-key dired-mode-map "*O" 'dired-mark-omitted)
 (define-key dired-mode-map "\M-(" 'dired-mark-sexp)
 (define-key dired-mode-map "*(" 'dired-mark-sexp)