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

[Thien-Thi Nguyen]

Index: emacs/src/doc.c
diff -c emacs/src/doc.c:1.111 emacs/src/doc.c:1.112
*** emacs/src/doc.c:1.111       Tue Feb 15 06:36:17 2005
--- emacs/src/doc.c     Fri Mar  4 21:57:35 2005
***************
*** 58,83 ****
  extern Lisp_Object Voverriding_local_map;
  
  /* For VMS versions with limited file name syntax,
!    convert the name to something VMS will allow. */
  static void
  munge_doc_file_name (name)
       char *name;
  {
  #ifdef VMS
! #ifndef VMS4_4
!   /* For VMS versions with limited file name syntax,
!      convert the name to something VMS will allow.  */
!   p = name;
    while (*p)
      {
        if (*p == '-')
        *p = '_';
        p++;
      }
! #endif /* not VMS4_4 */
! #ifdef VMS4_4
!   strcpy (name, sys_translate_unix (name));
! #endif /* VMS4_4 */
  #endif /* VMS */
  }
  
--- 58,81 ----
  extern Lisp_Object Voverriding_local_map;
  
  /* For VMS versions with limited file name syntax,
!    convert the name to something VMS will allow.  */
  static void
  munge_doc_file_name (name)
       char *name;
  {
  #ifdef VMS
! #ifndef NO_HYPHENS_IN_FILENAMES
!   extern char * sys_translate_unix (char *ufile);
!   strcpy (name, sys_translate_unix (name));
! #else /* NO_HYPHENS_IN_FILENAMES */
!   char *p = name;
    while (*p)
      {
        if (*p == '-')
        *p = '_';
        p++;
      }
! #endif /* NO_HYPHENS_IN_FILENAMES */
  #endif /* VMS */
  }
  
***************
*** 607,627 ****
        strcpy (name, SDATA (Vdoc_directory));
      }
    strcat (name, SDATA (filename));    /*** Add this line ***/
! #ifdef VMS
! #ifndef VMS4_4
!   /* For VMS versions with limited file name syntax,
!      convert the name to something VMS will allow.  */
!   p = name;
!   while (*p)
!     {
!       if (*p == '-')
!       *p = '_';
!       p++;
!     }
! #else /* VMS4_4 */
!   strcpy (name, sys_translate_unix (name));
! #endif /* VMS4_4 */
! #endif /* VMS */
  
    /* Vbuild_files is nil when temacs is run, and non-nil after that.  */
    if (NILP (Vbuild_files))
--- 605,611 ----
        strcpy (name, SDATA (Vdoc_directory));
      }
    strcat (name, SDATA (filename));    /*** Add this line ***/
!   munge_doc_file_name (name);
  
    /* Vbuild_files is nil when temacs is run, and non-nil after that.  */
    if (NILP (Vbuild_files))