/* Lisp object printing and output streams.
Copyright (C) 1985, 1986, 1988, 1993, 1994, 1995, 1997,
1998, 1999, 2000, 2001, 2002, 2003, 2004,
- 2005, 2006 Free Software Foundation, Inc.
+ 2005, 2006, 2007 Free Software Foundation, Inc.
This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
#include "dispextern.h"
#include "termchar.h"
#include "intervals.h"
+#include "blockinput.h"
Lisp_Object Vstandard_output, Qstandard_output;
/* Avoid actual stack overflow in print. */
int print_depth;
-/* Nonzero if inside outputting backquote in old style. */
-int old_backquote_output;
+/* Level of nesting inside outputting backquote in new style. */
+int new_backquote_output;
/* Detect most circularities to print finite output. */
#define PRINT_CIRCLE 200
if (MARKERP (printcharfun)) \
{ \
EMACS_INT marker_pos; \
- if (!(XMARKER (printcharfun)->buffer)) \
+ if (! XMARKER (printcharfun)->buffer) \
error ("Marker does not point anywhere"); \
if (XMARKER (printcharfun)->buffer != current_buffer) \
set_buffer_internal (XMARKER (printcharfun)->buffer); \
SET_PT_BOTH (old_point + (old_point >= start_point \
? PT - start_point : 0), \
old_point_byte + (old_point_byte >= start_point_byte \
- ? PT_BYTE - start_point_byte : 0)); \
+ ? PT_BYTE - start_point_byte : 0)); \
if (old != current_buffer) \
set_buffer_internal (old);
to get the buffer displayed instead of just displaying the non-selected
buffer and calling the hook. It gets one argument, the buffer to display.
-usage: (with-output-to-temp-buffer BUFNAME BODY ...) */)
+usage: (with-output-to-temp-buffer BUFNAME BODY...) */)
(args)
Lisp_Object args;
{
Lisp_Object printcharfun;
/* struct gcpro gcpro1, gcpro2; */
Lisp_Object save_deactivate_mark;
- int count = specpdl_ptr - specpdl;
+ int count = SPECPDL_INDEX ();
struct buffer *previous;
specbind (Qinhibit_modification_hooks, Qt);
print_output_debug_flag = x;
}
-#if defined(GNU_LINUX)
+#if defined (GNU_LINUX)
/* This functionality is not vitally important in general, so we rely on
non-portable ability to use stderr as lvalue. */
Lisp_Object file, append;
{
if (initial_stderr_stream != NULL)
- fclose(stderr);
+ {
+ BLOCK_INPUT;
+ fclose (stderr);
+ UNBLOCK_INPUT;
+ }
stderr = initial_stderr_stream;
initial_stderr_stream = NULL;
{
file = Fexpand_file_name (file, Qnil);
initial_stderr_stream = stderr;
- stderr = fopen(SDATA (file), NILP (append) ? "w" : "a");
+ stderr = fopen (SDATA (file), NILP (append) ? "w" : "a");
if (stderr == NULL)
{
stderr = initial_stderr_stream;
register Lisp_Object printcharfun;
int escapeflag;
{
- old_backquote_output = 0;
+ new_backquote_output = 0;
/* Reset print_number_index and Vprint_number_table only when
the variable Vprint_continuous_numbering is nil. Otherwise,
the values of these variables will be kept between several
print functions. */
- if (NILP (Vprint_continuous_numbering))
+ if (NILP (Vprint_continuous_numbering)
+ || NILP (Vprint_number_table))
{
print_number_index = 0;
Vprint_number_table = Qnil;
print_object (XCAR (XCDR (obj)), printcharfun, escapeflag);
}
else if (print_quoted && CONSP (XCDR (obj)) && NILP (XCDR (XCDR (obj)))
- && ! old_backquote_output
+ && ((EQ (XCAR (obj), Qbackquote))))
+ {
+ print_object (XCAR (obj), printcharfun, 0);
+ new_backquote_output++;
+ print_object (XCAR (XCDR (obj)), printcharfun, escapeflag);
+ new_backquote_output--;
+ }
+ else if (print_quoted && CONSP (XCDR (obj)) && NILP (XCDR (XCDR (obj)))
+ && new_backquote_output
&& ((EQ (XCAR (obj), Qbackquote)
|| EQ (XCAR (obj), Qcomma)
|| EQ (XCAR (obj), Qcomma_at)
|| EQ (XCAR (obj), Qcomma_dot))))
{
print_object (XCAR (obj), printcharfun, 0);
+ new_backquote_output--;
print_object (XCAR (XCDR (obj)), printcharfun, escapeflag);
+ new_backquote_output++;
}
else
{
print_object (Qbackquote, printcharfun, 0);
PRINTCHAR (' ');
- ++old_backquote_output;
print_object (XCAR (XCDR (tem)), printcharfun, 0);
- --old_backquote_output;
PRINTCHAR (')');
obj = XCDR (obj);
/* Do you think this is necessary? */
if (XMARKER (obj)->insertion_type != 0)
strout ("(moves after insertion) ", -1, -1, printcharfun, 0);
- if (!(XMARKER (obj)->buffer))
+ if (! XMARKER (obj)->buffer)
strout ("in no buffer", -1, -1, printcharfun, 0);
else
{
case Lisp_Misc_Overlay:
strout ("#<overlay ", -1, -1, printcharfun, 0);
- if (!(XMARKER (OVERLAY_START (obj))->buffer))
+ if (! XMARKER (OVERLAY_START (obj))->buffer)
strout ("in no buffer", -1, -1, printcharfun, 0);
else
{
case Lisp_Misc_Kboard_Objfwd:
strout ("#<kboard_objfwd to ", -1, -1, printcharfun, 0);
- print_object (*(Lisp_Object *)((char *) current_kboard
- + XKBOARD_OBJFWD (obj)->offset),
+ print_object (*(Lisp_Object *) ((char *) current_kboard
+ + XKBOARD_OBJFWD (obj)->offset),
printcharfun, escapeflag);
PRINTCHAR ('>');
break;
print_object (make_number (interval->position), printcharfun, 1);
PRINTCHAR (' ');
print_object (make_number (interval->position + LENGTH (interval)),
- printcharfun, 1);
+ printcharfun, 1);
PRINTCHAR (' ');
print_object (interval->plist, printcharfun, 1);
}