comparison src/lread.c @ 7004:0c4d3481bb1b

(init_lread): Maybe put build-time Lisp dirs on load-path. (init_lread): Improve warning message.

7003:176bb79caecf

	{
	  Vload_path = decode_env_path (0, normal);
	  if (!NILP (Vinstallation_directory))
	    {
	      /* Add to the path the lisp subdir of the
		 installation dir.  */
	      Lisp_Object tem;
	      tem = Fexpand_file_name (build_string ("lisp"),
				       Vinstallation_directory);
	      if (NILP (Fmember (tem, Vload_path)))
		Vload_path = nconc2 (Vload_path, Fcons (tem, Qnil));
	    }
	}
    }
  else
    Vload_path = decode_env_path (0, normal);

	dirfile = Fcar (path_tail);
	if (XTYPE (dirfile) == Lisp_String)
	  {
	    dirfile = Fdirectory_file_name (dirfile);
	    if (access (XSTRING (dirfile)->data, 0) < 0)
	      fprintf (stderr, "Warning: lisp library (%s) does not exist.\n",
		       XSTRING (Fcar (path_tail))->data);
	  }
      }
  }

7004:0c4d3481bb1b

	{
	  Vload_path = decode_env_path (0, normal);
	  if (!NILP (Vinstallation_directory))
	    {
	      /* Add to the path the lisp subdir of the
		 installation dir, if it exists.  */
	      Lisp_Object tem, tem1;
	      tem = Fexpand_file_name (build_string ("lisp"),
				       Vinstallation_directory);
	      tem1 = Ffile_exists_p (tem);
	      if (!NILP (tem1))
		{
		  if (NILP (Fmember (tem, Vload_path)))
		    Vload_path = nconc2 (Vload_path, Fcons (tem, Qnil));
		}
	      else
		/* That dir doesn't exist, so add the build-time
		   Lisp dirs instead.  */
		Vload_path = nconc2 (Vload_path, dump_path);
	    }
	}
    }
  else
    Vload_path = decode_env_path (0, normal);

	dirfile = Fcar (path_tail);
	if (XTYPE (dirfile) == Lisp_String)
	  {
	    dirfile = Fdirectory_file_name (dirfile);
	    if (access (XSTRING (dirfile)->data, 0) < 0)
	      fprintf (stderr,
		       "Warning: Lisp directory `%s' does not exist.\n",
		       XSTRING (Fcar (path_tail))->data);
	  }
      }
  }