(delete_temp_file): Bind file-name-handler-alist to nil for the call

[gnu-emacs] / src / emacs.c

diff --git a/src/emacs.c b/src/emacs.c
index cb333f6a39170f94e4ac6df4c24298a89bfa4806..71b12d5a4072bf3fdf3cbe25aa6c85d0181763a9 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -112,6 +112,9 @@ EMACS_INT gdb_data_seg_bits = 0;
 #endif
 EMACS_INT PVEC_FLAG = PSEUDOVECTOR_FLAG;
 EMACS_INT gdb_array_mark_flag = ARRAY_MARK_FLAG;
+/* GDB might say "No enum type named pvec_type" if we don't have at
+   least one symbol with that type, and then xbacktrace could fail.  */
+enum pvec_type gdb_pvec_type = PVEC_TYPE_MASK;
 
 /* Command line args from shell, as list of strings.  */
 Lisp_Object Vcommand_line_args;
@@ -1331,7 +1334,6 @@ main (argc, argv
       syms_of_macfns ();
       syms_of_ccl ();
       syms_of_fontset ();
-      syms_of_keymap ();
       syms_of_macterm ();
       syms_of_macmenu ();
       syms_of_macselect ();
@@ -1586,9 +1588,7 @@ main (argc, argv
 #endif /* CLASH_DETECTION */
       syms_of_indent ();
       syms_of_insdel ();
-#ifndef MAC_OS8
       syms_of_keymap ();
-#endif
       syms_of_macros ();
       syms_of_marker ();
       syms_of_minibuf ();