]> code.delx.au - gnu-emacs/blobdiff - lib-src/ChangeLog
Merge from trunk.
[gnu-emacs] / lib-src / ChangeLog
index 2a8ac9b813175d9d398dadc600e9e46fb02839e8..26525b6e6550a76df5bb8e3fb62f0d759bcc62f2 100644 (file)
@@ -1,3 +1,24 @@
+2012-10-08  Eli Zaretskii  <eliz@gnu.org>
+
+       * makefile.w32-in (obj): Add cygw32.o.
+
+2012-10-08  Daniel Colascione  <dancol@dancol.org>
+
+       * emacsclient.c: Include windows.h when HAVE_NTGUI.
+       (alt_display): New variable.  We send the display held by this
+       variable when the primary display is either unsupported or not
+       present.
+       (longopts): Allow display everywhere.
+       (w32_set_user_model_id): Move lower in file, inside HAVE_NTGUI
+       section.
+       (decode_options): Use alt_display.  Explain why.
+       (main): Retry connection with alt_display if connection with main
+       display fails.
+
+2012-10-07  Eli Zaretskii  <eliz@gnu.org>
+
+       * makefile.w32-in (obj): Add w32notify.o.
+
 2012-10-01  Fabrice Popineau  <fabrice.popineau@gmail.com>
 
        * make-docfile.c (write_globals): Special-case