Merge from trunk

6 files changed, 21 insertions, 340 deletions

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index b647370a781..b5f4d555ad4 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -65,9 +65,7 @@ SYSTEM_TYPE
 EXPLICIT_SIGN_EXTEND
 LOAD_AVE_CVT
 LOAD_AVE_TYPE
-NO_REMAP
 VIRT_ADDR_VARIES
-WORDS_BIG_ENDIAN
 
 ** Misc macros
 USER_FULL_NAME   If defined, overrides the default pw->pw_gecos for getting at the full user name.  Only MSDOS overrides the default.
@@ -101,7 +99,6 @@ CLASH_DETECTION
 DATA_SEG_BITS
 DATA_START
 DBL_MIN_REPLACEMENT
-DECLARE_GETPWUID_WITH_UID_T
 DEFAULT_SOUND_DEVICE
 DEVICE_SEP
 DIRECTORY_SEP
@@ -190,7 +187,6 @@ HAVE_TZSET
 HAVE_UNISTD_H
 HAVE_UTIMES
 HAVE_UTIME_H
-HAVE_VOLATILE
 HAVE_WINDOW_SYSTEM
 HAVE_WORKING_VFORK
 HAVE_XRMSETDATABASE
@@ -237,7 +233,6 @@ PTY_TTY_NAME_SPRINTF
 PURESIZE
 RUN_TIME_REMAP
 SA_RESTART
-SECTION_ALIGNMENT  -- was only used by s/lynxos.h, maybe all code depending on it can be removed.
 SEGMENT_MASK
 SETPGRP_RELEASES_CTTY
 SETUP_SLAVE_PTY
@@ -252,14 +247,12 @@ SIGTRAP
 SIGTYPE
 SOLARIS2
 STDC_HEADERS
-SYMS_SYSTEM
 SYSTEM_PURESIZE_EXTRA
 SYSTEM_MALLOC
 SYSV_SYSTEM_DIR
 TAB3
 TABDLY
 TERM
-THIS_IS_CONFIGURE
 TIME_WITH_SYS_TIME
 TIOCSIGSEND
 TM_IN_SYS_TIME
@@ -272,7 +265,6 @@ USG5
 USG5_4
 USG_SUBTTY_WORKS
 VALBITS
