diff options
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog | 100 | ||||
| -rw-r--r-- | nt/INSTALL | 37 | ||||
| -rw-r--r-- | nt/Makefile.in | 32 | ||||
| -rw-r--r-- | nt/addsection.c | 544 | ||||
| -rw-r--r-- | nt/cmdproxy.c | 29 | ||||
| -rw-r--r-- | nt/config.nt | 2 | ||||
| -rw-r--r-- | nt/emacs.rc.in (renamed from nt/emacs.rc) | 8 | ||||
| -rw-r--r-- | nt/emacsclient.rc.in (renamed from nt/emacsclient.rc) | 8 | ||||
| -rw-r--r-- | nt/gnulib.mk | 108 | ||||
| -rw-r--r-- | nt/inc/ms-w32.h | 33 | ||||
| -rw-r--r-- | nt/inc/sys/mman.h | 31 | ||||
| -rw-r--r-- | nt/makefile.w32-in | 2 |
12 files changed, 274 insertions, 660 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index cb2f33f947b..ae292add9c6 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -8,9 +8,25 @@ * nt/preprep.c: Use it. -2014-10-31 Eric S. Raymond <esr@thyrsus.com> +2014-11-24 Glenn Morris <rgm@gnu.org> - * Neutralize language specific to a repository type. + * Makefile.in (../src/emacs.res): New target. + +2014-11-22 Glenn Morris <rgm@gnu.org> + + * emacs.rc.in, emacsclient.rc.in: Rename from emacs.rc, emacsclient.rc. + Let configure generate the real files, and set the version numbers. + * Makefile.in (distclean): Delete *.rc. + (emacs.res): Update deps for nt/emacsclient.rc now being in the + build directory, not the source directory. + + * Makefile.in (emacs.res): Add dependency on icons/hand.cur. + +2014-11-18 Glenn Morris <rgm@gnu.org> + + * Makefile.in (addpm${EXEEXT}, ddeclient${EXEEXT}) + (cmdproxy${EXEEXT}, runemacs${EXEEXT}, emacs.res): + Use automatic variables. 2014-10-26 Dani Moncayo <dmoncayo@gmail.com> @@ -18,25 +34,95 @@ the top level. (Setting up Emacs): Minor rewording to be more accurate. +2014-10-25 Eric S. Raymond <esr@thyrsus.com> + + * Neutralize language specific to a repository type. + +2014-10-22 Noam Postavsky <npostavs@users.sourceforget.net> + + * nt/cmdproxy.c (batch_file_p): New function. + (spawn): If calling a quoted batch file pass NULL for progname. + (Bug#18745) + 2014-10-20 Glenn Morris <rgm@gnu.org> - * Version 24.4 released. + * Merge in all changes up to 24.4 release. + +2014-09-29 Eli Zaretskii <eliz@gnu.org> + + * makefile.w32-in (VERSION): Bump version to 25.0.50. + + * emacsclient.rc: Bump version to 25.0.50. + + * emacs.rc: Bump version to 25.0.50. + + * config.nt (VERSION): Bump version to 25.0.50. + +2014-09-01 Eli Zaretskii <eliz@gnu.org> + + * gnulib.mk: Synchronize with lib/gnulib.mk. + +2014-06-15 Glenn Morris <rgm@gnu.org> + + * Makefile.in (LDFLAGS): Explicitly set via configure. + +2014-06-15 Eli Zaretskii <eliz@gnu.org> + + * Makefile.in (CPPFLAGS): Define. + +2014-06-15 Glenn Morris <rgm@gnu.org> + + * Makefile.in (bootstrap-clean): New. + +2014-06-05 Dmitry Antipov <dmantipov@yandex.ru> + + * inc/ms-w32.h (POLL_FOR_INPUT): Define with HAVE_WINDOW_SYSTEM. + +2014-05-29 Eli Zaretskii <eliz@gnu.org> + + * Makefile.in (DONT_INSTALL): Now empty. + (addsection${EXEEXT}): Remove target. + * addsection.c: Remove file. + +2014-05-27 Fabrice Popineau <fabrice.popineau@gmail.com> + + * inc/ms-w32.h: Switch to the system heap allocation scheme + instead of GNU malloc and ralloc. + + * inc/sys/mman.h: New file. + + * INSTALL: Update for the new build requirements. + +2014-05-17 Paul Eggert <eggert@cs.ucla.edu> + + Assume C99 or later (Bug#17487). + * gnulib.mk: Remove stdarg and stdbool modules. + +2014-05-16 Paul Eggert <eggert@cs.ucla.edu> + + Don't require pkg-config when building from repository. + * INSTALL: Remove no-longer-needed notes about pkg-config. + +2014-05-05 Eli Zaretskii <eliz@gnu.org> + + * INSTALL: Update to the effect that pkg-config is now required + for building from the repository. -2014-04-26 Eli Zaretskii <eliz@gnu.org> +2014-04-30 Eli Zaretskii <eliz@gnu.org> * cmdproxy.c (make_absolute): Don't copy more characters from PATH than a single directory name can hold. (Bug#17334) -2014-04-21 Eli Zaretskii <eliz@gnu.org> +2014-04-22 Eli Zaretskii <eliz@gnu.org> * inc/ms-w32.h (lseek): Define only if not already a macro. Suggested by Fabrice Popineau <fabrice.popineau@gmail.com>. -2014-04-09 Ken Brown <kbrown@cornell.edu> +2014-04-11 Ken Brown <kbrown@cornell.edu> * emacs.rc: Revert last change. -2014-04-03 Ken Brown <kbrown@cornell.edu> +2014-04-07 Ken Brown <kbrown@cornell.edu> * emacs.rc: Don't use manifest on Cygwin. (Bug#17176) diff --git a/nt/INSTALL b/nt/INSTALL index 350b1f53310..1366d5979db 100644 --- a/nt/INSTALL +++ b/nt/INSTALL @@ -5,9 +5,9 @@ See the end of the file for license conditions. The MSYS/MinGW build described here is supported on versions of -Windows starting with Windows 2000 and newer. Windows 9X are not -supported (but the Emacs binary produced by this build will run on -Windows 9X as well). +Windows starting with Windows XP and newer. Building on Windows 2000 +and Windows 9X is not supported (but the Emacs binary produced by this +build will run on Windows 9X and newer systems). Do not use this recipe with Cygwin. For building on Cygwin, use the normal installation instructions, ../INSTALL. @@ -173,14 +173,14 @@ Windows 9X as well). Available from http://sourceforge.net/projects/ezwinports/files/. - . gzip (needed to compress files during "make install") + . pkg-config (invoked by the configure script to look for optional + packages) - Available from http://gnuwin32.sourceforge.net/packages/gzip.htm. + Available from http://www.gtk.org/download/win32.php - . pkg-config (needed for building with some optional libraries, - such as GnuTLS and libxml2) + . gzip (needed to compress files during "make install") - Available from http://www.gtk.org/download/win32.php + Available from http://gnuwin32.sourceforge.net/packages/gzip.htm. Each package might list other packages as prerequisites on its download page (under "Runtime requirements"); download those as @@ -235,6 +235,12 @@ Windows 9X as well). For example, use D:\MSYS or D:\usr\MSYS as the top-level directory from which you unpack all of the MSYS packages. + After installing Automake and Autoconf, make sure any of the *.m4 + files you might have in your MinGW installation also exist in the + MSYS installation tree, in the share/aclocal directory. Those *.m4 + files which exist in the MinGW tree, but not in the MSYS tree should + be copied there. + If/when you are confident in your MinGW/MSYS installation, and want to speed up the builds, we recommend installing a pre-release version of Make from here: @@ -396,9 +402,10 @@ Windows 9X as well). Where should the build process find the source code? /path/to/emacs/sources What compiler should emacs be built with? gcc -std=gnu99 -O0 -g3 - Should Emacs use the GNU version of malloc? yes - Should Emacs use a relocating allocator for buffers? yes - Should Emacs use mmap(2) for buffer allocation? no + Should Emacs use the GNU version of malloc? no + (The GNU allocators don't work with this system configuration.) + Should Emacs use a relocating allocator for buffers? no + Should Emacs use mmap(2) for buffer allocation? yes What window system should Emacs use? w32 What toolkit should Emacs use? none Where do we find X Windows header files? NONE @@ -408,13 +415,16 @@ Windows 9X as well). Does Emacs use -ljpeg? yes Does Emacs use -ltiff? yes Does Emacs use a gif library? yes - Does Emacs use -lpng? yes - Does Emacs use -lrsvg-2? no + Does Emacs use a png library? yes + Does Emacs use -lrsvg-2? yes Does Emacs use imagemagick? no + Does Emacs support sound? no Does Emacs use -lgpm? no Does Emacs use -ldbus? no Does Emacs use -lgconf? no Does Emacs use GSettings? no + Does Emacs use a file notification library? yes (w32) + Does Emacs use access control lists? yes Does Emacs use -lselinux? no Does Emacs use -lgnutls? yes Does Emacs use -lxml2? yes @@ -422,6 +432,7 @@ Windows 9X as well). Does Emacs use -lm17n-flt? no Does Emacs use -lotf? no Does Emacs use -lxft? no + Does Emacs directly use zlib? yes Does Emacs use toolkit scroll bars? yes You are almost there, hang on. diff --git a/nt/Makefile.in b/nt/Makefile.in index f498928bfce..56e3e82ac80 100644 --- a/nt/Makefile.in +++ b/nt/Makefile.in @@ -25,6 +25,9 @@ SHELL = /bin/sh CC=@CC@ CFLAGS=@CFLAGS@ +CPPFLAGS = @CPPFLAGS@ +LDFLAGS = @LDFLAGS@ + version=@version@ ## Used in $archlibdir. configuration=@configuration@ @@ -120,7 +123,7 @@ INSTALLABLES = runemacs${EXEEXT} addpm${EXEEXT} UTILITIES = cmdproxy${EXEEXT} ddeclient${EXEEXT} # Things that Emacs runs during the build process. -DONT_INSTALL = addsection${EXEEXT} +DONT_INSTALL = # All files that are created by the linker, i.e., whose names end in ${EXEEXT}. EXE_FILES = ${INSTALLABLES} ${UTILITIES} ${DONT_INSTALL} @@ -141,7 +144,9 @@ BASE_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \ -I. -I${srcdir} ALL_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${LDFLAGS} ${CPPFLAGS} ${CFLAGS} +## Unused. LINK_CFLAGS = ${BASE_CFLAGS} ${LDFLAGS} ${CFLAGS} +## Unused. CPP_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${CPPFLAGS} ${CFLAGS} all: ${EXE_FILES} @@ -162,7 +167,7 @@ $(DESTDIR)${archlibdir}: all fi .PHONY: install uninstall mostlyclean clean distclean maintainer-clean -.PHONY: extraclean check tags +.PHONY: bootstrap-clean extraclean check tags install: $(DESTDIR)${archlibdir} @echo @@ -190,10 +195,9 @@ clean: mostlyclean -rm -f ${EXE_FILES} distclean: clean - -rm -f TAGS - -rm -f Makefile + -rm -f TAGS Makefile *.rc -maintainer-clean: distclean +bootstrap-clean maintainer-clean: distclean true extraclean: maintainer-clean @@ -208,21 +212,19 @@ TAGS: ${EXE_FILES:${EXEEXT}=.c} ../lib-src/etags *.[ch] ## Build the programs -addsection${EXEEXT}: ${srcdir}/addsection.c - $(CC) ${ALL_CFLAGS} ${srcdir}/addsection.c -o addsection${EXEEXT} - addpm${EXEEXT}: ${srcdir}/addpm.c ../src/epaths.h - $(CC) ${ALL_CFLAGS} ${srcdir}/addpm.c $(LIBS_ADDPM) -o addpm${EXEEXT} + $(CC) ${ALL_CFLAGS} $< $(LIBS_ADDPM) -o $@ ddeclient${EXEEXT}: ${srcdir}/ddeclient.c - $(CC) ${ALL_CFLAGS} ${srcdir}/ddeclient.c -o ddeclient${EXEEXT} + $(CC) ${ALL_CFLAGS} $< -o $@ cmdproxy${EXEEXT}: ${srcdir}/cmdproxy.c - $(CC) ${ALL_CFLAGS} ${srcdir}/cmdproxy.c -o cmdproxy${EXEEXT} + $(CC) ${ALL_CFLAGS} $< -o $@ runemacs${EXEEXT}: ${srcdir}/runemacs.c $(EMACSRES) - $(CC) ${ALL_CFLAGS} ${srcdir}/runemacs.c $(EMACSRES) -mwindows \ - -o runemacs${EXEEXT} + $(CC) ${ALL_CFLAGS} $^ -mwindows -o $@ -emacs.res: ${srcdir}/emacs.rc ${srcdir}/icons/emacs.ico ${srcdir}/$(EMACS_MANIFEST) - ${WINDRES} -I ${srcdir} -O coff -o emacs.res ${srcdir}/emacs.rc +## Also used in ../src/Makefile. +emacs.res ../src/emacs.res: emacs.rc ${srcdir}/icons/emacs.ico \ + ${srcdir}/icons/hand.cur ${srcdir}/$(EMACS_MANIFEST) + ${WINDRES} -I ${srcdir} -O coff -o $@ $< diff --git a/nt/addsection.c b/nt/addsection.c deleted file mode 100644 index 832066b68c0..00000000000 --- a/nt/addsection.c +++ /dev/null @@ -1,544 +0,0 @@ -/* Add an uninitialized data section to an executable. - Copyright (C) 1999, 2001-2014 Free Software Foundation, Inc. - -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/>. - - - Andrew Innes <andrewi@harlequin.co.uk> 04-Jan-1999 - based on code from unexw32.c -*/ - -#include <stdlib.h> -#include <stdio.h> -#include <fcntl.h> -#include <time.h> -#if defined(__GNUC__) && !defined(MINGW_W64) -#define _ANONYMOUS_UNION -#define _ANONYMOUS_STRUCT -#endif -#include <windows.h> - -/* Include relevant definitions from IMAGEHLP.H, which can be found - in \\win32sdk\mstools\samples\image\include\imagehlp.h. */ - -PIMAGE_NT_HEADERS -(__stdcall * pfnCheckSumMappedFile) (PVOID BaseAddress, - DWORD_PTR FileLength, - PDWORD_PTR HeaderSum, - PDWORD_PTR CheckSum); - -#undef min -#undef max -#define min(x, y) (((x) < (y)) ? (x) : (y)) -#define max(x, y) (((x) > (y)) ? (x) : (y)) - - -/* File handling. */ - -typedef struct file_data { - const char *name; - unsigned long size; - HANDLE file; - HANDLE file_mapping; - unsigned char *file_base; -} file_data; - -int -open_input_file (file_data *p_file, const char *filename) -{ - HANDLE file; - HANDLE file_mapping; - void *file_base; - unsigned long size, upper_size; - - file = CreateFile (filename, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); - if (file == INVALID_HANDLE_VALUE) - return FALSE; - - size = GetFileSize (file, &upper_size); - file_mapping = CreateFileMapping (file, NULL, PAGE_READONLY, - 0, size, NULL); - if (!file_mapping) - return FALSE; - - file_base = MapViewOfFile (file_mapping, FILE_MAP_READ, 0, 0, size); - if (file_base == 0) - return FALSE; - - p_file->name = filename; - p_file->size = size; - p_file->file = file; - p_file->file_mapping = file_mapping; - p_file->file_base = file_base; - - return TRUE; -} - -int -open_output_file (file_data *p_file, const char *filename, unsigned long size) -{ - HANDLE file; - HANDLE file_mapping; - void *file_base; - - file = CreateFile (filename, GENERIC_READ | GENERIC_WRITE, 0, NULL, - CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); - if (file == INVALID_HANDLE_VALUE) - return FALSE; - - file_mapping = CreateFileMapping (file, NULL, PAGE_READWRITE, - 0, size, NULL); - if (!file_mapping) - return FALSE; - - file_base = MapViewOfFile (file_mapping, FILE_MAP_WRITE, 0, 0, size); - if (file_base == 0) - return FALSE; - - p_file->name = filename; - p_file->size = size; - p_file->file = file; - p_file->file_mapping = file_mapping; - p_file->file_base = file_base; - - return TRUE; -} - -/* Close the system structures associated with the given file. */ -void -close_file_data (file_data *p_file) -{ - UnmapViewOfFile (p_file->file_base); - CloseHandle (p_file->file_mapping); - /* For the case of output files, set final size. */ - SetFilePointer (p_file->file, p_file->size, NULL, FILE_BEGIN); - SetEndOfFile (p_file->file); - CloseHandle (p_file->file); -} - - -/* Routines to manipulate NT executable file sections. */ - -unsigned long -get_unrounded_section_size (PIMAGE_SECTION_HEADER p_section) -{ - /* The true section size, before rounding, for an initialized data or - code section. (Supposedly some linkers swap the meaning of these - two values.) */ - return min (p_section->SizeOfRawData, - p_section->Misc.VirtualSize); -} - -/* Return pointer to section header for named section. */ -IMAGE_SECTION_HEADER * -find_section (const char *name, IMAGE_NT_HEADERS *nt_header) -{ - PIMAGE_SECTION_HEADER section; - int i; - - section = IMAGE_FIRST_SECTION (nt_header); - - for (i = 0; i < nt_header->FileHeader.NumberOfSections; i++) - { - if (strcmp (section->Name, name) == 0) - return section; - section++; - } - return NULL; -} - -/* Return pointer to section header for section containing the given - relative virtual address. */ -IMAGE_SECTION_HEADER * -rva_to_section (DWORD_PTR rva, IMAGE_NT_HEADERS * nt_header) -{ - PIMAGE_SECTION_HEADER section; - int i; - - section = IMAGE_FIRST_SECTION (nt_header); - - for (i = 0; i < nt_header->FileHeader.NumberOfSections; i++) - { - /* Some linkers (eg. the NT SDK linker I believe) swapped the - meaning of these two values - or rather, they ignored - VirtualSize entirely and always set it to zero. This affects - some very old exes (eg. gzip dated Dec 1993). Since - w32_executable_type relies on this function to work reliably, - we need to cope with this. */ - DWORD_PTR real_size = max (section->SizeOfRawData, - section->Misc.VirtualSize); - if (rva >= section->VirtualAddress - && rva < section->VirtualAddress + real_size) - return section; - section++; - } - return NULL; -} - -/* Return pointer to section header for section containing the given - offset in its raw data area. */ -IMAGE_SECTION_HEADER * -offset_to_section (DWORD_PTR offset, IMAGE_NT_HEADERS * nt_header) -{ - PIMAGE_SECTION_HEADER section; - int i; - - section = IMAGE_FIRST_SECTION (nt_header); - - for (i = 0; i < nt_header->FileHeader.NumberOfSections; i++) - { - if (offset >= section->PointerToRawData - && offset < section->PointerToRawData + section->SizeOfRawData) - return section; - section++; - } - return NULL; -} - -/* Return offset to an object in dst, given offset in src. We assume - there is at least one section in both src and dst images, and that - the some sections may have been added to dst (after sections in src). */ -static DWORD_PTR -relocate_offset (DWORD_PTR offset, - IMAGE_NT_HEADERS * src_nt_header, - IMAGE_NT_HEADERS * dst_nt_header) -{ - PIMAGE_SECTION_HEADER src_section = IMAGE_FIRST_SECTION (src_nt_header); - PIMAGE_SECTION_HEADER dst_section = IMAGE_FIRST_SECTION (dst_nt_header); - int i = 0; - - while (offset >= src_section->PointerToRawData) - { - if (offset < src_section->PointerToRawData + src_section->SizeOfRawData) - break; - i++; - if (i == src_nt_header->FileHeader.NumberOfSections) - { - /* Handle offsets after the last section. */ - dst_section = IMAGE_FIRST_SECTION (dst_nt_header); - dst_section += dst_nt_header->FileHeader.NumberOfSections - 1; - while (dst_section->PointerToRawData == 0) - dst_section--; - while (src_section->PointerToRawData == 0) - src_section--; - return offset - + (dst_section->PointerToRawData + dst_section->SizeOfRawData) - - (src_section->PointerToRawData + src_section->SizeOfRawData); - } - src_section++; - dst_section++; - } - return offset + - (dst_section->PointerToRawData - src_section->PointerToRawData); -} - -#define OFFSET_TO_RVA(offset, section) \ - (section->VirtualAddress + ((DWORD_PTR)(offset) - section->PointerToRawData)) - -#define RVA_TO_OFFSET(rva, section) \ - (section->PointerToRawData + ((DWORD_PTR)(rva) - section->VirtualAddress)) - -#define RVA_TO_SECTION_OFFSET(rva, section) \ - ((DWORD_PTR)(rva) - section->VirtualAddress) - -/* Convert address in executing image to RVA. */ -#define PTR_TO_RVA(ptr) ((DWORD_PTR)(ptr) - (DWORD_PTR) GetModuleHandle (NULL)) - -#define PTR_TO_OFFSET(ptr, pfile_data) \ - ((unsigned const char *)(ptr) - (pfile_data)->file_base) - -#define OFFSET_TO_PTR(offset, pfile_data) \ - ((pfile_data)->file_base + (DWORD_PTR)(offset)) - -#define ROUND_UP(p, align) \ - (((DWORD_PTR)(p) + (align)-1) & ~((DWORD_PTR)(align)-1)) -#define ROUND_DOWN(p, align) ((DWORD_PTR)(p) & ~((DWORD_PTR)(align)-1)) - - -static void -copy_executable_and_add_section (file_data *p_infile, - file_data *p_outfile, - const char *new_section_name, - DWORD_PTR new_section_size) -{ - unsigned char *dst; - PIMAGE_DOS_HEADER dos_header; - PIMAGE_NT_HEADERS nt_header; - PIMAGE_NT_HEADERS dst_nt_header; - PIMAGE_SECTION_HEADER section; - PIMAGE_SECTION_HEADER dst_section; - DWORD_PTR offset; - int i; - int be_verbose = GetEnvironmentVariable ("DEBUG_DUMP", NULL, 0) > 0; - -#define COPY_CHUNK(message, src, size, verbose) \ - do { \ - unsigned const char *s = (void *)(src); \ - unsigned long count = (size); \ - if (verbose) \ - { \ - printf ("%s\n", (message)); \ - printf ("\t0x%08x Offset in input file.\n", s - p_infile->file_base); \ - printf ("\t0x%08x Offset in output file.\n", dst - p_outfile->file_base); \ - printf ("\t0x%08x Size in bytes.\n", count); \ - } \ - memcpy (dst, s, count); \ - dst += count; \ - } while (0) - -#define DST_TO_OFFSET() PTR_TO_OFFSET (dst, p_outfile) -#define ROUND_UP_DST_AND_ZERO(align) \ - do { \ - unsigned char *newdst = p_outfile->file_base \ - + ROUND_UP (DST_TO_OFFSET (), (align)); \ - /* Zero the alignment slop; it may actually initialize real data. */ \ - memset (dst, 0, newdst - dst); \ - dst = newdst; \ - } while (0) - - /* Copy the source image sequentially, ie. section by section after - copying the headers and section table, to simplify the process of - adding an extra section table entry (which might force the raw - section data to be relocated). - - Note that dst is updated implicitly by each COPY_CHUNK. */ - - dos_header = (PIMAGE_DOS_HEADER) p_infile->file_base; - nt_header = (PIMAGE_NT_HEADERS) (((unsigned char *) dos_header) + - dos_header->e_lfanew); - section = IMAGE_FIRST_SECTION (nt_header); - - dst = (unsigned char *) p_outfile->file_base; - - COPY_CHUNK ("Copying DOS header...", dos_header, - (DWORD_PTR) nt_header - (DWORD_PTR) dos_header, be_verbose); - dst_nt_header = (PIMAGE_NT_HEADERS) dst; - COPY_CHUNK ("Copying NT header...", nt_header, - (DWORD_PTR) section - (DWORD_PTR) nt_header, be_verbose); - dst_section = (PIMAGE_SECTION_HEADER) dst; - COPY_CHUNK ("Copying section table...", section, - nt_header->FileHeader.NumberOfSections * sizeof (*section), - be_verbose); - - /* To improve the efficiency of demand loading, make the file - alignment match the section alignment (VC++ 6.0 does this by - default anyway). */ - dst_nt_header->OptionalHeader.FileAlignment = - dst_nt_header->OptionalHeader.SectionAlignment; - - /* Add an uninitialized data section at the end, of the specified name - and virtual size. */ - if (find_section (new_section_name, nt_header) == NULL) - /* Leave room for extra section table entry; filled in below. */ - dst += sizeof (*section); - else - new_section_name = NULL; - - /* Align the first section's raw data area, and set the header size - field accordingly. */ - ROUND_UP_DST_AND_ZERO (dst_nt_header->OptionalHeader.FileAlignment); - dst_nt_header->OptionalHeader.SizeOfHeaders = DST_TO_OFFSET (); - - for (i = 0; i < nt_header->FileHeader.NumberOfSections; i++) - { - char msg[100]; - /* Windows section names are fixed 8-char strings, only - zero-terminated if the name is shorter than 8 characters. */ - sprintf (msg, "Copying raw data for %.8s...", section->Name); - - /* Update the file-relative offset for this section's raw data (if - it has any) in case things have been relocated; we will update - the other offsets below once we know where everything is. */ - if (dst_section->PointerToRawData) - dst_section->PointerToRawData = DST_TO_OFFSET (); - - /* Can always copy the original raw data. */ - COPY_CHUNK - (msg, OFFSET_TO_PTR (section->PointerToRawData, p_infile), - section->SizeOfRawData, be_verbose); - - /* Round up the raw data size to the new alignment. */ - dst_section->SizeOfRawData = - ROUND_UP (dst_section->SizeOfRawData, - dst_nt_header->OptionalHeader.FileAlignment); - - /* Align the next section's raw data area. */ - ROUND_UP_DST_AND_ZERO (dst_nt_header->OptionalHeader.FileAlignment); - - section++; - dst_section++; - } - - /* Add the extra section entry (which adds no raw data). */ - if (new_section_name != NULL) - { - dst_nt_header->FileHeader.NumberOfSections++; - dst_nt_header->OptionalHeader.SizeOfImage += new_section_size; - strncpy (dst_section->Name, new_section_name, sizeof (dst_section->Name)); - dst_section->VirtualAddress = - section[-1].VirtualAddress - + ROUND_UP (section[-1].Misc.VirtualSize, - dst_nt_header->OptionalHeader.SectionAlignment); - dst_section->Misc.VirtualSize = new_section_size; - dst_section->PointerToRawData = 0; - dst_section->SizeOfRawData = 0; - dst_section->Characteristics = - IMAGE_SCN_CNT_UNINITIALIZED_DATA - | IMAGE_SCN_MEM_READ - | IMAGE_SCN_MEM_WRITE; - } - - /* Copy remainder of source image. */ - section--; - offset = ROUND_UP (section->PointerToRawData + section->SizeOfRawData, - nt_header->OptionalHeader.FileAlignment); - COPY_CHUNK - ("Copying remainder of executable...", - OFFSET_TO_PTR (offset, p_infile), - p_infile->size - offset, be_verbose); - - /* Final size for new image. */ - p_outfile->size = DST_TO_OFFSET (); - - /* Now patch up remaining file-relative offsets. */ - section = IMAGE_FIRST_SECTION (nt_header); - dst_section = IMAGE_FIRST_SECTION (dst_nt_header); - -#define ADJUST_OFFSET(var) \ - do { \ - if ((var) != 0) \ - (var) = relocate_offset ((var), nt_header, dst_nt_header); \ - } while (0) - - dst_nt_header->OptionalHeader.SizeOfInitializedData = 0; - dst_nt_header->OptionalHeader.SizeOfUninitializedData = 0; - for (i = 0; i < dst_nt_header->FileHeader.NumberOfSections; i++) - { - /* Recompute data sizes for completeness. */ - if (dst_section[i].Characteristics & IMAGE_SCN_CNT_INITIALIZED_DATA) - dst_nt_header->OptionalHeader.SizeOfInitializedData += - ROUND_UP (dst_section[i].Misc.VirtualSize, dst_nt_header->OptionalHeader.FileAlignment); - else if (dst_section[i].Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA) - dst_nt_header->OptionalHeader.SizeOfUninitializedData += - ROUND_UP (dst_section[i].Misc.VirtualSize, dst_nt_header->OptionalHeader.FileAlignment); - - ADJUST_OFFSET (dst_section[i].PointerToLinenumbers); - } - - ADJUST_OFFSET (dst_nt_header->FileHeader.PointerToSymbolTable); - - /* Update offsets in debug directory entries. */ - { - IMAGE_DATA_DIRECTORY debug_dir = - dst_nt_header->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_DEBUG]; - PIMAGE_DEBUG_DIRECTORY debug_entry; - - section = rva_to_section (debug_dir.VirtualAddress, dst_nt_header); - if (section) - { - debug_entry = (PIMAGE_DEBUG_DIRECTORY) - (RVA_TO_OFFSET (debug_dir.VirtualAddress, section) + p_outfile->file_base); - debug_dir.Size /= sizeof (IMAGE_DEBUG_DIRECTORY); - - for (i = 0; i < debug_dir.Size; i++, debug_entry++) - ADJUST_OFFSET (debug_entry->PointerToRawData); - } - } -} - - -int -main (int argc, char **argv) -{ - file_data in_file, out_file; - char out_filename[MAX_PATH], in_filename[MAX_PATH]; - unsigned long size; - PIMAGE_DOS_HEADER dos_header; - PIMAGE_NT_HEADERS nt_header; - -#define OLD_NAME argv[1] -#define NEW_NAME argv[2] -#define SECTION_NAME argv[3] -#define SECTION_SIZE argv[4] - - strcpy (in_filename, OLD_NAME); - strcpy (out_filename, NEW_NAME); - - printf ("Dumping from %s\n", in_filename); - printf (" to %s\n", out_filename); - - /* Open the undumped executable file. */ - if (!open_input_file (&in_file, in_filename)) - { - printf ("Failed to open %s (%d)...bailing.\n", - in_filename, GetLastError ()); - exit (1); - } - dos_header = (PIMAGE_DOS_HEADER) in_file.file_base; - nt_header = (PIMAGE_NT_HEADERS) ((char *) dos_header + dos_header->e_lfanew); - /* Allow for expansion due to increasing file align to section align. - We can overestimate here, since close_file_data will update the - size exactly. */ - size = in_file.size - + nt_header->OptionalHeader.SectionAlignment - * nt_header->FileHeader.NumberOfSections; - if (!open_output_file (&out_file, out_filename, size)) - { - printf ("Failed to open %s (%d)...bailing.\n", - out_filename, GetLastError ()); - exit (1); - } - - copy_executable_and_add_section (&in_file, &out_file, - SECTION_NAME, - atoi (SECTION_SIZE) * 1024 * 1024); - - /* Patch up header fields; profiler is picky about this. */ - { - HANDLE hImagehelp = LoadLibrary ("imagehlp.dll"); - DWORD_PTR headersum; - DWORD_PTR checksum; - - dos_header = (PIMAGE_DOS_HEADER) out_file.file_base; - nt_header = (PIMAGE_NT_HEADERS) ((char *) dos_header + dos_header->e_lfanew); - - nt_header->OptionalHeader.CheckSum = 0; -// nt_header->FileHeader.TimeDateStamp = time (NULL); -// dos_header->e_cp = size / 512; -// nt_header->OptionalHeader.SizeOfImage = size; - - pfnCheckSumMappedFile = (void *) GetProcAddress (hImagehelp, "CheckSumMappedFile"); - if (pfnCheckSumMappedFile) - { -// nt_header->FileHeader.TimeDateStamp = time (NULL); - pfnCheckSumMappedFile (out_file.file_base, - out_file.size, - &headersum, - &checksum); - nt_header->OptionalHeader.CheckSum = checksum; - } - FreeLibrary (hImagehelp); - } - - close_file_data (&in_file); - close_file_data (&out_file); - - return 0; -} - -/* eof */ - diff --git a/nt/cmdproxy.c b/nt/cmdproxy.c index e48ca63a257..d8f7ae3c41e 100644 --- a/nt/cmdproxy.c +++ b/nt/cmdproxy.c @@ -220,6 +220,28 @@ get_next_token (char * buf, const char ** pSrc) return o - buf; } +/* Return TRUE if PROGNAME is a batch file. */ +BOOL +batch_file_p (const char *progname) +{ + const char *exts[] = {".bat", ".cmd"}; + int n_exts = sizeof (exts) / sizeof (char *); + int i; + + const char *ext = strrchr (progname, '.'); + + if (ext) + { + for (i = 0; i < n_exts; i++) + { + if (stricmp (ext, exts[i]) == 0) + return TRUE; + } + } + + return FALSE; +} + /* Search for EXEC file in DIR. If EXEC does not have an extension, DIR is searched for EXEC with the standard extensions appended. */ int @@ -470,6 +492,13 @@ spawn (const char *progname, char *cmdline, const char *dir, int *retcode) memset (&start, 0, sizeof (start)); start.cb = sizeof (start); + /* CreateProcess handles batch files as progname specially. This + special handling fails when both the batch file and arguments are + quoted. We pass NULL as progname to avoid the special + handling. */ + if (progname != NULL && cmdline[0] == '"' && batch_file_p (progname)) + progname = NULL; + if (CreateProcess (progname, cmdline, &sec_attrs, NULL, TRUE, 0, envblock, dir, &start, &child)) { diff --git a/nt/config.nt b/nt/config.nt index 3bd6ebf39b0..8040ecc373e 100644 --- a/nt/config.nt +++ b/nt/config.nt @@ -1576,7 +1576,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #undef USG_SUBTTY_WORKS /* Version number of package */ -#define VERSION "24.4.51" +#define VERSION "25.0.50" /* Define to 1 if unsetenv returns void instead of int. */ #undef VOID_UNSETENV diff --git a/nt/emacs.rc b/nt/emacs.rc.in index 2d007ba9043..d2d17b8eb1b 100644 --- a/nt/emacs.rc +++ b/nt/emacs.rc.in @@ -11,8 +11,8 @@ Emacs ICON icons/emacs.ico #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 24,4,50,0 - PRODUCTVERSION 24,4,50,0 + FILEVERSION @comma_version@ + PRODUCTVERSION @comma_version@ FILEFLAGSMASK 0x3FL #ifdef EMACSDEBUG FILEFLAGS 0x1L @@ -29,12 +29,12 @@ BEGIN BEGIN VALUE "CompanyName", "Free Software Foundation\0" VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0" - VALUE "FileVersion", "24, 4, 50, 0\0" + VALUE "FileVersion", "@comma_space_version@\0" VALUE "InternalName", "Emacs\0" VALUE "LegalCopyright", "Copyright (C) 2001-2014\0" VALUE "OriginalFilename", "emacs.exe" VALUE "ProductName", "Emacs\0" - VALUE "ProductVersion", "24, 4, 50, 0\0" + VALUE "ProductVersion", "@comma_space_version@\0" VALUE "OLESelfRegister", "\0" END END diff --git a/nt/emacsclient.rc b/nt/emacsclient.rc.in index 7e5d2e4c0f1..5c3b65d752f 100644 --- a/nt/emacsclient.rc +++ b/nt/emacsclient.rc.in @@ -5,8 +5,8 @@ Emacs ICON icons\emacs.ico #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 24,4,50,0 - PRODUCTVERSION 24,4,50,0 + FILEVERSION @comma_version@ + PRODUCTVERSION @comma_version@ FILEFLAGSMASK 0x3FL #ifdef EMACSDEBUG FILEFLAGS 0x1L @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "Free Software Foundation\0" VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0" - VALUE "FileVersion", "24, 4, 50, 0\0" + VALUE "FileVersion", "@comma_space_version@\0" VALUE "InternalName", "EmacsClient\0" VALUE "LegalCopyright", "Copyright (C) 2001-2014\0" VALUE "OriginalFilename", "emacsclientw.exe" VALUE "ProductName", "EmacsClient\0" - VALUE "ProductVersion", "24, 4, 50, 0\0" + VALUE "ProductVersion", "@comma_space_version@\0" VALUE "OLESelfRegister", "\0" END END diff --git a/nt/gnulib.mk b/nt/gnulib.mk index 7877c154b96..4a06da5fea0 100644 --- a/nt/gnulib.mk +++ b/nt/gnulib.mk @@ -43,7 +43,7 @@ # the same distribution terms as the rest of that program. # # Generated by gnulib-tool. -# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=close --avoid=dup --avoid=fchdir --avoid=fstat --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow --avoid=open --avoid=openat-die --avoid=opendir --avoid=raise --avoid=save-cwd --avoid=select --avoid=sigprocmask --avoid=sys_types --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt byteswap c-ctype c-strcase careadlinkat close-stream count-one-bits count-trailing-zeros crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ execinfo faccessat fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync getloadavg getopt-gnu gettime gettimeofday intprops largefile lstat manywarnings memrchr mkostemp mktime pipe2 pselect pthread_sigmask putenv qacl readlink readlinkat sig2str socklen stat-time stdalign stdarg stdbool stdio strftime strtoimax strtoumax symlink sys_stat sys_time time timer-time timespec-add timespec-sub unsetenv utimens warnings +# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=close --avoid=dup --avoid=fchdir --avoid=fstat --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow --avoid=open --avoid=openat-die --avoid=opendir --avoid=raise --avoid=save-cwd --avoid=select --avoid=sigprocmask --avoid=stdarg --avoid=stdbool --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt binary-io byteswap c-ctype c-strcase careadlinkat close-stream count-one-bits count-trailing-zeros crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ execinfo faccessat fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync getloadavg getopt-gnu gettime gettimeofday intprops largefile lstat manywarnings memrchr mkostemp mktime pipe2 pselect pthread_sigmask putenv qacl readlink readlinkat sig2str socklen stat-time stdalign stdio strftime strtoimax strtoumax symlink sys_stat sys_time time timer-time timespec-add timespec-sub unsetenv update-copyright utimens vla warnings MOSTLYCLEANFILES += core *.stackdump @@ -55,6 +55,15 @@ libgnu_a_LIBADD = $(gl_LIBOBJS) libgnu_a_DEPENDENCIES = $(gl_LIBOBJS) EXTRA_libgnu_a_SOURCES = +## begin gnulib module absolute-header + +# Use this preprocessor expression to decide whether #include_next works. +# Do not rely on a 'configure'-time test for this, since the expression +# might appear in an installed header, which is used by some other compiler. +HAVE_INCLUDE_NEXT = (__GNUC__ || 60000000 <= __DECC_VER) + +## end gnulib module absolute-header + ## begin gnulib module alloca-opt BUILT_SOURCES += $(ALLOCA_H) @@ -78,6 +87,12 @@ EXTRA_DIST += alloca.in.h ## end gnulib module alloca-opt +## begin gnulib module binary-io + +libgnu_a_SOURCES += binary-io.h binary-io.c + +## end gnulib module binary-io + ## begin gnulib module byteswap BUILT_SOURCES += $(BYTESWAP_H) @@ -141,7 +156,7 @@ EXTRA_DIST += count-trailing-zeros.h libgnu_a_SOURCES += md5.c -EXTRA_DIST += md5.h +EXTRA_DIST += gl_openssl.h md5.h ## end gnulib module crypto/md5 @@ -149,7 +164,7 @@ EXTRA_DIST += md5.h libgnu_a_SOURCES += sha1.c -EXTRA_DIST += sha1.h +EXTRA_DIST += gl_openssl.h sha1.h ## end gnulib module crypto/sha1 @@ -157,7 +172,7 @@ EXTRA_DIST += sha1.h libgnu_a_SOURCES += sha256.c -EXTRA_DIST += sha256.h +EXTRA_DIST += gl_openssl.h sha256.h ## end gnulib module crypto/sha256 @@ -165,7 +180,7 @@ EXTRA_DIST += sha256.h libgnu_a_SOURCES += sha512.c -EXTRA_DIST += sha512.h +EXTRA_DIST += gl_openssl.h sha512.h ## end gnulib module crypto/sha512 @@ -335,6 +350,17 @@ EXTRA_libgnu_a_SOURCES += fsync.c ## end gnulib module fsync +## begin gnulib module getdtablesize + +if gl_GNULIB_ENABLED_getdtablesize + +endif +EXTRA_DIST += getdtablesize.c + +EXTRA_libgnu_a_SOURCES += getdtablesize.c + +## end gnulib module getdtablesize + ## begin gnulib module getgroups if gl_GNULIB_ENABLED_getgroups @@ -416,13 +442,6 @@ EXTRA_libgnu_a_SOURCES += group-member.c ## end gnulib module group-member -## begin gnulib module ignore-value - - -EXTRA_DIST += ignore-value.h - -## end gnulib module ignore-value - ## begin gnulib module intprops @@ -671,57 +690,6 @@ EXTRA_DIST += stdalign.in.h ## end gnulib module stdalign -## begin gnulib module stdarg - -BUILT_SOURCES += $(STDARG_H) - -# We need the following in order to create <stdarg.h> when the system -# doesn't have one that works with the given compiler. -if GL_GENERATE_STDARG_H -stdarg.h: stdarg.in.h $(top_builddir)/config.status - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ - sed -e 's|@''GUARD_PREFIX''@|GL|g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_STDARG_H''@|$(NEXT_STDARG_H)|g' \ - < $(srcdir)/stdarg.in.h; \ - } > $@-t && \ - mv $@-t $@ -else -stdarg.h: $(top_builddir)/config.status - rm -f $@ -endif -MOSTLYCLEANFILES += stdarg.h stdarg.h-t - -EXTRA_DIST += stdarg.in.h - -## end gnulib module stdarg - -## begin gnulib module stdbool - -BUILT_SOURCES += $(STDBOOL_H) - -# We need the following in order to create <stdbool.h> when the system -# doesn't have one that works. -if GL_GENERATE_STDBOOL_H -stdbool.h: stdbool.in.h $(top_builddir)/config.status - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool.in.h; \ - } > $@-t && \ - mv $@-t $@ -else -stdbool.h: $(top_builddir)/config.status - rm -f $@ -endif -MOSTLYCLEANFILES += stdbool.h stdbool.h-t - -EXTRA_DIST += stdbool.in.h - -## end gnulib module stdbool - ## begin gnulib module stddef BUILT_SOURCES += $(STDDEF_H) @@ -905,6 +873,13 @@ EXTRA_libgnu_a_SOURCES += unsetenv.c ## end gnulib module unsetenv +## begin gnulib module update-copyright + + +EXTRA_DIST += $(top_srcdir)/build-aux/update-copyright + +## end gnulib module update-copyright + ## begin gnulib module utimens libgnu_a_SOURCES += utimens.c @@ -919,6 +894,13 @@ EXTRA_DIST += verify.h ## end gnulib module verify +## begin gnulib module vla + + +EXTRA_DIST += vla.h + +## end gnulib module vla + ## begin gnulib module xalloc-oversized if gl_GNULIB_ENABLED_682e609604ccaac6be382e4ee3a4eaec diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h index 1d45df743de..e54ab87c7eb 100644 --- a/nt/inc/ms-w32.h +++ b/nt/inc/ms-w32.h @@ -168,6 +168,7 @@ extern char *getenv (); #ifdef HAVE_NTGUI # ifndef HAVE_WINDOW_SYSTEM # define HAVE_WINDOW_SYSTEM 1 +# define POLL_FOR_INPUT 1 # endif #endif @@ -437,20 +438,36 @@ extern char *get_emacs_configuration_options (void); #define _WINSOCK_H /* Defines size_t and alloca (). */ -#ifdef emacs -#define malloc e_malloc -#define free e_free -#define realloc e_realloc -#define calloc e_calloc -#endif +#include <stdlib.h> +#include <sys/stat.h> #ifdef _MSC_VER #define alloca _alloca #else #include <malloc.h> #endif -#include <stdlib.h> -#include <sys/stat.h> +#ifdef emacs + +typedef void * (* malloc_fn)(size_t); +typedef void * (* realloc_fn)(void *, size_t); +typedef void (* free_fn)(void *); + +extern void *malloc_before_dump(size_t); +extern void *realloc_before_dump(void *, size_t); +extern void free_before_dump(void *); +extern void *malloc_after_dump(size_t); +extern void *realloc_after_dump(void *, size_t); +extern void free_after_dump(void *); + +extern malloc_fn the_malloc_fn; +extern realloc_fn the_realloc_fn; +extern free_fn the_free_fn; + +#define malloc(size) (*the_malloc_fn)(size) +#define free(ptr) (*the_free_fn)(ptr) +#define realloc(ptr, size) (*the_realloc_fn)(ptr, size) + +#endif /* Define for those source files that do not include enough NT system files. */ #ifndef NULL diff --git a/nt/inc/sys/mman.h b/nt/inc/sys/mman.h new file mode 100644 index 00000000000..6990edcb59b --- /dev/null +++ b/nt/inc/sys/mman.h @@ -0,0 +1,31 @@ +/* + * sys/mman.h + * mman-win32 + */ + +#ifndef _SYS_MMAN_H_ +#define _SYS_MMAN_H_ + +#include <sys/types.h> + +#ifdef __cplusplus +extern "C" { +#endif + +/* We need MAP_ANON in src/buffer.c */ + +#define MAP_FILE 0 +#define MAP_SHARED 1 +#define MAP_PRIVATE 2 +#define MAP_TYPE 0xf +#define MAP_FIXED 0x10 +#define MAP_ANONYMOUS 0x20 +#define MAP_ANON MAP_ANONYMOUS + +#define MAP_FAILED ((void *)-1) + +#ifdef __cplusplus +}; +#endif + +#endif /* _SYS_MMAN_H_ */ diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in index d1542e74a64..0770ad986f6 100644 --- a/nt/makefile.w32-in +++ b/nt/makefile.w32-in @@ -22,7 +22,7 @@ # FIXME: This file uses DOS EOLs. Convert to Unix after 22.1 is out # (and remove or replace this comment). -VERSION = 24.4.51 +VERSION = 25.0.50 TMP_DIST_DIR = emacs-$(VERSION) |