Merge from trunk.

6 files changed, 21 insertions, 16 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 1b766f0f349..3e9f7683b63 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,14 @@
+2013-11-27  Glenn Morris  <rgm@gnu.org>
+
+	* README.W32:
+	* addpm.c (env_vars):
+	* epaths.nt (PATH_LOADSEARCH, PATH_DUMPLOADSEARCH):
+	* paths.h (PATH_LOADSEARCH): No more leim directory.
+
+2013-11-26  Glenn Morris  <rgm@gnu.org>
+
+	* epaths.nt (PATH_DUMPLOADSEARCH): Add leim/.
+
 2013-11-12  Dani Moncayo  <dmoncayo@gmail.com>
 
 	* msysconfig.sh: Remove.
diff --git a/nt/README.W32 b/nt/README.W32
index d81a308ae05..2b546428c6b 100644
--- a/nt/README.W32
+++ b/nt/README.W32
@@ -20,8 +20,8 @@ See the end of the file for license conditions.
 
 * Preliminaries
 
-  Along with this file should be six subdirectories (bin, etc, info,
-  lisp, leim, site-lisp).  If you have downloaded the barebin
+  Along with this file should be five subdirectories (bin, etc, info,
+  lisp, site-lisp).  If you have downloaded the barebin
   distribution, then it will contain only the bin directory and the
   built in documentation in etc/DOC, the rest of the subdirectories
   are in the src distribution, which the barebin distribution is
diff --git a/nt/addpm.c b/nt/addpm.c
index 48c77821c8c..6669109de43 100644
--- a/nt/addpm.c
+++ b/nt/addpm.c
@@ -82,7 +82,7 @@ env_vars[] =
 {
 #ifdef OLD_PATHS
   {"emacs_dir", NULL},
-  {"EMACSLOADPATH", "%emacs_dir%/site-lisp;%emacs_dir%/../site-lisp;%emacs_dir%/lisp;%emacs_dir%/leim"},
+  {"EMACSLOADPATH", "%emacs_dir%/site-lisp;%emacs_dir%/../site-lisp;%emacs_dir%/lisp"},
   {"SHELL", "%emacs_dir%/bin/cmdproxy.exe"},
   {"EMACSDATA", "%emacs_dir%/etc"},
   {"EMACSPATH", "%emacs_dir%/bin"},
diff --git a/nt/epaths.nt b/nt/epaths.nt
index 6e297476528..033ba889b95 100644
--- a/nt/epaths.nt
+++ b/nt/epaths.nt
@@ -12,8 +12,7 @@
    the host system (e.g., i686-pc-mingw32), and @SRC@ by the root of
    the Emacs source tree used to build Emacs.  */
 /*
-Copyright (C) 1993, 1995, 1997, 1999, 2001-2013 Free Software
-Foundation, Inc.
+Copyright (C) 1993, 1995, 1997, 1999, 2001-2013 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -35,10 +34,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    load-path, which is the search path for the Lisp function "load".
    Configure (using "make epaths-force") sets this to
    ${standardlisppath}, which typically has a value like:
-   <datadir>/emacs/VERSION/lisp:<datadir>/emacs/VERSION/leim
-   where datadir is eg /usr/local/share.
+   <datadir>/emacs/VERSION/lisp where datadir is eg /usr/local/share.
 */
-#define PATH_LOADSEARCH "%emacs_dir%/share/emacs/@VER@/lisp;%emacs_dir%/share/emacs/@VER@/leim"
+#define PATH_LOADSEARCH "%emacs_dir%/share/emacs/@VER@/lisp"
 
 /* Like PATH_LOADSEARCH, but contains the non-standard pieces.
    These are the site-lisp directories.  Configure sets this to
@@ -51,7 +49,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define PATH_SITELOADSEARCH "%emacs_dir%/share/emacs/@VER@/site-lisp;%emacs_dir%/share/emacs/site-lisp"
 
 /* Like PATH_LOADSEARCH, but used only during the build process
-   when Emacs is dumping.  Configure (using "make epaths-force") sets
+   when Emacs is dumping.  Configure (using "make epaths-force-w32") sets
    this to $buildlisppath, which normally has the value: <srcdir>/lisp.
 */
 #define PATH_DUMPLOADSEARCH "@SRC@/lisp"
diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h
index 3691b303b80..bcccebc13a0 100644
--- a/nt/inc/ms-w32.h
+++ b/nt/inc/ms-w32.h
@@ -159,9 +159,6 @@ extern char *getenv ();
 # ifndef HAVE_WINDOW_SYSTEM
 #  define HAVE_WINDOW_SYSTEM 1
 # endif
-# ifndef HAVE_MENUS
-#  define HAVE_MENUS 1
-# endif
 #endif
 
 /* Get some redefinitions in place.  */
@@ -179,7 +176,7 @@ extern char *getenv ();
 extern struct tm * sys_localtime (const time_t *);
 /* MinGW64 uses a 2-argument _setjmp, and setjmp is a macro defined to
    supply the 2nd arg correctly, so don't use _setjmp directly in that
-   case. */
+   case.  */
 #undef HAVE__SETJMP
 #endif
 
diff --git a/nt/paths.h b/nt/paths.h
index e3fc3f1e8ab..e701cdd41ee 100644
--- a/nt/paths.h
+++ b/nt/paths.h
@@ -1,7 +1,6 @@
 /* paths.h file for MS Windows
 
-Copyright (C) 1993, 1995, 1997, 1999, 2001-2013 Free Software
-Foundation, Inc.
+Copyright (C) 1993, 1995, 1997, 1999, 2001-2013 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -26,7 +25,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* The default search path for Lisp function "load".
    Together with PATH_SITELOADSEARCH, this sets load-path.  */
 /* #define PATH_LOADSEARCH "/usr/local/lib/emacs/lisp" */
-#define PATH_LOADSEARCH "%emacs_dir%/lisp;%emacs_dir%/leim"
+#define PATH_LOADSEARCH "%emacs_dir%/lisp"
 
 /* Like PATH_LOADSEARCH, but contains the non-standard pieces.  */
 #define PATH_SITELOADSEARCH "%emacs_dir%/site-lisp;%emacs_dir%/../site-lisp"