Mercurial > emacs
changeset 109430:0b8608a36b55
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Fri, 09 Jul 2010 01:50:09 +0000 |
| parents | 98c38f2ddca3 (current diff) 61d8d0cf32a8 (diff) |
| children | 799b50142743 |
| files | |
| diffstat | 2 files changed, 21 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lib-src/ChangeLog Fri Jul 09 01:02:18 2010 +0000 +++ b/lib-src/ChangeLog Fri Jul 09 01:50:09 2010 +0000 @@ -1,3 +1,8 @@ +2010-07-09 Dan Nicolaescu <dann@ics.uci.edu> + + * make-docfile.c (write_c_args): Deal with type names in DEFUN + arguments. + 2010-07-08 Dan Nicolaescu <dann@ics.uci.edu> * update-game-score.c (P_): Remove macro.
--- a/lib-src/make-docfile.c Fri Jul 09 01:02:18 2010 +0000 +++ b/lib-src/make-docfile.c Fri Jul 09 01:50:09 2010 +0000 @@ -450,9 +450,24 @@ for (p = buf; *p; p++) { - char c = *p; + char c; int ident_start = 0; + /* FIXME: this must be made a bit more robust*/ + + /* Skip "register Lisp_Object", this can be removed when we get + rid of "register" for DEFUNs. */ + if (strncmp ("register Lisp_Object", p, 20) == 0) + p += 20; + + if (strncmp ("Lisp_Object", p, 11) == 0) + p += 11; + + if (strncmp ("void", p, 4) == 0) + p += 4; + + c = *p; + /* Notice when we start printing a new identifier. */ if ((('A' <= c && c <= 'Z') || ('a' <= c && c <= 'z')