3 files changed, 13 insertions, 2 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index c3ac7142944..9d0816ea3e7 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,5 +1,9 @@
 2007-07-05  Karl Berry  <karl@tug.org>
 
+	* tex-file.h (kpse_file_format_type): define kpse_lua_format.
+	* tex-file.c (LUA_ENVS, LUA_SUFFIXES): new macros
+	(init_path): initialize kpse_lua_format.
+
 	* texmf.in (LUAINPUTS): add $TEXINPUTS per Hans and Taco.
 
 2007-06-14  Karl Berry  <karl@tug.org>
diff --git a/Build/source/texk/kpathsea/tex-file.c b/Build/source/texk/kpathsea/tex-file.c
index 8e57d440fa1..d12712caee2 100644
--- a/Build/source/texk/kpathsea/tex-file.c
+++ b/Build/source/texk/kpathsea/tex-file.c
@@ -1,7 +1,7 @@
 /* tex-file.c: high-level file searching by format.
 
+    Copyright 1993, 1994, 1995, 1996, 1997, 2007 Karl Berry.
     Copyright 1998-2005 Olaf Weber.
-    Copyright 1993, 94, 95, 96, 97 Karl Berry.
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -93,6 +93,7 @@ kpse_format_info_type kpse_format_info[kpse_last_format];
 #define PDFTEXCONFIG_ENVS "PDFTEXCONFIG"
 #define LIG_ENVS "LIGFONTS", "TEXFONTS"
 #define TEXMFSCRIPTS_ENVS "TEXMFSCRIPTS"
+#define LUA_ENVS "LUAINPUTS"
 
 /* The compiled-in default list, DEFAULT_FONT_SIZES, is intended to be
    set from the command line (presumably via the Makefile).  */
@@ -670,6 +671,11 @@ kpse_init_format P1C(kpse_file_format_type, format)
     case kpse_texmfscripts_format:
       INIT_FORMAT ("texmfscripts", DEFAULT_TEXMFSCRIPTS, TEXMFSCRIPTS_ENVS);
       break;
+    case kpse_lua_format:
+      INIT_FORMAT ("luatex", DEFAULT_LUAINPUTS, LUA_ENVS);
+#define LUA_SUFFIXES ".lua", ".luatex", ".texlua", ".luc", ".luctex", ".texluc"
+      SUFFIXES (LUA_SUFFIXES);
+      break;
     default:
       FATAL1 ("kpse_init_format: Unknown format %d", format);
     }
diff --git a/Build/source/texk/kpathsea/tex-file.h b/Build/source/texk/kpathsea/tex-file.h
index a2047f84c2d..72bb26eb2d0 100644
--- a/Build/source/texk/kpathsea/tex-file.h
+++ b/Build/source/texk/kpathsea/tex-file.h
@@ -1,7 +1,7 @@
 /* tex-file.h: find files in a particular format.
 
+   Copyright 1993, 1994, 1995, 1996, 2007 Karl Berry.
    Copyright 1998-2005 Olaf Weber.
-   Copyright 1993, 94, 95, 96 Karl Berry.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -101,6 +101,7 @@ typedef enum
   kpse_pdftex_config_format,
   kpse_lig_format,
   kpse_texmfscripts_format,
+  kpse_lua_format,
   kpse_last_format /* one past last index */
 } kpse_file_format_type;