diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-10-15 13:32:41 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-10-15 13:32:41 -0400 |
| commit | dcdf2bd8d690168eed44563651e2d8f379b9c80e (patch) | |
| tree | 5de46491f3995fbf10f56c780370f6bf00815a13 /lisp/loadup.el | |
| parent | f65b226e7abf1e746d9f6a995bf7db3da1997795 (diff) | |
| download | emacs-dcdf2bd8d690168eed44563651e2d8f379b9c80e.tar.gz emacs-dcdf2bd8d690168eed44563651e2d8f379b9c80e.tar.bz2 emacs-dcdf2bd8d690168eed44563651e2d8f379b9c80e.zip | |
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): Enable by default.
Remove incorrect handling of eldoc-print-after-edit.
(eldoc-message-commands, eldoc-last-data): Use defvar.
* lisp/loadup.el (emacs-lisp/eldoc): Load it.
* src/lisp.mk (lisp): Add emacs-lisp/eldoc.elc.
Diffstat (limited to 'lisp/loadup.el')
| -rw-r--r-- | lisp/loadup.el | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el index fd34648bb30..421c3d5bf3e 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -282,6 +282,7 @@ (load "vc/ediff-hook") (load "uniquify") (load "electric") +(load "emacs-lisp/eldoc") (if (not (eq system-type 'ms-dos)) (load "tooltip")) ;; This file doesn't exist when building a development version of Emacs |