From 3b6536b10170a03da2d0b4682513a2ec3d5df4e5 Mon Sep 17 00:00:00 2001
From: Andreas Schwab
Date: Sun, 7 Nov 2004 01:57:27 +0000
Subject: Whitespace fixup.

---
 src/emacs.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'src/emacs.c')

diff --git a/src/emacs.c b/src/emacs.c
index 67efa4ae4e5..e24b79aa116 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1620,16 +1620,14 @@ main (argc, argv
       keys_of_minibuf ();
       keys_of_window ();
     }
-	else
+  else
     {
-      /*
-        Initialization that must be done even if the global variable
-        initialized is non zero
-      */
+      /* 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 */
+#endif  /* HAVE_NTGUI */
     }
 
   if (!noninteractive)
@@ -2279,7 +2277,7 @@ synchronize_locale (category, plocale, desired_locale)
     {
       *plocale = desired_locale;
       setlocale (category, (STRINGP (desired_locale)
-			    ? (char *)(SDATA (desired_locale))
+			    ? (char *) SDATA (desired_locale)
 			    : ""));
     }
 }
-- 
cgit v1.2.1


From c37caf9d6bd241ec9a2006164441d2b3dd5a5ae8 Mon Sep 17 00:00:00 2001
From: Jan Djärv
Date: Sun, 7 Nov 2004 21:59:19 +0000
Subject: * emacs.c (Fdump_emacs): Only output warning on GNU/Linux.

---
 src/emacs.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/emacs.c')

diff --git a/src/emacs.c b/src/emacs.c
index e24b79aa116..3ca1022a08e 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -2179,16 +2179,19 @@ You must run Emacs in batch mode in order to dump it.  */)
   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.  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, "heap (%d 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
-- 
cgit v1.2.1


From 9b33d5960f6dc5bd0e41d679841661096dbd7f30 Mon Sep 17 00:00:00 2001
From: Kim F. Storm
Date: Tue, 9 Nov 2004 13:23:13 +0000
Subject: (Fdump_emacs): Fix format string.

---
 src/emacs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/emacs.c')

diff --git a/src/emacs.c b/src/emacs.c
index 3ca1022a08e..fc158693e47 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -2184,7 +2184,7 @@ You must run Emacs in batch mode in order to dump it.  */)
     {
       fprintf (stderr, "**************************************************\n");
       fprintf (stderr, "Warning: Your system has a gap between BSS and the\n");
-      fprintf (stderr, "heap (%d byte).  This usually means that exec-shield\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");
-- 
cgit v1.2.1