1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-03 08:30:09 +00:00
Commit Graph

77 Commits

Author SHA1 Message Date
Ken Brown
ba3b2d88d8 Fix icon for the cygw32 build on 64-bit Cygwin. (Bug#12993)
* nt/emacs.rc: Use 64-bit manifest for 64-bit Cygwin build.

* configure.ac (W32_RES_LINK): Remove unnecessary linker directive
`-Wl,-bpe-i386', which is confusing in the 64-bit case.
2013-04-08 22:38:56 -04:00
Glenn Morris
0a8bf3afca Merge from emacs-24; up to 2012-12-06T07:33:20Z!rgm@gnu.org 2013-01-02 18:37:57 -08:00
Glenn Morris
f0ddbf7b7f Add 2013 to more copyright years 2013-01-02 17:35:49 -08:00
Chong Yidong
c0c3924918 Bump version to 24.2.91.
Regenerate ldefs-boot.el and AUTHORS.
2012-12-15 22:16:02 +08:00
Daniel Colascione
78f9ea875a Move fix for bug#12993 to trunk 2012-12-10 09:55:03 -08:00
Daniel Colascione
743fa5cbdd Move fix for cygw32 icon issue from emacs-24 branch to trunk as Stefan Monnier requests 2012-12-10 09:52:35 -08:00
Daniel Colascione
1cf1bbd51e Compile Windows resources into cygw32 Emacs 2012-12-09 23:11:21 -08:00
Chong Yidong
ea0d348b1c Bump version to 24.2.90.
Regenerate AUTHORS and ldefs-boot.el.
2012-11-24 23:31:31 +08:00
Chong Yidong
052f924a01 Bump version to 24.3.50 2012-11-02 08:48:12 +08:00
Fabrice Popineau
62aba0d497 Support x64 build on MS-Windows with MSVC.
src/w32term.h (SCROLL_BAR_PACK, SCROLL_BAR_UNPACK): Define for x64.
 (SET_SCROLL_BAR_W32_WINDOW): Cast ID to intptr_t, for
 compatibility with x64.
 src/w32term.c (w32_draw_underwave): Don't use GCC extensions for
 defining an XRectangle structure.
 src/w32proc.c (RVA_TO_PTR, w32_executable_type): Fix pointer
 arithmetics for compatibility with x64.
 src/w32menu.c (add_menu_item): Use UINT_PTR instead of UINT, for
 compatibility with x64.
 src/w32heap.h: Adjust prototypes and declarations.
 src/w32heap.c (RVA_TO_PTR, allocate_heap, sbrk, init_heap)
 (round_heap): Use DWORD_PTR, ptrdiff_t and size_t instead of
 DWORD, long, and unsigned long, for compatibility with x64.
 (allocate_heap) [_WIN64]: Reserve 32GB of memory.
 (sbrk): Argument is now of type ptrdiff_t.
 src/w32fns.c (HMONITOR): Condition declaration on _WIN32_WINNT being
 less than 0x0500.
 (w32_msg_pump): Use WPARAM type for 'result'.
 src/w32.c (init_environment, get_emacs_configuration): Support AMD64
 architecture.
 (init_ntproc): Cast arguments of _open_osfhandle to intptr_t, for
 compatibility with x64.
 src/vm-limit.c (lim_data): Now size_t.
 (check_memory_limits): Adjust prototypes of real_morecore and
 __morecore to receive argument of type ptrdiff_t.  Use size_t for
 five_percent and data_size.
 src/unexw32.c: Use DWORD_PTR instead of DWORD for file-scope
 variables, for compatibility with x64.
 (rva_to_section, offset_to_section, relocate_offset)
 (OFFSET_TO_RVA, RVA_TO_OFFSET, RVA_TO_SECTION_OFFSET)
 (PTR_TO_RVA, RVA_TO_PTR, OFFSET_TO_PTR, get_section_info)
 (copy_executable_and_dump_data): Use DWORD_PTR instead of DWORD
 for compatibility with x64.
 src/sysdep.c (STDERR_FILENO): Define if not already defined.
 src/ralloc.c (real_morecore): Argument type is now ptrdiff_t.
 (__morecore): Argument type is now ptrdiff_t.
 (ROUNDUP, MEM_ROUNDUP): Use size_t instead of 'unsigned long'.
 (relinquish): Use ptrdiff_t type for 'excess'.
 (r_alloc_sbrk): Argument type is now ptrdiff_t.
 src/makefile.w32-in (HEAPSIZE): Get value from EMACS_HEAPSIZE.
 (bootstrap-temacs-CMD, bootstrap-temacs-SH): Use $(EMACS_PURESIZE)
 instead of a literal number.
 src/gmalloc.c [WINDOWSNT]: Include w32heap.h.
 (min): Define only if not already defined.
 src/frame.c (x_report_frame_params): Use EMACS_UINT for the return
 value of FRAME_X_WINDOW, to fit a 64-bit pointer on 64-bit Windows
 hosts.
 src/image.c (x_bitmap_pixmap): Return ptrdiff_t, not int, since
 'bitmaps' is a pointer.
 src/dispextern.h (x_bitmap_pixmap): Adjust prototype.
 src/alloc.c (gdb_make_enums_visible): Now conditional on __GNUC__.

 nt/makefile.w32-in ($(TRES)): Use $(EMACS_MANIFEST).
 nt/inc/sys/socket.h: Don't map Winsock error codes to standard ones
 that are already defined.
 nt/inc/ms-w32.h (EMACS_INT, EMACS_UINT, EMACS_INT_MAX, PRIuMAX)
 (pI, _INTPTR) [_MSC_VER]: Fix definitions for MSVC.
 [_MSC_VER]: Add pragmas to suppress some MSVC warnings.
 nt/preprep.c (pfnCheckSumMappedFile, rva_to_section)
 (offset_to_section, relocate_offset, OFFSET_TO_RVA)
 (RVA_TO_OFFSET, RVA_TO_SECTION_OFFSET, PTR_TO_RVA)
 (OFFSET_TO_PTR, ROUND_UP, ROUND_DOWN)
 (copy_executable_and_move_sections, ADJUST_IMPORT_RVA, main): Use
 DWORD_PTR instead of DWORD for compatibility with x64.
 nt/nmake.defs: Support AMD64.
 (EMACS_HEAPSIZE, EMACS_PURESIZE, EMACS_MANIFEST): New macros.
 nt/gmake.defs: (EMACS_HEAPSIZE, EMACS_PURESIZE, EMACS_MANIFEST):
 New macros.
 nt/addsection.c (pfnCheckSumMappedFile, rva_to_section)
 (offset_to_section, relocate_offset, OFFSET_TO_RVA)
 (RVA_TO_OFFSET, RVA_TO_SECTION_OFFSET, PTR_TO_RVA)
 (OFFSET_TO_PTR, ROUND_UP, ROUND_DOWN)
 (copy_executable_and_add_section, main): Use DWORD_PTR instead of
 DWORD, for compatibility with x64.
 nt/emacs-x64.manifest: New file.
 nt/emacs-x86.manifest: Renamed from emacs.manifest.

 lib-src/ntlib.c (gettimeofday): Copy from src/w32.c.  lib/gettime. 
 needs this function.
2012-09-30 23:36:42 +02:00
Chong Yidong
b6928595db Bump version to 24.2.50 2012-08-15 21:26:30 +08:00
Glenn Morris
f3774f20c3 Bump trunk version to 24.1.50.
* README, configure.in (AC_INIT): Bump version to 24.1.50.

* doc/emacs/emacsver.texi (EMACSVER): Bump version to 24.1.50.

* doc/man/emacs.1: Bump version to 24.1.50.

* msdos/sed2v2.inp: Bump version to 24.1.50.

* nextstep/Cocoa/Emacs.base/Contents/Info.plist:
* nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings:
* nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist:
* nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop:
Bump version to 24.1.50.

* nt/config.nt, nt/makefile.w32-in, nt/emacs.rc, nt/emacsclient.rc:
Bump version to 24.1.50.
2012-04-07 13:00:16 -07:00
Chong Yidong
319bc402c8 Bump version to 24.0.95.
Regenerate AUTHORS and ldefs-boot.el.
2012-04-02 12:38:31 +08:00
Chong Yidong
9c62cd0479 Bump version to 24.0.94 2012-02-27 11:20:00 +08:00
Chong Yidong
d7fac6deb0 Bump version to 24.0.93.
Regenerate AUTHORS and ldefs-boot.el.
2012-01-29 23:46:05 +08:00
Glenn Morris
acaf905b11 Add 2012 to FSF copyright years for Emacs files 2012-01-05 01:46:05 -08:00
Chong Yidong
6db4e2d308 Bump version to 24.0.92.
Regenerate AUTHORS and ldefs-boot.el.
2011-12-01 00:23:05 +08:00
Chong Yidong
2e5f9e42d0 Bump version to 24.0.91.
Regenerate AUTHORS and ldefs-boot.el.
2011-10-31 10:25:01 +08:00
Chong Yidong
f7d75b4bba Bump version to 24.0.90.
Regenerate AUTHORS and ldefs-boot.el.
2011-09-25 23:20:03 -04:00
Glenn Morris
73b0cd5003 Convert consecutive FSF copyright years to ranges. 2011-01-24 20:08:28 -08:00
Stefan Monnier
77ab81d054 Merge from emacs-23 2011-01-14 12:18:41 -05:00
Glenn Morris
5df4f04cd3 Add 2011 to FSF/AIST copyright years. 2011-01-02 15:50:46 -08:00
Chong Yidong
1f10e75066 Bump version to 23.2.91.
Regenerate configure and ldefs-boot.el.
2010-12-10 12:46:40 -05:00
Chong Yidong
0f161c71c9 Bump version to 23.2.90.
Regenerate AUTHORS, configure, and ldefs-boot.el.
2010-11-08 21:53:18 -05:00
Chong Yidong
19ae0deb1c Bump version to 23.2.50. 2010-05-08 00:46:44 -04:00
Chong Yidong
61a808e819 Bump version to 23.2. 2010-05-07 23:28:26 -04:00
Chong Yidong
8838172bf0 Bump version to 23.1.97. 2010-05-03 21:31:59 -04:00
Chong Yidong
958631c4cc Bump version to 23.1.96. 2010-04-19 21:29:37 -04:00
Chong Yidong
d86d8ea85a Bump version to 23.1.95. 2010-04-02 20:42:10 -04:00
Chong Yidong
66da5719da Bump version to 23.1.94 and regenerate ldefs-boot.el. 2010-03-10 23:03:11 -05:00
Chong Yidong
288f9fc069 Bump version to 24.0.50. 2010-03-10 10:17:13 -05:00
Chong Yidong
5d752593a5 Bump version to 23.1.93; regenerate AUTHORS. 2010-02-26 22:09:45 -05:00
Chong Yidong
e1c6f91c71 Bump version to 23.1.92. 2010-01-29 21:09:50 -05:00
Glenn Morris
114f9c9679 Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
Chong Yidong
829f35a5bb Bump version to 23.1.91. Regenerate AUTHORS and ldefs-boot.el. 2009-12-30 21:14:46 -05:00
Chong Yidong
a3ff15d6fc Bump version to 23.1.90. 2009-12-09 02:06:16 +00:00
Chong Yidong
d7ae78c031 Bump version to 23.1.50. 2009-06-21 04:46:07 +00:00
Chong Yidong
2bb4a75381 Bump version number to 23.0.95. 2009-06-19 17:10:49 +00:00
Chong Yidong
70cb3ee246 Bump version to 23.0.94. 2009-05-23 03:13:49 +00:00
Chong Yidong
b336408c6b Bump version to 23.0.93. 2009-05-01 15:32:01 +00:00
Chong Yidong
91e6d74d7b Bump version to 23.0.92. 2009-03-31 02:04:39 +00:00
Chong Yidong
3f2d84c759 Bump version to 23.0.91. 2009-02-26 01:06:51 +00:00
Chong Yidong
a436e145b7 Bump version to 23.0.90. 2009-02-01 22:04:25 +00:00
Jason Rumney
c24f4bf956 Swap name and description. Remove Windows versions. 2009-01-26 01:51:18 +00:00
Glenn Morris
f5d0ac07d6 Add 2009 to copyright years. 2009-01-08 03:38:51 +00:00
Glenn Morris
b201914160 Set version to 23.0.60. 2008-03-13 03:21:16 +00:00
Miles Bader
59ce725a3b Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987
2008-01-08 20:46:54 +00:00
Glenn Morris
6d344054d1 Add 2008 to copyright years. 2008-01-07 08:15:16 +00:00
Glenn Morris
e93ca07663 Increase version to 23.0.50. 2007-08-29 08:11:35 +00:00
Jason Rumney
07fe3281d6 Use emacs.manifest. 2007-06-19 11:59:20 +00:00