-WORDS_BIG_ENDIAN
 WRETCODE
 XINT
 XOS_NEEDS_TIME_H
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 7a3104c9c40..22777674373 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,18 @@
+2010-08-09  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * CPP-DEFINES (WORDS_BIG_ENDIAN): Remove.
+
+2010-08-05  Eli Zaretskii  <eliz@gnu.org>
+
+        * MAINTAINERS: Rename src/unexec.c => src/unexcoff.c.
+
+2010-07-24  Christoph Scholtes  <cschol2112@gmail.com>
+
+        * admin.el: Write version number to nt/makefile.w32-in.
+        * nt/makedist.bat: Remove; replaced with `zipdist.bat'
+        in the nt/ directory.
+        * nt/README.W32: Relocate to nt/ directory.
+
 2010-07-11  Andreas Schwab  <schwab@linux-m68k.org>
 
         * CPP-DEFINES (HAVE_INDEX, HAVE_RINDEX): Remove.
@@ -432,7 +447,7 @@
 
         * charsets/mapconv: Handle UNICODE2.
 
-        * charsets/Makefile (CJK): Include CP932-2BYTE.map
+        * charsets/Makefile (CJK): Include CP932-2BYTE.map.
         (CP932-2BYTE.map): New target.
 
 2008-02-01  Kenichi Handa  <handa@m17n.org>
@@ -752,7 +767,7 @@
 
 2004-08-28  Jan Djärv  <jan.h.d@swipnet.se>
 
-        * FOR-RELEASE (Indications): Remove entry about GTK and geometry,
+        * FOR-RELEASE (Indications): Remove entry about GTK and geometry
         (now behaves as well as other ports).
 
 2004-06-28  Jan Djärv  <jan.h.d@swipnet.se>
diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS
index ee51e162b3b..432e4f5cf9f 100644
--- a/admin/MAINTAINERS
+++ b/admin/MAINTAINERS
@@ -191,7 +191,7 @@ src/tparam.c
 src/undo.c
 src/unexaix.c
 src/unexalpha.c
-src/unexec.c
+src/unexcoff.c
 src/unexelf.c
 src/unexhp9k800.c
 src/unexw32.c
diff --git a/admin/admin.el b/admin/admin.el
index f2cf008f475..51bbecf4c57 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -95,6 +95,9 @@ Root must be the root of an Emacs source tree."
   (set-version-in-file root "lib-src/makefile.w32-in" version
                        (rx (and "VERSION" (0+ space) "=" (0+ space)
                                 (submatch (1+ (in "0-9."))))))
+  (set-version-in-file root "nt/makefile.w32-in" version
+                       (rx (and "VERSION" (0+ space) "=" (0+ space)
+                                (submatch (1+ (in "0-9."))))))
   ;; nt/emacs.rc also contains the version number, but in an awkward
   ;; format. It must contain four components, separated by commas, and
   ;; in two places those commas are followed by space, in two other
diff --git a/admin/nt/README.W32 b/admin/nt/README.W32
deleted file mode 100644
index 9f1df8abd3a..00000000000
--- a/admin/nt/README.W32
+++ /dev/null
@@ -1,264 +0,0 @@
-Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-  Free Software Foundation, Inc.
-See the end of the file for license conditions.
-
-                           Emacs for Windows
-
-  This README file describes how to set up and run a precompiled
-  version of GNU Emacs for Windows.  This distribution can be found on
-  the ftp.gnu.org server and its mirrors:
-
-        ftp://ftp.gnu.org/gnu/emacs/windows/
-
-  This server contains other distributions, including the full Emacs
-  source distribution and a barebin distribution which can be installed
-  over it, as well as older releases of Emacs for Windows.
-
-  Answers to frequently asked questions, and further information about
-  this port of GNU Emacs and related software packages can be found via
-  http:
-
-        http://www.gnu.org/software/emacs/windows/
-
-* Preliminaries
-
-  Along with this file should be six subdirectories (bin, etc, info,
-  lisp, leim, 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-X, the rest of the subdirectories
-  are in the src distribution, which the barebin distribution is
-  designed to be used with.
-
-* Setting up Emacs
-
-  To install Emacs, simply unpack all the files into a directory of
-  your choice, but note that you might encounter minor problems if
-  there is a space anywhere in the directory name.  To complete the
-  installation process, you can optionally run the program addpm.exe
-  in the bin subdirectory.  This will put an icon for Emacs in the
-  Start Menu under "Start -> Programs -> Gnu Emacs".
-
-  Some users have reported that the Start Menu item is not created for
-  them.  If this happens, just create your own shortcut to runemacs.exe,
-  eg. by dragging it on to the desktop or the Start button.
-
-  Note that running addpm is now an optional step; Emacs is able to
-  locate all of its files without needing any information to be set in
-  the environment or the registry, although such settings will still
-  be obeyed if present.  This is convenient for running Emacs on a
-  machine which disallows registry changes, or on which software
-  should not be installed.  For instance, you can now run Emacs
-  directly from a CD or USB flash drive without copying or installing
-  anything on the machine itself.
-
-* Starting Emacs
-
-  To run Emacs, simply select Emacs from the Start Menu, or invoke
-  runemacs.exe directly from Explorer or from a command prompt.  This
-  will start Emacs in its default GUI mode, ready to use.  If you have
-  never used Emacs before, you should follow the tutorial at this
-  point (select Emacs Tutorial from the Help menu), since Emacs is
-  quite different from ordinary Windows applications in many respects.
-
-  If you want to use Emacs in tty or character mode within a command
-  window, you can start it by typing "emacs -nw" at the command prompt.
-  (Obviously, you need to ensure that the Emacs bin subdirectory is in
-  your PATH first, or specify the path to emacs.exe.)  The -nw
-  (non-windowed) mode of operation is most useful if you have a telnet
-  server on your machine, allowing you to run Emacs remotely.
-
-* EXE files included
-
-  Emacs comes with the following executable files in the bin directory.
-
-  + emacs.exe - The main Emacs executable.  As this is designed to run
-    as both a text-mode application (emacs -nw) and as a GUI application,
-    it will pop up a command prompt window if run directly from Explorer.
-
-  + runemacs.exe - A wrapper for running Emacs as a GUI application
-    without popping up a command prompt window.
-
-  + emacsclient.exe - A command-line client program that can
-    communicate with a running Emacs process.  See the `Emacs Server'
-    node of the Emacs manual.
-
-  + emacsclientw.exe - A version of emacsclient that does not open
-    a command-line window.
-
-  + addpm.exe - A basic installer that creates Start Menu icons for Emacs.
-    Running this is optional.
-
-  + cmdproxy.exe - Used internally by Emacs to work around problems with
-    the native shells in various versions of Windows.
-
-  + ctags.exe, etags.exe - Tools for generating tag files.  See the
-    `Tags' node of the Emacs manual.
-
-  + ebrowse.exe - A tool for generating C++ browse information.  See the
-    `Ebrowse' manual.
-
-  + ddeclient.exe - A tool for interacting with DDE servers.
-
-  + hexl.exe - A tool for converting files to hex dumps.  See the
-    `Editing Binary Files' node of the Emacs manual.
-
-  + movemail.exe - A helper application for safely moving mail from
-    a mail spool or POP server to a local user mailbox.  See the
-    `Movemail' node of the Emacs manual.
-
-  + digest-doc.exe, sorted-doc.exe - Tools for rebuilding the
-    built-in documentation.
-
-* Image support
-
-  Emacs has built in support for XBM and PPM/PGM/PBM images, and the
-  libXpm library is bundled, providing XPM support (required for color
-  toolbar icons and splash screen).  Source for libXpm should be available
-  on the same place as you got this binary distribution from.  The version
-  of libXpm bundled with this version of Emacs is 3.5.7, based on x.org's
-  libXpm library from X11R7.3.
-
-  Emacs can also support some other image formats with appropriate
-  libraries.  These libraries are all available as part of GTK, or from
-  gnuwin32.sourceforge.net.  Emacs will find them if the directory they
-  are installed in is on the PATH.
-
-      PNG: requires the PNG reference library 1.2 or later, which will
-      be named libpng13d.dll, libpng13.dll, libpng12d.dll, libpng12.dll
-      or libpng.dll.  LibPNG requires zlib, which should come from the same
-      source as you got libpng.
-
-      JPEG: requires the Independant JPEG Group's libjpeg 6b or later,
-      which will be called jpeg62.dll, libjpeg.dll, jpeg-62.dll or jpeg.dll.
-
-      TIFF: requires libTIFF 3.0 or later, which will be called libtiff3.dll
-      or libtiff.dll.
-
-      GIF: requires libungif or giflib 4.1 or later, which will be
-      called giflib4.dll, libungif4.dll or libungif.dll.
-
-   In addition, Emacs can be compiled to support SVG.  This precompiled
-   distribution has not been compiled that way, since the SVG library
-   or one or more of its extensive dependencies appear to be
-   unreliable under Windows.  See nt/INSTALL in the src distribution if
-   you wish to compile Emacs with SVG support.
-
-* Uninstalling Emacs
-
-  If you should need to uninstall Emacs, simply delete all the files
-  and subdirectories from the directory where it was unpacked (Emacs
-  does not install or update any files in system directories or
-  anywhere else).  If you ran the addpm.exe program to create the
-  registry entries and the Start menu icon, then you can remove the
-  registry entries using regedit.  All of the settings are written
-  under the Software\GNU\Emacs key in HKEY_LOCAL_MACHINE, or if you
-  didn't have administrator privileges when you installed, the same
-  key in HKEY_CURRENT_USER.  Just delete the whole Software\GNU\Emacs
-  key.
-
-  The Start menu entry can be removed by right-clicking on the Task bar
-  and selecting Properties, then using the Remove option on the Start
-  Menu Programs page.  (If you installed under an account with
-  administrator privileges, then you need to click the Advanced button
-  and look for the Gnu Emacs menu item under All Users.)
-
-* Troubleshooting
-
-  Unpacking the distributions
-
-  If you encounter trouble trying to run Emacs, there are a number of
-  possible causes.  Check the following for indications that the
-  distribution was not corrupted by the tools used to unpack it:
-
-    * Be sure to disable CR/LF translation or the executables will
-      be unusable.  Older versions of WinZipNT would enable this
-      translation by default.  If you are using WinZipNT, disable it.
-      (I don't have WinZipNT myself, and I do not know the specific
-      commands necessary to disable it.)
-
-    * Check that filenames were not truncated to 8.3.  For example,
-      there should be a file lisp\abbrevlist.elc; if this has been
-      truncated to abbrevli.elc, your distribution has been corrupted
-      while unpacking and Emacs will not start.
-
-  If you believe you have unpacked the distributions correctly and are
-  still encountering problems, see the section on Further Information
-  below.
-
-  Virus scanners
-
-  Some virus scanners interfere with Emacs' use of subprocesses.  If you
-  are unable to use subprocesses and you use Dr. Solomon's WinGuard or
-  McAfee's Vshield, turn off "Scan all files" (WinGuard) or "boot sector
-  scanning" (McAfee exclusion properties).
-
-* Further information
-
-  If you have access to the World Wide Web, I would recommend pointing
-  your favorite web browser to the following document (if you haven't
-  already):
-
-        http://www.gnu.org/software/emacs/windows/
-
-  This document serves as an FAQ and a source for further information
-  about the Windows port and related software packages.
-
-  In addition to the FAQ, there is a mailing list for discussing issues
-  related to the Windows port of Emacs.  For information about the
-  list, see this Web page:
-
-        http://lists.gnu.org/mailman/listinfo/help-emacs-windows
-
-  To ask questions on the mailing list, send email to
-  help-emacs-windows@gnu.org.  (You don't need to subscribe for that.)
-  To subscribe to the list or unsubscribe from it, fill the form you
-  find at http://lists.gnu.org/mailman/listinfo/help-emacs-windows as
-  explained there.
-
-  Another valuable source of information and help which should not be
-  overlooked is the various Usenet news groups dedicated to Emacs.
-  These are particularly good for help with general issues which aren't
-  specific to the Windows port of Emacs.  The main news groups to use
-  for seeking help are:
-
-        gnu.emacs.help
-        comp.emacs
-
-  There are also fairly regular postings and announcements of new or
-  updated Emacs packages on this group:
-
-        gnu.emacs.sources
-
-* Reporting bugs
-
-  If you encounter a bug in this port of Emacs, we would like to hear
-  about it.  First check the FAQ on the web page above to see if the bug
-  is already known and if there are any workarounds.  Then check whether
-  the bug has something to do with code in your .emacs file, e.g. by
-  invoking Emacs with the "-Q" option.
-
-  If you decide that it is a bug in Emacs, use the built in bug
-  reporting facility to report it (from the menu; Help -> Send Bug Report).
-  If you have not yet configured Emacs for mail, then when you press
-  C-c C-c to send the report, it will ask you to paste the text of the
-  report into your mail client.  If the bug is related to subprocesses,
-  also specify which shell you are using (e.g., include the values of
-  `shell-file-name' and `explicit-shell-file-name' in your message).
-
-  Enjoy!
-
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/admin/nt/makedist.bat b/admin/nt/makedist.bat
deleted file mode 100755
index 6546e6e10dc..00000000000
--- a/admin/nt/makedist.bat
+++ /dev/null
@@ -1,65 +0,0 @@
-@echo off

-

-rem Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010

-rem   Free Software Foundation, Inc.

-

-rem Cannot use brackets in andrewi's email below because

-rem older Windows shells will treat that as redirection.

-

-rem Author: Andrew Innes andrewi@gnu.org

-

-rem This file is part of GNU Emacs.

-

-rem GNU Emacs is free software: you can redistribute it and/or modify

-rem it under the terms of the GNU General Public License as published by

-rem the Free Software Foundation, either version 3 of the License, or

-rem (at your option) any later version.

-

-rem GNU Emacs is distributed in the hope that it will be useful,

-rem but WITHOUT ANY WARRANTY; without even the implied warranty of

-rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-rem GNU General Public License for more details.

-

-rem You should have received a copy of the GNU General Public License

-rem along with GNU Emacs.  If not, see http://www.gnu.org/licenses/.

-

-

-if (%3) == () goto usage

-if not (%4) == () goto %4

-

-:bin

-

-echo Create full bin distribution

-copy %3\README.W32 emacs-%1\README.W32

-rem Info-ZIP zip seems to be broken on Windows.

-rem It always writes to zip.zip and treats the zipfile argument as one

-rem of the files to go in it.

-rem zip -9 -r %2-bin-i386 emacs-%1/BUGS emacs-%1/COPYING emacs-%1/README emacs-%1/README.W32 emacs-%1/INSTALL emacs-%1/bin emacs-%1/etc emacs-%1/info emacs-%1/lisp emacs-%1/leim -x emacs.mdp *.pdb *.opt *~ CVS

-7z a -tZIP -mx=9 -xr!emacs.mdp -xr!*.pdb -xr!*.opt -xr!*~ -xr!CVS -xr!.arch-inventory %2-bin-i386.zip emacs-%1/BUGS emacs-%1/COPYING emacs-%1/README emacs-%1/README.W32 emacs-%1/INSTALL emacs-%1/bin emacs-%1/etc emacs-%1/info emacs-%1/lisp emacs-%1/leim emacs-%1/site-lisp

-del emacs-%1\README.W32

-if not (%4) == () goto end

-

-:barebin

-echo Create archive with just the basic binaries and generated files

-echo (the user needs to unpack the full source distribution for

-echo  everything else)

-copy %3\README.W32 emacs-%1\README.W32

-rem Info-ZIP zip seems to be broken on Windows.

-rem It always writes to zip.zip and treats the zipfile argument as one

-rem of the files to go in it.

-rem zip -9 -r %2-barebin-i386.zip emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc/DOC-X emacs-%1/COPYING

-7z a -tZIP -mx=9 %2-barebin-i386.zip emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc/DOC-X emacs-%1/COPYING

-del emacs-%1\README.W32

-if not (%4) == () goto end

-

-goto end

-

-:usage

-echo Generate source and binary distributions of emacs.

-echo Usage: %0 emacs-version dist-basename distfiles [bin,barebin]

-echo   (e.g., %0 19.34 emacs-19.34.5 d:\andrewi\distfiles)

-:end

-

-goto skipArchTag

-   arch-tag: 6e2ddd92-c1c9-4992-b6b5-207aaab72f68

-:skipArchTag