/[emacs]/emacs/src/emacs.c
ViewVC logotype

Diff of /emacs/src/emacs.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.309.2.14 by miles, Thu Nov 4 13:12:22 2004 UTC revision 1.309.2.15 by miles, Fri Nov 12 04:21:15 2004 UTC
# Line 1620  main (argc, argv Line 1620  main (argc, argv
1620        keys_of_minibuf ();        keys_of_minibuf ();
1621        keys_of_window ();        keys_of_window ();
1622      }      }
1623          else    else
1624      {      {
1625        /*        /* Initialization that must be done even if the global variable
1626          Initialization that must be done even if the global variable           initialized is non zero.  */
         initialized is non zero  
       */  
1627  #ifdef HAVE_NTGUI  #ifdef HAVE_NTGUI
1628        globals_of_w32fns ();        globals_of_w32fns ();
1629        globals_of_w32menu ();        globals_of_w32menu ();
1630  #endif  /* end #ifdef HAVE_NTGUI */  #endif  /* HAVE_NTGUI */
1631      }      }
1632    
1633    if (!noninteractive)    if (!noninteractive)
# Line 2181  You must run Emacs in batch mode in orde Line 2179  You must run Emacs in batch mode in orde
2179    if (! noninteractive)    if (! noninteractive)
2180      error ("Dumping Emacs works only in batch mode");      error ("Dumping Emacs works only in batch mode");
2181    
2182    #ifdef __linux__
2183    if (heap_bss_diff > MAX_HEAP_BSS_DIFF)    if (heap_bss_diff > MAX_HEAP_BSS_DIFF)
2184      {      {
2185        fprintf (stderr, "**************************************************\n");        fprintf (stderr, "**************************************************\n");
2186        fprintf (stderr, "Warning: Your system has a gap between BSS and the\n");        fprintf (stderr, "Warning: Your system has a gap between BSS and the\n");
2187        fprintf (stderr, "heap.  This usually means that exec-shield or\n");        fprintf (stderr, "heap (%lu byte).  This usually means that exec-shield\n",
2188        fprintf (stderr, "something similar is in effect.  The dump may fail\n");                 heap_bss_diff);
2189        fprintf (stderr, "because of this.  See the section about exec-shield\n");        fprintf (stderr, "or something similar is in effect.  The dump may\n");
2190        fprintf (stderr, "in etc/PROBLEMS for more information.\n");        fprintf (stderr, "fail because of this.  See the section about \n");
2191          fprintf (stderr, "exec-shield in etc/PROBLEMS for more information.\n");
2192        fprintf (stderr, "**************************************************\n");        fprintf (stderr, "**************************************************\n");
2193      }      }
2194    #endif /* __linux__ */
2195    
2196    /* Bind `command-line-processed' to nil before dumping,    /* Bind `command-line-processed' to nil before dumping,
2197       so that the dumped Emacs will process its command line       so that the dumped Emacs will process its command line
# Line 2279  synchronize_locale (category, plocale, d Line 2280  synchronize_locale (category, plocale, d
2280      {      {
2281        *plocale = desired_locale;        *plocale = desired_locale;
2282        setlocale (category, (STRINGP (desired_locale)        setlocale (category, (STRINGP (desired_locale)
2283                              ? (char *)(SDATA (desired_locale))                              ? (char *) SDATA (desired_locale)
2284                              : ""));                              : ""));
2285      }      }
2286  }  }

Legend:
Removed from v.1.309.2.14  
changed lines
  Added in v.1.309.2.15

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26