[Emacs-diffs] Changes to emacs/src/doc.c

[Juanma Barranquero]

Index: emacs/src/doc.c
diff -c emacs/src/doc.c:1.98 emacs/src/doc.c:1.99
*** emacs/src/doc.c:1.98        Sun Jul 14 20:00:36 2002
--- emacs/src/doc.c     Tue Feb  4 09:03:12 2003
***************
*** 151,157 ****
  
    if (!STRINGP (file))
      return Qnil;
!     
    /* Put the file name in NAME as a C string.
       If it is relative, combine it with Vdoc_directory.  */
  
--- 151,157 ----
  
    if (!STRINGP (file))
      return Qnil;
! 
    /* Put the file name in NAME as a C string.
       If it is relative, combine it with Vdoc_directory.  */
  
***************
*** 375,386 ****
   documentation:
  
    doc = Qnil;
!   
    if (SYMBOLP (function)
        && (tem = Fget (function, Qfunction_documentation),
          !NILP (tem)))
      return Fdocumentation_property (function, Qfunction_documentation, raw);
!   
    fun = Findirect_function (function);
    if (SUBRP (fun))
      {
--- 375,386 ----
   documentation:
  
    doc = Qnil;
! 
    if (SYMBOLP (function)
        && (tem = Fget (function, Qfunction_documentation),
          !NILP (tem)))
      return Fdocumentation_property (function, Qfunction_documentation, raw);
! 
    fun = Findirect_function (function);
    if (SUBRP (fun))
      {
***************
*** 487,493 ****
    Lisp_Object tem;
  
   documentation_property:
!   
    tem = Fget (symbol, prop);
    if (EQ (tem, make_number (0)))
      tem = Qnil;
--- 487,493 ----
    Lisp_Object tem;
  
   documentation_property:
! 
    tem = Fget (symbol, prop);
    if (EQ (tem, make_number (0)))
      tem = Qnil;
***************
*** 512,518 ****
    else if (!STRINGP (tem))
      /* Feval protects its argument.  */
      tem = Feval (tem);
!   
    if (NILP (raw) && STRINGP (tem))
      tem = Fsubstitute_command_keys (tem);
    return tem;
--- 512,518 ----
    else if (!STRINGP (tem))
      /* Feval protects its argument.  */
      tem = Feval (tem);
! 
    if (NILP (raw) && STRINGP (tem))
      tem = Fsubstitute_command_keys (tem);
    return tem;
***************
*** 918,924 ****
  {
    Qfunction_documentation = intern ("function-documentation");
    staticpro (&Qfunction_documentation);
!   
    DEFVAR_LISP ("internal-doc-file-name", &Vdoc_file_name,
               doc: /* Name of file containing documentation strings of 
built-in symbols.  */);
    Vdoc_file_name = Qnil;
--- 918,924 ----
  {
    Qfunction_documentation = intern ("function-documentation");
    staticpro (&Qfunction_documentation);
! 
    DEFVAR_LISP ("internal-doc-file-name", &Vdoc_file_name,
               doc: /* Name of file containing documentation strings of 
built-in symbols.  */);
    Vdoc_file_name = Qnil;