Mercurial > emacs
comparison lisp/emacs-lisp/eldoc.el @ 83676:27d11c1d4e46
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 857-862)
- Update from CVS
- Merge from emacs--rel--22
- Update from CVS: lisp/emacs-lisp/avl-tree.el: New file.
* emacs--rel--22 (patch 97-100)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 246-247)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-38
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 27 Aug 2007 09:21:49 +0000 |
parents | 46c1137c9130 |
children | 17bdbd096c94 b83d0dadb2a7 |
comparison
equal
deleted
inserted
replaced
83675:67601f702028 | 83676:27d11c1d4e46 |
---|---|
97 truncated to make more of the arglist or documentation string visible." | 97 truncated to make more of the arglist or documentation string visible." |
98 :type '(radio (const :tag "Always" t) | 98 :type '(radio (const :tag "Always" t) |
99 (const :tag "Never" nil) | 99 (const :tag "Never" nil) |
100 (const :tag "Yes, but truncate symbol names if it will\ | 100 (const :tag "Yes, but truncate symbol names if it will\ |
101 enable argument list to fit on one line" truncate-sym-name-if-fit)) | 101 enable argument list to fit on one line" truncate-sym-name-if-fit)) |
102 :group 'eldoc) | |
103 | |
104 (defface eldoc-highlight-function-argument | |
105 '((t (:inherit bold))) | |
106 "Face used for the argument at point in a function's argument list." | |
102 :group 'eldoc) | 107 :group 'eldoc) |
103 | 108 |
104 ;;; No user options below here. | 109 ;;; No user options below here. |
105 | 110 |
106 (defvar eldoc-message-commands-table-size 31 | 111 (defvar eldoc-message-commands-table-size 31 |
301 (defun eldoc-highlight-function-argument (sym args index) | 306 (defun eldoc-highlight-function-argument (sym args index) |
302 "Highlight argument INDEX in ARGS list for function SYM. | 307 "Highlight argument INDEX in ARGS list for function SYM. |
303 In the absence of INDEX, just call `eldoc-docstring-format-sym-doc'." | 308 In the absence of INDEX, just call `eldoc-docstring-format-sym-doc'." |
304 (let ((start nil) | 309 (let ((start nil) |
305 (end 0) | 310 (end 0) |
306 (argument-face 'bold)) | 311 (argument-face 'eldoc-highlight-function-argument)) |
307 ;; Find the current argument in the argument string. We need to | 312 ;; Find the current argument in the argument string. We need to |
308 ;; handle `&rest' and informal `...' properly. | 313 ;; handle `&rest' and informal `...' properly. |
309 ;; | 314 ;; |
310 ;; FIXME: What to do with optional arguments, like in | 315 ;; FIXME: What to do with optional arguments, like in |
311 ;; (defun NAME ARGLIST [DOCSTRING] BODY...) case? | 316 ;; (defun NAME ARGLIST [DOCSTRING] BODY...) case? |