diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 10 | ||||
| -rw-r--r-- | src/frame.c | 2 | ||||
| -rw-r--r-- | src/w32.c | 2 | ||||
| -rw-r--r-- | src/w32term.c | 4 |
4 files changed, 14 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index df704efdf2d..e6bbeb8b864 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,13 @@ +2014-11-17 Oscar Fuentes <ofv@wanadoo.es> + + * src/w32.c: Use MINGW_W64 instead of _W64. + + * src/w32term.c: Likewise. + +2014-11-16 Stefan Monnier <monnier@iro.umontreal.ca> + + * frame.c (Fhandle_switch_frame): Deactivate shift-region (bug#19003). + 2014-11-26 Lars Magne Ingebrigtsen <larsi@gnus.org> * gnutls.c (gnutls_ip_address_p): New function. diff --git a/src/frame.c b/src/frame.c index 88f3d1f4fa9..eaab63a0ea4 100644 --- a/src/frame.c +++ b/src/frame.c @@ -1194,7 +1194,7 @@ This function returns FRAME, or nil if FRAME has been deleted. */) return do_switch_frame (frame, 1, 0, norecord); } -DEFUN ("handle-switch-frame", Fhandle_switch_frame, Shandle_switch_frame, 1, 1, "e", +DEFUN ("handle-switch-frame", Fhandle_switch_frame, Shandle_switch_frame, 1, 1, "^e", doc: /* Handle a switch-frame event EVENT. Switch-frame events are usually bound to this function. A switch-frame event tells Emacs that the window manager has requested diff --git a/src/w32.c b/src/w32.c index f014cd73a76..ca5e14bc60a 100644 --- a/src/w32.c +++ b/src/w32.c @@ -151,7 +151,7 @@ typedef struct _PROCESS_MEMORY_COUNTERS_EX { #define SDDL_REVISION_1 1 #endif /* SDDL_REVISION_1 */ -#if defined(_MSC_VER) || defined(_W64) +#if defined(_MSC_VER) || defined(MINGW_W64) /* MSVC and MinGW64 don't provide the definition of REPARSE_DATA_BUFFER and the associated macros, except on ntifs.h, which cannot be included because it triggers conflicts with other diff --git a/src/w32term.c b/src/w32term.c index c2a37d078a8..94b332b929f 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -101,10 +101,10 @@ extern Cursor w32_load_cursor (LPCTSTR name); struct w32_display_info one_w32_display_info; struct w32_display_info *x_display_list; -#if _WIN32_WINNT < 0x0500 && !defined(_W64) +#if _WIN32_WINNT < 0x0500 && !defined(MINGW_W64) /* Pre Windows 2000, this was not available, but define it here so that Emacs compiled on such a platform will run on newer versions. - MinGW64 (_W64) defines these unconditionally, so avoid redefining. */ + MinGW64 defines these unconditionally, so avoid redefining. */ typedef struct tagWCRANGE { |