[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/emacs.c [emacs-unicode-2]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/src/emacs.c [emacs-unicode-2] |
Date: |
Thu, 11 Nov 2004 22:19:04 -0500 |
Index: emacs/src/emacs.c
diff -c emacs/src/emacs.c:1.328.4.7 emacs/src/emacs.c:1.328.4.8
*** emacs/src/emacs.c:1.328.4.7 Thu Nov 4 08:55:31 2004
--- emacs/src/emacs.c Fri Nov 12 02:52:55 2004
***************
*** 1626,1641 ****
keys_of_minibuf ();
keys_of_window ();
}
! else
{
! /*
! Initialization that must be done even if the global variable
! initialized is non zero
! */
#ifdef HAVE_NTGUI
globals_of_w32fns ();
globals_of_w32menu ();
! #endif /* end #ifdef HAVE_NTGUI */
}
init_charset ();
--- 1626,1639 ----
keys_of_minibuf ();
keys_of_window ();
}
! else
{
! /* Initialization that must be done even if the global variable
! initialized is non zero. */
#ifdef HAVE_NTGUI
globals_of_w32fns ();
globals_of_w32menu ();
! #endif /* HAVE_NTGUI */
}
init_charset ();
***************
*** 2189,2204 ****
if (! noninteractive)
error ("Dumping Emacs works only in batch mode");
if (heap_bss_diff > MAX_HEAP_BSS_DIFF)
{
fprintf (stderr,
"**************************************************\n");
fprintf (stderr, "Warning: Your system has a gap between BSS and
the\n");
! fprintf (stderr, "heap. This usually means that exec-shield or\n");
! fprintf (stderr, "something similar is in effect. The dump may
fail\n");
! fprintf (stderr, "because of this. See the section about
exec-shield\n");
! fprintf (stderr, "in etc/PROBLEMS for more information.\n");
fprintf (stderr,
"**************************************************\n");
}
/* Bind `command-line-processed' to nil before dumping,
so that the dumped Emacs will process its command line
--- 2187,2205 ----
if (! noninteractive)
error ("Dumping Emacs works only in batch mode");
+ #ifdef __linux__
if (heap_bss_diff > MAX_HEAP_BSS_DIFF)
{
fprintf (stderr,
"**************************************************\n");
fprintf (stderr, "Warning: Your system has a gap between BSS and
the\n");
! fprintf (stderr, "heap (%lu byte). This usually means that
exec-shield\n",
! heap_bss_diff);
! fprintf (stderr, "or something similar is in effect. The dump may\n");
! fprintf (stderr, "fail because of this. See the section about \n");
! fprintf (stderr, "exec-shield in etc/PROBLEMS for more information.\n");
fprintf (stderr,
"**************************************************\n");
}
+ #endif /* __linux__ */
/* Bind `command-line-processed' to nil before dumping,
so that the dumped Emacs will process its command line
***************
*** 2287,2293 ****
{
*plocale = desired_locale;
setlocale (category, (STRINGP (desired_locale)
! ? (char *)(SDATA (desired_locale))
: ""));
}
}
--- 2288,2294 ----
{
*plocale = desired_locale;
setlocale (category, (STRINGP (desired_locale)
! ? (char *) SDATA (desired_locale)
: ""));
}
}