Some minor fixes

* dired-x.el (dired-mode-map): Fix last change.
* emacs-lisp/eldoc.el (eldoc-mode): Add hook locally.

3 files changed, 9 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2e2814fe46b..7abcbee02b2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2014-01-12  Leo Liu  <sdl.web@gmail.com>
+
+        * dired-x.el (dired-mode-map): Fix last change.
+
+        * emacs-lisp/eldoc.el (eldoc-mode): Add hook locally.
+
 2014-01-12  Paul Eggert  <eggert@cs.ucla.edu>
 
         Spelling fixes.
@@ -272,7 +278,7 @@
 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)
+        to avoid shadowing global key.  (Bug#16354)
 
 2014-01-06  Daniel Colascione  <dancol@dancol.org>
 
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index a1ee1fa2e07..947de7cd9f8 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 "\C-c\M-o" 'dired-omit-mode)
+(define-key dired-mode-map "\C-x\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)
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index 1c64e28c76b..fa1574b0a88 100644
--- a/lisp/emacs-lisp/eldoc.el
+++ b/lisp/emacs-lisp/eldoc.el
@@ -187,7 +187,7 @@ expression point is on."
         (when eldoc-print-after-edit
           (setq-local eldoc-message-commands (eldoc-edit-message-commands)))
         (add-hook 'post-command-hook 'eldoc-schedule-timer nil t)
-        (add-hook 'pre-command-hook 'eldoc-pre-command-refresh-echo-area t))
+        (add-hook 'pre-command-hook 'eldoc-pre-command-refresh-echo-area nil t))
     (kill-local-variable 'eldoc-message-commands)
     (remove-hook 'post-command-hook 'eldoc-schedule-timer t)
     (remove-hook 'pre-command-hook 'eldoc-pre-command-refresh-echo-area t)))