summaryrefslogtreecommitdiff
path: root/src/print.c
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2001-10-12 22:06:10 +0000
committerStefan Monnier <monnier@iro.umontreal.ca>2001-10-12 22:06:10 +0000
commit8bbfc258014df9552543ea74b770dbdc2b90540e (patch)
tree86b016ef5cfdd47f679072f7879d10c76e931e3a /src/print.c
parentdf1958c4fe88a1f22ba9b65d7ea46c15f581b255 (diff)
downloademacs-8bbfc258014df9552543ea74b770dbdc2b90540e.tar.gz
(Fwith_output_to_temp_buffer): Align with
internal_with_output_to_temp_buffer. (print_preprocess): Use traverse_intervals_noorder. (print_object): Update call to traverse_intervals.
Diffstat (limited to 'src/print.c')
-rw-r--r--src/print.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/print.c b/src/print.c
index 4937660e5e6..6abad4f7c61 100644
--- a/src/print.c
+++ b/src/print.c
@@ -660,15 +660,16 @@ buffer and calling the hook. It gets one argument, the buffer to display.")
GCPRO1(args);
name = Feval (Fcar (args));
- UNGCPRO;
-
CHECK_STRING (name, 0);
temp_output_buffer_setup (XSTRING (name)->data);
buf = Vstandard_output;
+ UNGCPRO;
- val = Fprogn (Fcdr (args));
+ val = Fprogn (XCDR (args));
+ GCPRO1 (val);
temp_output_buffer_show (buf);
+ UNGCPRO;
return unbind_to (count, val);
}
@@ -1247,8 +1248,8 @@ print_preprocess (obj)
{
case Lisp_String:
/* A string may have text properties, which can be circular. */
- traverse_intervals (XSTRING (obj)->intervals, 0, 0,
- print_preprocess_string, Qnil);
+ traverse_intervals_noorder (XSTRING (obj)->intervals,
+ print_preprocess_string, Qnil);
break;
case Lisp_Cons:
@@ -1467,7 +1468,7 @@ print_object (obj, printcharfun, escapeflag)
if (!NULL_INTERVAL_P (XSTRING (obj)->intervals))
{
traverse_intervals (XSTRING (obj)->intervals,
- 0, 0, print_interval, printcharfun);
+ 0, print_interval, printcharfun);
PRINTCHAR (')');
}