Mercurial > emacs
comparison src/doc.c @ 109351:c8a969d13eda
merge trunk
| author | Kenichi Handa <handa@etlken> |
|---|---|
| date | Fri, 09 Jul 2010 15:55:27 +0900 |
| parents | 8cfee7d2955f |
| children | 8f3464b85afb |
comparison
equal
deleted
inserted
replaced
| 109350:c11d07f3d731 | 109351:c8a969d13eda |
|---|---|
| 339 | 339 |
| 340 DEFUN ("documentation", Fdocumentation, Sdocumentation, 1, 2, 0, | 340 DEFUN ("documentation", Fdocumentation, Sdocumentation, 1, 2, 0, |
| 341 doc: /* Return the documentation string of FUNCTION. | 341 doc: /* Return the documentation string of FUNCTION. |
| 342 Unless a non-nil second argument RAW is given, the | 342 Unless a non-nil second argument RAW is given, the |
| 343 string is passed through `substitute-command-keys'. */) | 343 string is passed through `substitute-command-keys'. */) |
| 344 (function, raw) | 344 (Lisp_Object function, Lisp_Object raw) |
| 345 Lisp_Object function, raw; | |
| 346 { | 345 { |
| 347 Lisp_Object fun; | 346 Lisp_Object fun; |
| 348 Lisp_Object funcar; | 347 Lisp_Object funcar; |
| 349 Lisp_Object tem, doc; | 348 Lisp_Object tem, doc; |
| 350 int try_reload = 1; | 349 int try_reload = 1; |
| 467 `substitute-command-keys' if it is a string. | 466 `substitute-command-keys' if it is a string. |
| 468 | 467 |
| 469 This differs from `get' in that it can refer to strings stored in the | 468 This differs from `get' in that it can refer to strings stored in the |
| 470 `etc/DOC' file; and that it evaluates documentation properties that | 469 `etc/DOC' file; and that it evaluates documentation properties that |
| 471 aren't strings. */) | 470 aren't strings. */) |
| 472 (symbol, prop, raw) | 471 (Lisp_Object symbol, Lisp_Object prop, Lisp_Object raw) |
| 473 Lisp_Object symbol, prop, raw; | |
| 474 { | 472 { |
| 475 int try_reload = 1; | 473 int try_reload = 1; |
| 476 Lisp_Object tem; | 474 Lisp_Object tem; |
| 477 | 475 |
| 478 documentation_property: | 476 documentation_property: |
| 556 records them in function and variable definitions. | 554 records them in function and variable definitions. |
| 557 The function takes one argument, FILENAME, a string; | 555 The function takes one argument, FILENAME, a string; |
| 558 it specifies the file name (without a directory) of the DOC file. | 556 it specifies the file name (without a directory) of the DOC file. |
| 559 That file is found in `../etc' now; later, when the dumped Emacs is run, | 557 That file is found in `../etc' now; later, when the dumped Emacs is run, |
| 560 the same file name is found in the `doc-directory'. */) | 558 the same file name is found in the `doc-directory'. */) |
| 561 (filename) | 559 (Lisp_Object filename) |
| 562 Lisp_Object filename; | |
| 563 { | 560 { |
| 564 int fd; | 561 int fd; |
| 565 char buf[1024 + 1]; | 562 char buf[1024 + 1]; |
| 566 register int filled; | 563 register int filled; |
| 567 register int pos; | 564 register int pos; |
| 705 \\=\\= quotes the following character and is discarded; | 702 \\=\\= quotes the following character and is discarded; |
| 706 thus, \\=\\=\\=\\= puts \\=\\= into the output, and \\=\\=\\=\\[ puts \\=\\[ into the output. | 703 thus, \\=\\=\\=\\= puts \\=\\= into the output, and \\=\\=\\=\\[ puts \\=\\[ into the output. |
| 707 | 704 |
| 708 Returns original STRING if no substitutions were made. Otherwise, | 705 Returns original STRING if no substitutions were made. Otherwise, |
| 709 a new string, without any text properties, is returned. */) | 706 a new string, without any text properties, is returned. */) |
| 710 (string) | 707 (Lisp_Object string) |
| 711 Lisp_Object string; | |
| 712 { | 708 { |
| 713 unsigned char *buf; | 709 unsigned char *buf; |
| 714 int changed = 0; | 710 int changed = 0; |
| 715 register unsigned char *strp; | 711 register unsigned char *strp; |
| 716 register unsigned char *bufp; | 712 register unsigned char *bufp; |
