diff options
| author | Paul Eggert | 2011-04-15 00:48:51 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-15 00:48:51 -0700 |
| commit | 4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9 (patch) | |
| tree | e993b231bb5555c9c961f5d0b20d90ac76f77bbd /src/doc.c | |
| parent | 1963a2e0bb07cc8dee6d27f972f93d9cfd7c6b2d (diff) | |
| parent | 49093f601b69d91126aefd328ee8f6bfeb797407 (diff) | |
| download | emacs-4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9.tar.gz emacs-4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9.zip | |
Merge from mainline.
Diffstat (limited to 'src/doc.c')
| -rw-r--r-- | src/doc.c | 4 |
1 files changed, 3 insertions, 1 deletions
| @@ -42,7 +42,9 @@ static char *get_doc_string_buffer; | |||
| 42 | static int get_doc_string_buffer_size; | 42 | static int get_doc_string_buffer_size; |
| 43 | 43 | ||
| 44 | static unsigned char *read_bytecode_pointer; | 44 | static unsigned char *read_bytecode_pointer; |
| 45 | Lisp_Object Fsnarf_documentation (Lisp_Object); | 45 | static Lisp_Object Fdocumentation_property (Lisp_Object, Lisp_Object, |
| 46 | Lisp_Object); | ||
| 47 | static Lisp_Object Fsnarf_documentation (Lisp_Object); | ||
| 46 | 48 | ||
| 47 | /* readchar in lread.c calls back here to fetch the next byte. | 49 | /* readchar in lread.c calls back here to fetch the next byte. |
| 48 | If UNREADFLAG is 1, we unread a byte. */ | 50 | If UNREADFLAG is 1, we unread a byte. */ |