[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r112093: * print.c (syms_of_print): I
From: |
Dmitry Antipov |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r112093: * print.c (syms_of_print): Initialize debugging output not here... |
Date: |
Tue, 19 Mar 2013 18:09:05 +0400 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 112093
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Tue 2013-03-19 18:09:05 +0400
message:
* print.c (syms_of_print): Initialize debugging output not here...
(init_print_once): ...but in a new function here.
* lisp.h (init_print_once): Add prototype.
* emacs.c (main): Add call to init_print_once. Adjust comments.
modified:
src/ChangeLog
src/emacs.c
src/lisp.h
src/print.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-03-19 09:21:31 +0000
+++ b/src/ChangeLog 2013-03-19 14:09:05 +0000
@@ -4,6 +4,10 @@
Signal error if window is not internal. Adjust docstring.
(delete_all_child_windows): Use combination_limit to save the buffer.
(Fset_window_configuration): Adjust accordingly.
+ * print.c (syms_of_print): Initialize debugging output not here...
+ (init_print_once): ...but in a new function here.
+ * lisp.h (init_print_once): Add prototype.
+ * emacs.c (main): Add call to init_print_once. Adjust comments.
2013-03-18 Dmitry Antipov <address@hidden>
=== modified file 'src/emacs.c'
--- a/src/emacs.c 2013-03-13 19:28:50 +0000
+++ b/src/emacs.c 2013-03-19 14:09:05 +0000
@@ -1080,7 +1080,7 @@
noninteractive1 = noninteractive;
-/* Perform basic initializations (not merely interning symbols). */
+ /* Perform basic initializations (not merely interning symbols). */
if (!initialized)
{
@@ -1091,8 +1091,7 @@
init_coding_once ();
init_syntax_once (); /* Create standard syntax table. */
init_category_once (); /* Create standard category table. */
- /* Must be done before init_buffer. */
- init_casetab_once ();
+ init_casetab_once (); /* Must be done before init_buffer_once. */
init_buffer_once (); /* Create buffer table and some buffers. */
init_minibuf_once (); /* Create list of minibuffers. */
/* Must precede init_window_once. */
@@ -1117,6 +1116,8 @@
syms_of_fileio ();
/* Before syms_of_coding to initialize Vgc_cons_threshold. */
syms_of_alloc ();
+ /* May call Ffuncall and so GC, thus the latter should be initialized.
*/
+ init_print_once ();
/* Before syms_of_coding because it initializes Qcharsetp. */
syms_of_charset ();
/* Before init_window_once, because it sets up the
=== modified file 'src/lisp.h'
--- a/src/lisp.h 2013-03-15 16:03:54 +0000
+++ b/src/lisp.h 2013-03-19 14:09:05 +0000
@@ -3163,6 +3163,7 @@
(const char *, Lisp_Object (*) (Lisp_Object), Lisp_Object);
enum FLOAT_TO_STRING_BUFSIZE { FLOAT_TO_STRING_BUFSIZE = 350 };
extern int float_to_string (char *, double);
+extern void init_print_once (void);
extern void syms_of_print (void);
/* Defined in doprnt.c. */
=== modified file 'src/print.c'
--- a/src/print.c 2013-03-08 02:32:21 +0000
+++ b/src/print.c 2013-03-19 14:09:05 +0000
@@ -2165,7 +2165,16 @@
print_object (interval->plist, printcharfun, 1);
}
-
+/* Initialize debug_print stuff early to have it working from the very
+ beginning. */
+
+void
+init_print_once (void)
+{
+ DEFSYM (Qexternal_debugging_output, "external-debugging-output");
+ defsubr (&Sexternal_debugging_output);
+}
+
void
syms_of_print (void)
{
@@ -2297,12 +2306,10 @@
defsubr (&Sprint);
defsubr (&Sterpri);
defsubr (&Swrite_char);
- defsubr (&Sexternal_debugging_output);
#ifdef WITH_REDIRECT_DEBUGGING_OUTPUT
defsubr (&Sredirect_debugging_output);
#endif
- DEFSYM (Qexternal_debugging_output, "external-debugging-output");
DEFSYM (Qprint_escape_newlines, "print-escape-newlines");
DEFSYM (Qprint_escape_multibyte, "print-escape-multibyte");
DEFSYM (Qprint_escape_nonascii, "print-escape-nonascii");
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r112093: * print.c (syms_of_print): Initialize debugging output not here...,
Dmitry Antipov <=