[Emacs-diffs] trunk r115989: Some minor fixes

[Leo Liu]

------------------------------------------------------------
revno: 115989
revision-id: address@hidden
parent: address@hidden
committer: Leo Liu <address@hidden>
branch nick: trunk
timestamp: Sun 2014-01-12 18:29:59 +0800
message:
  Some minor fixes
  
  * dired-x.el (dired-mode-map): Fix last change.
  * emacs-lisp/eldoc.el (eldoc-mode): Add hook locally.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/dired-x.el                diredx.el-20091113204419-o5vbwnq5f7feedwu-649
  lisp/emacs-lisp/eldoc.el       eldoc.el-20091113204419-o5vbwnq5f7feedwu-952

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-01-12 05:29:11 +0000
+++ b/lisp/ChangeLog    2014-01-12 10:29:59 +0000
@@ -1,3 +1,9 @@
+2014-01-12  Leo Liu  <address@hidden>
+
+       * dired-x.el (dired-mode-map): Fix last change.
+
+       * emacs-lisp/eldoc.el (eldoc-mode): Add hook locally.
+
 2014-01-12  Paul Eggert  <address@hidden>
 
        Spelling fixes.
@@ -272,7 +278,7 @@
 2014-01-06  Leo Liu  <address@hidden>
 
        * 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  <address@hidden>
 

=== modified file 'lisp/dired-x.el'
--- a/lisp/dired-x.el   2014-01-06 05:04:57 +0000
+++ b/lisp/dired-x.el   2014-01-12 10:29:59 +0000
@@ -241,7 +241,7 @@
 
 ;;; 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)

=== modified file 'lisp/emacs-lisp/eldoc.el'
--- a/lisp/emacs-lisp/eldoc.el  2014-01-12 04:00:03 +0000
+++ b/lisp/emacs-lisp/eldoc.el  2014-01-12 10:29:59 +0000
@@ -187,7 +187,7 @@
        (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)))