comparison src/emacs.c @ 280:7df0dd720c89 r21-0b38

Import from CVS: tag r21-0b38
author cvs
date Mon, 13 Aug 2007 10:32:22 +0200
parents 90d73dddcdc4
children c42ec1d1cded
comparison
equal deleted inserted replaced
279:c20b2fb5bb0a 280:7df0dd720c89
129 /* The directory name in which to find subdirs such as lisp and etc. 129 /* The directory name in which to find subdirs such as lisp and etc.
130 nil means get them only from PATH_LOADSEARCH. */ 130 nil means get them only from PATH_LOADSEARCH. */
131 Lisp_Object Vinstallation_directory; 131 Lisp_Object Vinstallation_directory;
132 #endif 132 #endif
133 133
134 Lisp_Object Vemacs_program_name, Vemacs_program_version;
134 Lisp_Object Vexec_path; 135 Lisp_Object Vexec_path;
135 Lisp_Object Vexec_directory, Vconfigure_exec_directory; 136 Lisp_Object Vexec_directory, Vconfigure_exec_directory;
136 Lisp_Object Vlisp_directory, Vconfigure_lisp_directory; 137 Lisp_Object Vlisp_directory, Vconfigure_lisp_directory;
137 Lisp_Object Vconfigure_package_path; 138 Lisp_Object Vconfigure_package_path;
138 Lisp_Object Vdata_directory, Vconfigure_data_directory; 139 Lisp_Object Vdata_directory, Vconfigure_data_directory;
237 /* If fatal error occurs in code below, avoid infinite recursion. */ 238 /* If fatal error occurs in code below, avoid infinite recursion. */
238 if (! fatal_error_in_progress) 239 if (! fatal_error_in_progress)
239 { 240 {
240 fatal_error_in_progress = dont_check_for_quit = 1; 241 fatal_error_in_progress = dont_check_for_quit = 1;
241 shut_down_emacs (sig, Qnil); 242 shut_down_emacs (sig, Qnil);
242 stderr_out("\nLisp backtrace follows:\n\n"); 243 stderr_out ("\nLisp backtrace follows:\n\n");
243 Fbacktrace(Qexternal_debugging_output, Qt); 244 Fbacktrace (Qexternal_debugging_output, Qt);
244 # if 0 /* This is evil, rarely useful, and causes grief in some cases. */ 245 # if 0 /* This is evil, rarely useful, and causes grief in some cases. */
245 /* Check for Sun-style stack printing via /proc */ 246 /* Check for Sun-style stack printing via /proc */
246 { 247 {
247 CONST char *pstack = "/usr/proc/bin/pstack"; 248 CONST char *pstack = "/usr/proc/bin/pstack";
248 if (access(pstack, X_OK) == 0) 249 if (access (pstack, X_OK) == 0)
249 { 250 {
250 char buf[100]; 251 char buf[100];
251 stderr_out("\nC backtrace follows:\n" 252 stderr_out ("\nC backtrace follows:\n"
252 "(A real debugger may provide better information)\n\n"); 253 "(A real debugger may provide better information)\n\n");
253 sprintf(buf, "%s %d >&2", pstack, (int)getpid()); 254 sprintf (buf, "%s %d >&2", pstack, (int)getpid());
254 system(buf); 255 system (buf);
255 } 256 }
256 } 257 }
257 # endif 258 # endif
258 } 259 }
259 /* Signal the same code; this time it will really be fatal. */ 260 /* Signal the same code; this time it will really be fatal. */
901 syms_of_fns (); 902 syms_of_fns ();
902 syms_of_font_lock (); 903 syms_of_font_lock ();
903 syms_of_frame (); 904 syms_of_frame ();
904 syms_of_general (); 905 syms_of_general ();
905 syms_of_glyphs (); 906 syms_of_glyphs ();
906 syms_of_glyphs_read (); 907 syms_of_glyphs_eimage ();
907 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS) 908 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS)
908 syms_of_gui (); 909 syms_of_gui ();
909 #endif 910 #endif
910 syms_of_indent (); 911 syms_of_indent ();
911 syms_of_intl (); 912 syms_of_intl ();
1147 1148
1148 For any given image instantiator format, the first macro must be 1149 For any given image instantiator format, the first macro must be
1149 called before the any calls to the other macros. */ 1150 called before the any calls to the other macros. */
1150 1151
1151 image_instantiator_format_create (); 1152 image_instantiator_format_create ();
1152 image_instantiator_format_create_glyphs_read (); 1153 image_instantiator_format_create_glyphs_eimage ();
1153 #ifdef HAVE_X_WINDOWS 1154 #ifdef HAVE_X_WINDOWS
1154 image_instantiator_format_create_glyphs_x (); 1155 image_instantiator_format_create_glyphs_x ();
1155 #endif /* HAVE_X_WINDOWS */ 1156 #endif /* HAVE_X_WINDOWS */
1156 #ifdef HAVE_MS_WINDOWS 1157 #ifdef HAVE_MS_WINDOWS
1157 image_instantiator_format_create_glyphs_mswindows (); 1158 image_instantiator_format_create_glyphs_mswindows ();
1266 #endif 1267 #endif
1267 vars_of_floatfns (); 1268 vars_of_floatfns ();
1268 vars_of_font_lock (); 1269 vars_of_font_lock ();
1269 vars_of_frame (); 1270 vars_of_frame ();
1270 vars_of_glyphs (); 1271 vars_of_glyphs ();
1271 vars_of_glyphs_read (); 1272 vars_of_glyphs_eimage ();
1272 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS) 1273 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS)
1273 vars_of_gui (); 1274 vars_of_gui ();
1274 #endif 1275 #endif
1275 vars_of_indent (); 1276 vars_of_indent ();
1276 vars_of_insdel (); 1277 vars_of_insdel ();
2527 #endif 2528 #endif
2528 } 2529 }
2529 #endif /* USE_ASSERTIONS */ 2530 #endif /* USE_ASSERTIONS */
2530 2531
2531 #ifdef QUANTIFY 2532 #ifdef QUANTIFY
2532 DEFUN ("quantify-start-recording-data", 2533 DEFUN ("quantify-start-recording-data", Fquantify_start_recording_data,
2533 Fquantify_start_recording_data, 0, 0, 0, /* 2534 0, 0, 0, /*
2534 Start recording Quantify data. 2535 Start recording Quantify data.
2535 */ 2536 */
2536 ()) 2537 ())
2537 { 2538 {
2538 quantify_start_recording_data (); 2539 quantify_start_recording_data ();
2539 return Qnil; 2540 return Qnil;
2540 } 2541 }
2541 2542
2542 DEFUN ("quantify-stop-recording-data", 2543 DEFUN ("quantify-stop-recording-data", Fquantify_stop_recording_data,
2543 Fquantify_stop_recording_data, 0, 0, 0, /* 2544 0, 0, 0, /*
2544 Stop recording Quantify data. 2545 Stop recording Quantify data.
2545 */ 2546 */
2546 ()) 2547 ())
2547 { 2548 {
2548 quantify_stop_recording_data (); 2549 quantify_stop_recording_data ();
2770 } 2771 }
2771 2772
2772 void 2773 void
2773 complex_vars_of_emacs (void) 2774 complex_vars_of_emacs (void)
2774 { 2775 {
2776 /* This is all related to path searching. */
2777
2778 DEFVAR_LISP ("emacs-program-name", &Vemacs_program_name /*
2779 *Name of the Emacs variant.
2780 For example, this may be \"xemacs\" or \"infodock\".
2781 This is mainly meant for use in path searching.
2782 */ );
2783 Vemacs_program_name = build_string ((char *) PATH_PROGNAME);
2784
2785 DEFVAR_LISP ("emacs-program-version", &Vemacs_program_version /*
2786 *Version of the Emacs variant.
2787 This typically has the form XX.XX[-bXX].
2788 This is mainly meant for use in path searching.
2789 */ );
2790 Vemacs_program_version = build_string ((char *) PATH_VERSION);
2791
2775 DEFVAR_LISP ("exec-path", &Vexec_path /* 2792 DEFVAR_LISP ("exec-path", &Vexec_path /*
2776 *List of directories to search programs to run in subprocesses. 2793 *List of directories to search programs to run in subprocesses.
2777 Each element is a string (directory name) or nil (try default directory). 2794 Each element is a string (directory name) or nil (try default directory).
2778 */ ); 2795 */ );
2779 Vexec_path = Qnil; 2796 Vexec_path = Qnil;