emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Richard M. Stallman
Subject: [Emacs-diffs] Changes to emacs/src/callproc.c
Date: Fri, 07 Dec 2001 01:45:39 -0500

Index: emacs/src/callproc.c
diff -c emacs/src/callproc.c:1.180 emacs/src/callproc.c:1.181
*** emacs/src/callproc.c:1.180  Sun Nov 25 19:36:28 2001
--- emacs/src/callproc.c        Fri Dec  7 01:45:39 2001
***************
*** 1489,1495 ****
  #ifndef DOS_NT
          /* MSDOS uses wrapped binaries, so don't do this.  */
        if (NILP (Fmember (tem, Vexec_path)))
!       Vexec_path = nconc2 (Vexec_path, Fcons (tem, Qnil));
        
        Vexec_directory = Ffile_name_as_directory (tem);
  #endif /* not DOS_NT */
--- 1489,1499 ----
  #ifndef DOS_NT
          /* MSDOS uses wrapped binaries, so don't do this.  */
        if (NILP (Fmember (tem, Vexec_path)))
!       {
!         Vexec_path = decode_env_path ("EMACSPATH", PATH_EXEC);
!         Vexec_path = Fcons (tem, Vexec_path);
!         Vexec_path = nconc2 (decode_env_path ("PATH", ""), Vexec_path);
!       }
        
        Vexec_directory = Ffile_name_as_directory (tem);
  #endif /* not DOS_NT */
***************
*** 1512,1523 ****
       source directory.  */
    if (data_dir == 0)
      {
!       Lisp_Object tem, tem1, newdir;
  
        tem = Fexpand_file_name (build_string ("GNU"), Vdata_directory);
        tem1 = Ffile_exists_p (tem);
!       if (NILP (tem1))
        {
          newdir = Fexpand_file_name (build_string ("../etc/"),
                                      build_string (PATH_DUMPLOADSEARCH));
          tem = Fexpand_file_name (build_string ("GNU"), newdir);
--- 1516,1530 ----
       source directory.  */
    if (data_dir == 0)
      {
!       Lisp_Object tem, tem1, srcdir;
  
+       srcdir = Fexpand_file_name (build_string ("../src/"),
+                                 build_string (PATH_DUMPLOADSEARCH));
        tem = Fexpand_file_name (build_string ("GNU"), Vdata_directory);
        tem1 = Ffile_exists_p (tem);
!       if (!NILP (Fequal (srcdir, Vinvocation_directory)) || NILP (tem1))
        {
+         Lisp_Object newdir;
          newdir = Fexpand_file_name (build_string ("../etc/"),
                                      build_string (PATH_DUMPLOADSEARCH));
          tem = Fexpand_file_name (build_string ("GNU"), newdir);



reply via email to

[Prev in Thread] Current Thread [Next in Thread]