commit 7882dc625e1ec562fcd0e1b743ef11b160cae18e (HEAD, refs/remotes/origin/master) Author: John Wiegley Date: Sun Mar 6 12:51:44 2016 -0800 Revert "Use colors in the VC mode lines" This reverts commit 2621c293d82c15c00d9e73a8db75d70da7d0a23b. diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el index 6488e53..0c1718e 100644 --- a/lisp/vc/vc-hooks.el +++ b/lisp/vc/vc-hooks.el @@ -54,51 +54,44 @@ :group 'vc-faces) (defface vc-needs-update-state - '((default :inherit vc-state-base-face) - (((class color)) :foreground "blue" :weight bold)) + '((default :inherit vc-state-base-face)) "Face for VC modeline state when the file needs update." :version "25.1" :group 'vc-faces) (defface vc-locked-state - '((default :inherit vc-state-base-face) - (((class color)) :foreground "red")) + '((default :inherit vc-state-base-face)) "Face for VC modeline state when the file locked." :version "25.1" :group 'vc-faces) (defface vc-locally-added-state - '((default :inherit vc-state-base-face) - (((class color)) :foreground "ForestGreen")) + '((default :inherit vc-state-base-face)) "Face for VC modeline state when the file is locally added." :version "25.1" :group 'vc-faces) (defface vc-conflict-state - '((default :inherit vc-state-base-face) - (((class color)) :foreground "red" :weight bold)) + '((default :inherit vc-state-base-face)) "Face for VC modeline state when the file contains merge conflicts." :version "25.1" :group 'vc-faces) (defface vc-removed-state - '((default :inherit vc-state-base-face) - (((class color)) :foreground "red")) + '((default :inherit vc-state-base-face)) "Face for VC modeline state when the file was removed from the VC system." :version "25.1" :group 'vc-faces) (defface vc-missing-state - '((default :inherit vc-state-base-face) - (((class color)) :foreground "red")) + '((default :inherit vc-state-base-face)) "Face for VC modeline state when the file is missing from the file system." :version "25.1" :group 'vc-faces) (defface vc-edited-state - '((default :inherit vc-state-base-face) - (((class color)) :foreground "ForestGreen")) - "Face for VC modeline state when the file is edited." + '((default :inherit vc-state-base-face)) + "Face for VC modeline state when the file is up to date." :version "25.1" :group 'vc-faces) commit 258f1034d7f451da1c05ef246ca0849d0c0a9c3c Author: Ken Brown Date: Sun Mar 6 12:08:39 2016 -0500 Fix Cygwin-w32 build * src/w32fns.c (funhook, setup_w32_kbdhook, remove_w32_kbdhook): Define only if WINDOWSNT, and update all uses accordingly. * src/w32term.h (check_w32_winkey_state, setup_w32_kbdhook) (remove_w32_kbdhook): Declare only if WINDOWSNT. (w32_kbdhook_active): Define as 0 if not WINDOWSNT. diff --git a/src/w32fns.c b/src/w32fns.c index 10c8af7..0fe6a6f 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -2112,6 +2112,7 @@ my_post_msg (W32Msg * wmsg, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) post_msg (wmsg); } +#ifdef WINDOWSNT /* The Windows keyboard hook callback. */ static LRESULT CALLBACK funhook (int code, WPARAM w, LPARAM l) @@ -2370,6 +2371,7 @@ remove_w32_kbdhook (void) kbdhook.hook = NULL; } } +#endif /* WINDOWSNT */ /* Mark a specific key combination as hooked, preventing it to be handled by the system. */ @@ -4734,12 +4736,16 @@ w32_wnd_proc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) my_post_msg (&wmsg, hwnd, msg, wParam, lParam); goto dflt; +#ifdef WINDOWSNT case WM_CREATE: setup_w32_kbdhook (); goto dflt; +#endif case WM_DESTROY: +#ifdef WINDOWSNT remove_w32_kbdhook (); +#endif CoUninitialize (); return 0; diff --git a/src/w32term.h b/src/w32term.h index aed89d8..7c23bc4 100644 --- a/src/w32term.h +++ b/src/w32term.h @@ -738,11 +738,15 @@ extern int handle_file_notifications (struct input_event *); extern void w32_initialize_display_info (Lisp_Object); extern void initialize_w32_display (struct terminal *, int *, int *); +#ifdef WINDOWSNT /* Keyboard hooks. */ extern void setup_w32_kbdhook (void); extern void remove_w32_kbdhook (void); extern int check_w32_winkey_state (int); #define w32_kbdhook_active (os_subtype != OS_9X) +#else +#define w32_kbdhook_active 0 +#endif /* Keypad command key support. W32 doesn't have virtual keys defined for the function keys on the keypad (they are mapped to the standard commit 69e03ddccf47fc29126317dd3317313ecd92b797 Author: Eli Zaretskii Date: Sun Mar 6 18:52:32 2016 +0200 Unbreak the MinGW64 build * nt/inc/ms-w32.h [MINGW_W64]: Undefine HAVE_GAI_STRERROR. See http://lists.gnu.org/archive/html/emacs-devel/2016-03/msg00130.html for the details. Reported by Angelo Graziosi . diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h index a37510e..9de3b12 100644 --- a/nt/inc/ms-w32.h +++ b/nt/inc/ms-w32.h @@ -185,6 +185,13 @@ extern struct tm * sys_localtime (const time_t *); supply the 2nd arg correctly, so don't use _setjmp directly in that case. */ #undef HAVE__SETJMP + +/* Unlike MS and mingw.org, MinGW64 doesn't define gai_strerror as an + inline function in a system header file, and instead seems to + require to link against ws2_32.a. But we don't want to link with + -lws2_32, as that would make Emacs dependent on the respective DLL. + So MinGW64 is amply punished here by the following: */ +#undef HAVE_GAI_STRERROR #endif /* The following is needed for recovery from C stack overflows. */