diff src/emacs.c @ 187:b405438285a2 r20-3b20

Import from CVS: tag r20-3b20
author cvs
date Mon, 13 Aug 2007 09:56:28 +0200
parents 3d6bfa290dbd
children a2f645c6b9f8
line wrap: on
line diff
--- a/src/emacs.c	Mon Aug 13 09:55:30 2007 +0200
+++ b/src/emacs.c	Mon Aug 13 09:56:28 2007 +0200
@@ -191,7 +191,7 @@
   /* If fatal error occurs in code below, avoid infinite recursion.  */
   if (! fatal_error_in_progress)
     {
-      fatal_error_in_progress = 1;
+      fatal_error_in_progress = dont_check_for_quit = 1;
       shut_down_emacs (sig, Qnil);
       stderr_out("\nLisp backtrace follows:\n\n");
       Fbacktrace(Qexternal_debugging_output, Qt);
@@ -2363,7 +2363,7 @@
 List of directories configured for package searching.
 */ );
 #ifndef PACKAGE_PATH
-#define PACKAGE_PATH PATH_PREFIX "/lib/xemacs/packages:~/.xemacs"
+#define PACKAGE_PATH "~/.xemacs:" PATH_PREFIX "/lib/xemacs/packages"
 #endif
   Vpackage_path = decode_path(PACKAGE_PATH);