/[emacs]/emacs/src/doc.c
ViewVC logotype

Diff of /emacs/src/doc.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.98 by raeburn, Mon Jul 15 00:00:36 2002 UTC revision 1.99 by lektu, Tue Feb 4 14:03:12 2003 UTC
# Line 151  get_doc_string (filepos, unibyte, defini Line 151  get_doc_string (filepos, unibyte, defini
151    
152    if (!STRINGP (file))    if (!STRINGP (file))
153      return Qnil;      return Qnil;
154        
155    /* Put the file name in NAME as a C string.    /* Put the file name in NAME as a C string.
156       If it is relative, combine it with Vdoc_directory.  */       If it is relative, combine it with Vdoc_directory.  */
157    
# Line 375  string is passed through `substitute-com Line 375  string is passed through `substitute-com
375   documentation:   documentation:
376    
377    doc = Qnil;    doc = Qnil;
378      
379    if (SYMBOLP (function)    if (SYMBOLP (function)
380        && (tem = Fget (function, Qfunction_documentation),        && (tem = Fget (function, Qfunction_documentation),
381            !NILP (tem)))            !NILP (tem)))
382      return Fdocumentation_property (function, Qfunction_documentation, raw);      return Fdocumentation_property (function, Qfunction_documentation, raw);
383      
384    fun = Findirect_function (function);    fun = Findirect_function (function);
385    if (SUBRP (fun))    if (SUBRP (fun))
386      {      {
# Line 487  aren't strings.  */) Line 487  aren't strings.  */)
487    Lisp_Object tem;    Lisp_Object tem;
488    
489   documentation_property:   documentation_property:
490      
491    tem = Fget (symbol, prop);    tem = Fget (symbol, prop);
492    if (EQ (tem, make_number (0)))    if (EQ (tem, make_number (0)))
493      tem = Qnil;      tem = Qnil;
# Line 512  aren't strings.  */) Line 512  aren't strings.  */)
512    else if (!STRINGP (tem))    else if (!STRINGP (tem))
513      /* Feval protects its argument.  */      /* Feval protects its argument.  */
514      tem = Feval (tem);      tem = Feval (tem);
515      
516    if (NILP (raw) && STRINGP (tem))    if (NILP (raw) && STRINGP (tem))
517      tem = Fsubstitute_command_keys (tem);      tem = Fsubstitute_command_keys (tem);
518    return tem;    return tem;
# Line 918  syms_of_doc () Line 918  syms_of_doc ()
918  {  {
919    Qfunction_documentation = intern ("function-documentation");    Qfunction_documentation = intern ("function-documentation");
920    staticpro (&Qfunction_documentation);    staticpro (&Qfunction_documentation);
921      
922    DEFVAR_LISP ("internal-doc-file-name", &Vdoc_file_name,    DEFVAR_LISP ("internal-doc-file-name", &Vdoc_file_name,
923                 doc: /* Name of file containing documentation strings of built-in symbols.  */);                 doc: /* Name of file containing documentation strings of built-in symbols.  */);
924    Vdoc_file_name = Qnil;    Vdoc_file_name = Qnil;

Legend:
Removed from v.1.98  
changed lines
  Added in v.1.99

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26