diff src/emacs.c @ 2994:ec5f23ea6d2e

[xemacs-hg @ 2005-10-14 01:21:57 by ben] add gc percentage threshold to mc-alloc config.h.in, alloc.c, dumper.c, emacs.c, lrecord.h, mc-alloc.c, mc-alloc.h, symbols.c: Rename MC_ALLOC_TYPE_STATS to ALLOC_TYPE_STATS, since (with refactoring) this is not really specific to mc-alloc. Generalize code to implement the GC % threshold for garbage collecting. Rename `lrecord-stats' to `object-memory-usage-stats' (defined when not mc-alloc, too). Rename `memory-usage' to `total-memory-usage' and add `object-memory-usage'. Bump gc_cons_threshold to 2,000,000 (suggestion by Stephen Turnbull). Avoid use of C++ reserved word `catch'. Change address for crash reporting to xemacs-beta@xemacs.org from crashes@xemacs.org. new -> new_ in emacs.c. Turn on _CRT_SECURE_NO_DEPRECATE under Visual C++ to avoid tons of warnings in VC8.
author ben
date Fri, 14 Oct 2005 01:22:01 +0000
parents 414a64af46c9
children b7f26b2f78bd
line wrap: on
line diff
--- a/src/emacs.c	Fri Oct 14 01:02:30 2005 +0000
+++ b/src/emacs.c	Fri Oct 14 01:22:01 2005 +0000
@@ -919,9 +919,9 @@
       if (!restart)
 	{
 	  init_mc_allocator ();
-#ifdef MC_ALLOC_TYPE_STATS
+#ifdef ALLOC_TYPE_STATS
 	  init_lrecord_stats ();
-#endif /* not MC_ALLOC_TYPE_STATS */
+#endif /* ALLOC_TYPE_STATS */
 	}
     }
 #endif /* MC_ALLOC */
@@ -1217,16 +1217,16 @@
 	 This requires inserting a new element into argv.  */
       if (dpy != 0 && skip_args - count_before == 1)
 	{
-	  Wexttext **new = xnew_array (Wexttext *, argc + 2);
+	  Wexttext **new_ = xnew_array (Wexttext *, argc + 2);
 	  int j;
 
 	  for (j = 0; j < count_before + 1; j++)
-	    new[j] = argv[j];
-	  new[count_before + 1] = WEXTSTRING ("-d");
-	  new[count_before + 2] = dpy;
+	    new_[j] = argv[j];
+	  new_[count_before + 1] = WEXTSTRING ("-d");
+	  new_[count_before + 2] = dpy;
 	  for (j = count_before + 2; j <argc; j++)
-	    new[j + 1] = argv[j];
-	  argv = new;
+	    new_[j + 1] = argv[j];
+	  argv = new_;
 	  argc++;
 	}
       /* Change --display to -d, when its arg is separate.  */
@@ -2913,7 +2913,7 @@
 Do not call this.  It will reinitialize your XEmacs.  You'll be sorry.
 */
 /* If this function is called from startup.el, it will be possible to run
-   temacs as an editor using 'temacs -batch -l loadup.el run-temacs', instead
+   temacs as an editor using `temacs -batch -l loadup.el run-temacs', instead
    of having to dump an emacs and then run that (when debugging emacs itself,
    this can be much faster)). [Actually, the speed difference isn't that
    much as long as your filesystem is local, and you don't end up with
@@ -3472,17 +3472,17 @@
 "the crash anyway.\n\n"
 #ifdef INFODOCK
 "Please report this bug by selecting `Report-Bug' in the InfoDock menu, or\n"
-"(last resort) by emailing `crashes@xemacs.org' -- note that this is for XEmacs\n"
-"in general, not just Infodock."
+"(last resort) by emailing `xemacs-beta@xemacs.org' -- note that this is for\n"
+"XEmacs in general, not just Infodock."
 #else
 "Please report this bug by invoking M-x report-emacs-bug, or by selecting\n"
 "`Send Bug Report' from the Help menu.  If that won't work, send ordinary\n"
-"email to `crashes@xemacs.org'."
-#endif
-"  *MAKE SURE* to include this entire output\n"
-"from this crash, especially including the Lisp backtrace, as well as the\n"
-"XEmacs configuration from M-x describe-installation (or equivalently, the\n"
-"file `Installation' in the top of the build tree).\n"
+"email to `xemacs-beta@xemacs.org'."
+#endif
+"  *MAKE SURE* to include this entire\n"
+"output from this crash, especially including the Lisp backtrace, as well as\n"
+"the XEmacs configuration from M-x describe-installation (or equivalently,\n"
+"the file `Installation' in the top of the build tree).\n"
 #ifdef _MSC_VER
 "\n"
 "If you are fortunate enough to have some sort of debugging aid installed\n"