comparison src/emacs.c @ 826:6728e641994e

[xemacs-hg @ 2002-05-05 11:30:15 by ben] syntax cache, 8-bit-format, lots of code cleanup README.packages: Update info about --package-path. i.c: Create an inheritable event and pass it on to XEmacs, so that ^C can be handled properly. Intercept ^C and signal the event. "Stop Build" in VC++ now works. bytecomp-runtime.el: Doc string changes. compat.el: Some attempts to redo this to make it truly useful and fix the "multiple versions interacting with each other" problem. Not yet done. Currently doesn't work. files.el: Use with-obsolete-variable to avoid warnings in new revert-buffer code. xemacs.mak: Split up CFLAGS into a version without flags specifying the C library. The problem seems to be that minitar depends on zlib, which depends specifically on libc.lib, not on any of the other C libraries. Unless you compile with libc.lib, you get errors -- specifically, no _errno in the other libraries, which must make it something other than an int. (#### But this doesn't seem to obtain in XEmacs, which also uses zlib, and can be linked with any of the C libraries. Maybe zlib is used differently and doesn't need errno, or maybe XEmacs provides an int errno; ... I don't understand. Makefile.in.in: Fix so that packages are around when testing. abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, callint.c, casefiddle.c, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, cmds.c, console-msw.h, console-stream.c, console-x.c, console.c, console.h, data.c, device-msw.c, device.c, device.h, dialog-msw.c, dialog-x.c, dired-msw.c, dired.c, doc.c, doprnt.c, dumper.c, editfns.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, events.h, extents.c, extents.h, faces.c, file-coding.c, file-coding.h, fileio.c, fns.c, font-lock.c, frame-gtk.c, frame-msw.c, frame-x.c, frame.c, frame.h, glade.c, glyphs-gtk.c, glyphs-msw.c, glyphs-msw.h, glyphs-x.c, glyphs.c, glyphs.h, gui-msw.c, gui-x.c, gui.h, gutter.h, hash.h, indent.c, insdel.c, intl-win32.c, intl.c, keymap.c, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, marker.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-ccl.c, mule-charset.c, mule-coding.c, mule-wnnfns.c, nas.c, objects-msw.c, objects-x.c, opaque.c, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, process.h, profile.c, rangetab.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-x.c, redisplay.c, redisplay.h, regex.c, regex.h, scrollbar-msw.c, search.c, select-x.c, specifier.c, specifier.h, symbols.c, symsinit.h, syntax.c, syntax.h, syswindows.h, tests.c, text.c, text.h, tooltalk.c, ui-byhand.c, ui-gtk.c, unicode.c, win32.c, window.c: Another big Ben patch. -- FUNCTIONALITY CHANGES: add partial support for 8-bit-fixed, 16-bit-fixed, and 32-bit-fixed formats. not quite done yet. (in particular, needs functions to actually convert the buffer.) NOTE: lots of changes to regex.c here. also, many new *_fmt() inline funs that take an Internal_Format argument. redo syntax cache code. make the cache per-buffer; keep the cache valid across calls to functions that use it. also keep it valid across insertions/deletions and extent changes, as much as is possible. eliminate the junky regex-reentrancy code by passing in the relevant lisp info to the regex routines as local vars. add general mechanism in extents code for signalling extent changes. fix numerous problems with the case-table implementation; yoshiki never properly transferred many algorithms from old-style to new-style case tables. redo char tables to support a default argument, so that mapping only occurs over changed args. change many chartab functions to accept Lisp_Object instead of Lisp_Char_Table *. comment out the code in font-lock.c by default, because font-lock.el no longer uses it. we should consider eliminating it entirely. Don't output bell as ^G in console-stream when not a TTY. add -mswindows-termination-handle to interface with i.c, so we can properly kill a build. add more error-checking to buffer/string macros. add some additional buffer_or_string_() funs. -- INTERFACE CHANGES AFFECTING MORE CODE: switch the arguments of write_c_string and friends to be consistent with write_fmt_string, which must have printcharfun first. change BI_* macros to BYTE_* for increased clarity; similarly for bi_* local vars. change VOID_TO_LISP to be a one-argument function. eliminate no-longer-needed CVOID_TO_LISP. -- char/string macro changes: rename MAKE_CHAR() to make_emchar() for slightly less confusion with make_char(). (The former generates an Emchar, the latter a Lisp object. Conceivably we should rename make_char() -> wrap_char() and similarly for make_int(), make_float().) Similar changes for other *CHAR* macros -- we now consistently use names with `emchar' whenever we are working with Emchars. Any remaining name with just `char' always refers to a Lisp object. rename macros with XSTRING_* to string_* except for those that reference actual fields in the Lisp_String object, following conventions used elsewhere. rename set_string_{data,length} macros (the only ones to work with a Lisp_String_* instead of a Lisp_Object) to set_lispstringp_* to make the difference clear. try to be consistent about caps vs. lowercase in macro/inline-fun names for chars and such, which wasn't the case before. we now reserve caps either for XFOO_ macros that reference object fields (e.g. XSTRING_DATA) or for things that have non-function semantics, e.g. directly modifying an arg (BREAKUP_EMCHAR) or evaluating an arg (any arg) more than once. otherwise, use lowercase. here is a summary of most of the macros/inline funs changed by all of the above changes: BYTE_*_P -> byte_*_p XSTRING_BYTE -> string_byte set_string_data/length -> set_lispstringp_data/length XSTRING_CHAR_LENGTH -> string_char_length XSTRING_CHAR -> string_emchar INTBYTE_FIRST_BYTE_P -> intbyte_first_byte_p INTBYTE_LEADING_BYTE_P -> intbyte_leading_byte_p charptr_copy_char -> charptr_copy_emchar LEADING_BYTE_* -> leading_byte_* CHAR_* -> EMCHAR_* *_CHAR_* -> *_EMCHAR_* *_CHAR -> *_EMCHAR CHARSET_BY_ -> charset_by_* BYTE_SHIFT_JIS* -> byte_shift_jis* BYTE_BIG5* -> byte_big5* REP_BYTES_BY_FIRST_BYTE -> rep_bytes_by_first_byte char_to_unicode -> emchar_to_unicode valid_char_p -> valid_emchar_p Change intbyte_strcmp -> qxestrcmp_c (duplicated functionality). -- INTERFACE CHANGES AFFECTING LESS CODE: use DECLARE_INLINE_HEADER in various places. remove '#ifdef emacs' from XEmacs-only files. eliminate CHAR_TABLE_VALUE(), which duplicated the functionality of get_char_table(). add BUFFER_TEXT_LOOP to simplify iterations over buffer text. define typedefs for signed and unsigned types of fixed sizes (INT_32_BIT, UINT_32_BIT, etc.). create ALIGN_FOR_TYPE as a higher-level interface onto ALIGN_SIZE; fix code to use it. add charptr_emchar_len to return the text length of the character pointed to by a ptr; use it in place of charcount_to_bytecount(..., 1). add emchar_len to return the text length of a given character. add types Bytexpos and Charxpos to generalize Bytebpos/Bytecount and Charbpos/Charcount, in code (particularly, the extents code and redisplay code) that works with either kind of index. rename redisplay struct params with names such as `charbpos' to e.g. `charpos' when they are e.g. a Charxpos, not a Charbpos. eliminate xxDEFUN in place of DEFUN; no longer necessary with changes awhile back to doc.c. split up big ugly combined list of EXFUNs in lisp.h on a file-by-file basis, since other prototypes are similarly split. rewrite some "*_UNSAFE" macros as inline funs and eliminate the _UNSAFE suffix. move most string code from lisp.h to text.h; the string code and text.h code is now intertwined in such a fashion that they need to be in the same place and partially interleaved. (you can't create forward references for inline funs) automated/lisp-tests.el, automated/symbol-tests.el, automated/test-harness.el: Fix test harness to output FAIL messages to stderr when in batch mode. Fix up some problems in lisp-tests/symbol-tests that were causing spurious failures.
author ben
date Sun, 05 May 2002 11:33:57 +0000
parents 6504113e7c2d
children bf645ed7cfe3
comparison
equal deleted inserted replaced
825:eb3bc15a6e0f 826:6728e641994e
128 version 21.5.1 "anise" released May 9, 2001. 128 version 21.5.1 "anise" released May 9, 2001.
129 version 21.5.2 "artichoke" released July 28, 2001. 129 version 21.5.2 "artichoke" released July 28, 2001.
130 version 21.5.3 "asparagus" released September 7, 2001. 130 version 21.5.3 "asparagus" released September 7, 2001.
131 version 21.5.4 "bamboo" released January 8, 2002. 131 version 21.5.4 "bamboo" released January 8, 2002.
132 version 21.5.5 "beets" released March 5, 2002. 132 version 21.5.5 "beets" released March 5, 2002.
133 133 version 21.5.6 "bok choi" released April 5, 2002.
134 134
135 135
136 -- A time line for GNU Emacs version 19 is 136 -- A time line for GNU Emacs version 19 is
137 137
138 version 19.7 (beta) (first beta release) released ??????; prob. late May 1993. 138 version 19.7 (beta) (first beta release) released ??????; prob. late May 1993.
278 #endif 278 #endif
279 279
280 /* For PATH_EXEC */ 280 /* For PATH_EXEC */
281 #include <paths.h> 281 #include <paths.h>
282 282
283 #if defined (HEAP_IN_DATA) && !defined(PDUMP) 283 #if defined (HEAP_IN_DATA) && !defined (PDUMP)
284 void report_sheap_usage (int die_if_pure_storage_exceeded); 284 void report_sheap_usage (int die_if_pure_storage_exceeded);
285 #endif 285 #endif
286 286
287 #if !defined (SYSTEM_MALLOC) && !defined (DOUG_LEA_MALLOC) 287 #if !defined (SYSTEM_MALLOC) && !defined (DOUG_LEA_MALLOC)
288 extern void *(*__malloc_hook)(size_t); 288 extern void *(*__malloc_hook)(size_t);
491 static int run_temacs_argv_size; 491 static int run_temacs_argv_size;
492 static int run_temacs_args_size; 492 static int run_temacs_args_size;
493 493
494 #ifdef _MSC_VER 494 #ifdef _MSC_VER
495 static DWORD mswindows_handle_hardware_exceptions (DWORD code); 495 static DWORD mswindows_handle_hardware_exceptions (DWORD code);
496 #endif
497
498 #ifdef WIN32_NATIVE
499 static DWORD CALLBACK wait_for_termination_signal (LPVOID handle);
496 #endif 500 #endif
497 501
498 502
499 /************************************************************************/ 503 /************************************************************************/
500 /* Functions to handle arguments */ 504 /* Functions to handle arguments */
875 #endif 879 #endif
876 noninteractive = 1; 880 noninteractive = 1;
877 } 881 }
878 882
879 #ifdef WIN32_NATIVE 883 #ifdef WIN32_NATIVE
884 {
885 /* Since we aren't a console application, we can't easily be terminated
886 using ^C. (We aren't a console application to avoid Windows from
887 automatically and unwantedly creating a console window for us. If
888 only the Windows designers had some sense in them and didn't create
889 this artificial console/non-console distinction!) Therefore, we set
890 up a communication path with i.exe so that when a ^C is sent to it
891 (using GenerateConsoleCtrlEvent), it in turn signals us to commit
892 suicide. (This is cleaner than using TerminateProcess()). This
893 makes (e.g.) the "Stop Build" command from VC++ correctly terminate
894 XEmacs. */
895
896 char *heventstr;
897 if (argmatch (argv, argc, "-mswindows-termination-handle", 0, 0,
898 &heventstr, &skip_args))
899 {
900 HANDLE hevent = (HANDLE) atol (heventstr);
901 DWORD unused;
902 HANDLE h_thread = CreateThread (NULL, 0, wait_for_termination_signal,
903 (void *) hevent, 0, &unused);
904 CloseHandle (h_thread);
905 }
906 }
907
880 /* Handle the -nuni switch, which forces XEmacs to use the ANSI 908 /* Handle the -nuni switch, which forces XEmacs to use the ANSI
881 versions of Unicode-split API's even on Windows NT, which has 909 versions of Unicode-split API's even on Windows NT, which has
882 full Unicode support. This helps flush out problems in the code 910 full Unicode support. This helps flush out problems in the code
883 we've written to convert between ANSI and Unicode. */ 911 we've written to convert between ANSI and Unicode. */
884 if (argmatch (argv, argc, "-nuni", "--no-unicode-lib-calls", 0, NULL, 912 if (argmatch (argv, argc, "-nuni", "--no-unicode-lib-calls", 0, NULL,
1202 #ifdef CLASH_DETECTION 1230 #ifdef CLASH_DETECTION
1203 syms_of_filelock (); 1231 syms_of_filelock ();
1204 #endif /* CLASH_DETECTION */ 1232 #endif /* CLASH_DETECTION */
1205 syms_of_floatfns (); 1233 syms_of_floatfns ();
1206 syms_of_fns (); 1234 syms_of_fns ();
1235 #ifdef USE_C_FONT_LOCK
1207 syms_of_font_lock (); 1236 syms_of_font_lock ();
1237 #endif /* USE_C_FONT_LOCK */
1208 syms_of_frame (); 1238 syms_of_frame ();
1209 syms_of_general (); 1239 syms_of_general ();
1210 syms_of_glyphs (); 1240 syms_of_glyphs ();
1211 syms_of_glyphs_eimage (); 1241 syms_of_glyphs_eimage ();
1212 syms_of_glyphs_shared (); 1242 syms_of_glyphs_shared ();
1705 #ifdef CLASH_DETECTION 1735 #ifdef CLASH_DETECTION
1706 vars_of_filelock (); 1736 vars_of_filelock ();
1707 #endif 1737 #endif
1708 vars_of_floatfns (); 1738 vars_of_floatfns ();
1709 vars_of_fns (); 1739 vars_of_fns ();
1740 #ifdef USE_C_FONT_LOCK
1710 vars_of_font_lock (); 1741 vars_of_font_lock ();
1742 #endif /* USE_C_FONT_LOCK */
1711 vars_of_frame (); 1743 vars_of_frame ();
1712 vars_of_glyphs (); 1744 vars_of_glyphs ();
1713 vars_of_glyphs_eimage (); 1745 vars_of_glyphs_eimage ();
1714 vars_of_glyphs_widget (); 1746 vars_of_glyphs_widget ();
1715 vars_of_gui (); 1747 vars_of_gui ();
1977 2009
1978 /* This calls Fcopy_category_table() under Mule, which calls who 2010 /* This calls Fcopy_category_table() under Mule, which calls who
1979 knows what. */ 2011 knows what. */
1980 complex_vars_of_chartab (); 2012 complex_vars_of_chartab ();
1981 2013
1982 /* This calls set_string_char(), which (under Mule) depends on the 2014 /* This calls Fput_char_table(), which (under Mule) depends on the
1983 charsets being initialized. */ 2015 charsets being initialized. */
1984 complex_vars_of_casetab (); 2016 complex_vars_of_casetab ();
1985 2017
1986 /* This calls Fcopy_syntax_table(), which relies on char tables. */ 2018 /* This calls Fcopy_syntax_table(), which relies on char tables. */
1987 complex_vars_of_syntax (); 2019 complex_vars_of_syntax ();
2092 reinit_vars_of_event_stream (); 2124 reinit_vars_of_event_stream ();
2093 reinit_vars_of_events (); 2125 reinit_vars_of_events ();
2094 reinit_vars_of_extents (); 2126 reinit_vars_of_extents ();
2095 reinit_vars_of_file_coding (); 2127 reinit_vars_of_file_coding ();
2096 reinit_vars_of_fileio (); 2128 reinit_vars_of_fileio ();
2129 #ifdef USE_C_FONT_LOCK
2097 reinit_vars_of_font_lock (); 2130 reinit_vars_of_font_lock ();
2131 #endif /* USE_C_FONT_LOCK */
2098 reinit_vars_of_glyphs (); 2132 reinit_vars_of_glyphs ();
2099 reinit_vars_of_glyphs_widget (); 2133 reinit_vars_of_glyphs_widget ();
2100 reinit_vars_of_insdel (); 2134 reinit_vars_of_insdel ();
2101 reinit_vars_of_lread (); 2135 reinit_vars_of_lread ();
2102 reinit_vars_of_lstream (); 2136 reinit_vars_of_lstream ();
2339 in the order mentioned in main_1. */ 2373 in the order mentioned in main_1. */
2340 { "-sd", "--show-dump-id", 105, 0 }, 2374 { "-sd", "--show-dump-id", 105, 0 },
2341 { "-t", "--terminal", 100, 1 }, 2375 { "-t", "--terminal", 100, 1 },
2342 { "-nd", "--no-dump-file", 95, 0 }, 2376 { "-nd", "--no-dump-file", 95, 0 },
2343 { "-nw", "--no-windows", 90, 0 }, 2377 { "-nw", "--no-windows", 90, 0 },
2344 { "-batch", "--batch", 85, 0 }, 2378 { "-batch", "--batch", 88, 0 },
2345 #ifdef WIN32_NATIVE 2379 #ifdef WIN32_NATIVE
2380 { "-mswindows-termination-handle", 0, 84, 1 },
2346 { "-nuni", "--no-unicode-lib-calls", 83, 0 }, 2381 { "-nuni", "--no-unicode-lib-calls", 83, 0 },
2347 #endif /* WIN32_NATIVE */ 2382 #endif /* WIN32_NATIVE */
2348 { "-debug-paths", "--debug-paths", 82, 0 }, 2383 { "-debug-paths", "--debug-paths", 82, 0 },
2349 { "-no-packages", "--no-packages", 81, 0 }, 2384 { "-no-packages", "--no-packages", 81, 0 },
2350 { "-no-early-packages", "--no-early-packages", 80, 0 }, 2385 { "-no-early-packages", "--no-early-packages", 80, 0 },
3058 (build_msg_string ("Messages outputted. XEmacs is exiting."), 3093 (build_msg_string ("Messages outputted. XEmacs is exiting."),
3059 Qnil, Qnil); 3094 Qnil, Qnil);
3060 } 3095 }
3061 #endif 3096 #endif
3062 3097
3098 #ifdef WIN32_NATIVE
3099
3100 static DWORD CALLBACK
3101 wait_for_termination_signal (LPVOID handle)
3102 {
3103 HANDLE hevent = (HANDLE) handle;
3104 WaitForSingleObject (hevent, INFINITE);
3105 ExitProcess (0);
3106 return 0; /* not reached */
3107 }
3108
3109 #endif
3063 /* -------------------------------- */ 3110 /* -------------------------------- */
3064 /* a (more-or-less) normal shutdown */ 3111 /* a (more-or-less) normal shutdown */
3065 /* -------------------------------- */ 3112 /* -------------------------------- */
3066 3113
3067 /* Perform an orderly shutdown of XEmacs. Autosave any modified 3114 /* Perform an orderly shutdown of XEmacs. Autosave any modified