diff options
| author | Glenn Morris | 2009-01-17 20:01:17 +0000 |
|---|---|---|
| committer | Glenn Morris | 2009-01-17 20:01:17 +0000 |
| commit | fdb0e509dd22854e500988244b77b3bbf06014dd (patch) | |
| tree | d9e5166ada35a52bfeeef3c82dd16f88fe71b480 | |
| parent | f71de46c6693e706a9721c5237f2507f0f0865fe (diff) | |
| download | emacs-fdb0e509dd22854e500988244b77b3bbf06014dd.tar.gz emacs-fdb0e509dd22854e500988244b77b3bbf06014dd.zip | |
(eldoc-minor-mode-string, eldoc-message-commands)
(eldoc-print-current-symbol-info): Doc fix (consistent case of "ElDoc").
| -rw-r--r-- | lisp/emacs-lisp/eldoc.el | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el index 38318826c22..c988cecd07b 100644 --- a/lisp/emacs-lisp/eldoc.el +++ b/lisp/emacs-lisp/eldoc.el | |||
| @@ -41,7 +41,7 @@ | |||
| 41 | ;; (add-hook 'lisp-interaction-mode-hook 'turn-on-eldoc-mode) | 41 | ;; (add-hook 'lisp-interaction-mode-hook 'turn-on-eldoc-mode) |
| 42 | ;; (add-hook 'ielm-mode-hook 'turn-on-eldoc-mode) | 42 | ;; (add-hook 'ielm-mode-hook 'turn-on-eldoc-mode) |
| 43 | 43 | ||
| 44 | ;; Major modes for other languages may use Eldoc by defining an | 44 | ;; Major modes for other languages may use ElDoc by defining an |
| 45 | ;; appropriate function as the buffer-local value of | 45 | ;; appropriate function as the buffer-local value of |
| 46 | ;; `eldoc-documentation-function'. | 46 | ;; `eldoc-documentation-function'. |
| 47 | 47 | ||
| @@ -65,7 +65,7 @@ If this variable is set to 0, no idle time is required." | |||
| 65 | 65 | ||
| 66 | ;;;###autoload | 66 | ;;;###autoload |
| 67 | (defcustom eldoc-minor-mode-string " ElDoc" | 67 | (defcustom eldoc-minor-mode-string " ElDoc" |
| 68 | "String to display in mode line when Eldoc Mode is enabled; nil for none." | 68 | "String to display in mode line when ElDoc Mode is enabled; nil for none." |
| 69 | :type '(choice string (const :tag "None" nil)) | 69 | :type '(choice string (const :tag "None" nil)) |
| 70 | :group 'eldoc) | 70 | :group 'eldoc) |
| 71 | 71 | ||
| @@ -124,19 +124,21 @@ Remember to keep it a prime number to improve hash performance.") | |||
| 124 | (defconst eldoc-message-commands | 124 | (defconst eldoc-message-commands |
| 125 | (make-vector eldoc-message-commands-table-size 0) | 125 | (make-vector eldoc-message-commands-table-size 0) |
| 126 | "Commands after which it is appropriate to print in the echo area. | 126 | "Commands after which it is appropriate to print in the echo area. |
| 127 | Eldoc does not try to print function arglists, etc., after just any command, | 127 | ElDoc does not try to print function arglists, etc., after just any command, |
| 128 | because some commands print their own messages in the echo area and these | 128 | because some commands print their own messages in the echo area and these |
| 129 | functions would instantly overwrite them. But `self-insert-command' as well | 129 | functions would instantly overwrite them. But `self-insert-command' as well |
| 130 | as most motion commands are good candidates. | 130 | as most motion commands are good candidates. |
| 131 | This variable contains an obarray of symbols; do not manipulate it | 131 | This variable contains an obarray of symbols; do not manipulate it |
| 132 | directly. Instead, use `eldoc-add-command' and `eldoc-remove-command'.") | 132 | directly. Instead, use `eldoc-add-command' and `eldoc-remove-command'.") |
| 133 | 133 | ||
| 134 | ;; Not a constant. | ||
| 134 | (defconst eldoc-last-data (make-vector 3 nil) | 135 | (defconst eldoc-last-data (make-vector 3 nil) |
| 135 | "Bookkeeping; elements are as follows: | 136 | "Bookkeeping; elements are as follows: |
| 136 | 0 - contains the last symbol read from the buffer. | 137 | 0 - contains the last symbol read from the buffer. |
| 137 | 1 - contains the string last displayed in the echo area for variables, | 138 | 1 - contains the string last displayed in the echo area for variables, |
| 138 | or argument string for functions. | 139 | or argument string for functions. |
| 139 | 2 - 'function if function args, 'variable if variable documentation.") | 140 | 2 - 'function if function args, 'variable if variable documentation.") |
| 141 | |||
| 140 | (defvar eldoc-last-message nil) | 142 | (defvar eldoc-last-message nil) |
| 141 | 143 | ||
| 142 | (defvar eldoc-timer nil "ElDoc's timer object.") | 144 | (defvar eldoc-timer nil "ElDoc's timer object.") |
| @@ -254,7 +256,7 @@ and the face `eldoc-highlight-function-argument', if they are to have any | |||
| 254 | effect. | 256 | effect. |
| 255 | 257 | ||
| 256 | This variable is expected to be made buffer-local by modes (other than | 258 | This variable is expected to be made buffer-local by modes (other than |
| 257 | Emacs Lisp mode) that support Eldoc.") | 259 | Emacs Lisp mode) that support ElDoc.") |
| 258 | 260 | ||
| 259 | (defun eldoc-print-current-symbol-info () | 261 | (defun eldoc-print-current-symbol-info () |
| 260 | (condition-case err | 262 | (condition-case err |