Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-875
This commit is contained in:
Miles Bader 2007-10-09 08:52:57 +00:00
commit 1af74d06e5
91 changed files with 2395 additions and 781 deletions

View file

@ -35,6 +35,7 @@ Boston, MA 02110-1301, USA. */
# include <malloc.h>
# include <stdlib.h>
# include <windows.h>
# include <commctrl.h>
# define NO_SOCKETS_IN_FILE_SYSTEM
@ -300,9 +301,13 @@ w32_window_app ()
char szTitle[MAX_PATH];
if (window_app < 0)
/* Checking for STDOUT does not work; it's a valid handle also in
nonconsole apps. Testing for the console title seems to work. */
window_app = (GetConsoleTitleA (szTitle, MAX_PATH) == 0);
{
/* Checking for STDOUT does not work; it's a valid handle also in
nonconsole apps. Testing for the console title seems to work. */
window_app = (GetConsoleTitleA (szTitle, MAX_PATH) == 0);
if (window_app)
InitCommonControls();
}
return window_app;
}