diff options
| author | Leo Liu <sdl.web@gmail.com> | 2014-01-06 13:04:57 +0800 |
|---|---|---|
| committer | Leo Liu <sdl.web@gmail.com> | 2014-01-06 13:04:57 +0800 |
| commit | 53f6b148fcd9a9055951cdbf25e77d81087c166f (patch) | |
| tree | 943aa0f1875aeae7f52d6f266b777327eb1af57a | |
| parent | b82ace2f23dd390d743935f7ae8486cf9daadcac (diff) | |
| download | emacs-53f6b148fcd9a9055951cdbf25e77d81087c166f.tar.gz | |
* dired-x.el (dired-mode-map): Rebind dired-omit-mode to C-x M-o
to avoid shadowning global key.
Fixes: debbugs:16354
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/dired-x.el | 2 |
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) |