comparison src/print.c @ 26404:c3c9cc1c2379

Remove USE_TEXT_PROPERTIES.

26403:03830fdf5186

#include "window.h"
#include "process.h"
#include "dispextern.h"
#include "termchar.h"
#include "keyboard.h"

#ifdef USE_TEXT_PROPERTIES
#include "intervals.h"
#endif

Lisp_Object Vstandard_output, Qstandard_output;

Lisp_Object Qtemp_buffer_setup_hook;

}


static void print ();
static void print_preprocess ();
#ifdef USE_TEXT_PROPERTIES
static void print_preprocess_string ();
#endif /* USE_TEXT_PROPERTIES */
static void print_object ();

DEFUN ("terpri", Fterpri, Sterpri, 0, 1, 0,
  "Output a newline to stream PRINTCHARFUN.\n\
If PRINTCHARFUN is omitted or nil, the value of `standard-output' is used.")

	}

      switch (XGCTYPE (obj))
	{
	case Lisp_String:
#ifdef USE_TEXT_PROPERTIES
	  /* A string may have text properties, which can be circular.  */
	  traverse_intervals (XSTRING (obj)->intervals, 0, 0,
			      print_preprocess_string, Qnil);
#endif /* USE_TEXT_PROPERTIES */
	  break;

	case Lisp_Cons:
	  print_preprocess (XCAR (obj));
	  obj = XCDR (obj);

	    print_preprocess (XVECTOR (obj)->contents[i]);
	}
    }
}

#ifdef USE_TEXT_PROPERTIES
static void
print_preprocess_string (interval, arg)
     INTERVAL interval;
     Lisp_Object arg;
{
  print_preprocess (interval->plist);
}
#endif /* USE_TEXT_PROPERTIES */

static void
print_object (obj, printcharfun, escapeflag)
     Lisp_Object obj;
     register Lisp_Object printcharfun;

	     cannot be taken as part of a hex character escape.  */
	  int need_nonhex = 0;

	  GCPRO1 (obj);

#ifdef USE_TEXT_PROPERTIES
	  if (!NULL_INTERVAL_P (XSTRING (obj)->intervals))
	    {
	      PRINTCHAR ('#');
	      PRINTCHAR ('(');
	    }
#endif

	  PRINTCHAR ('\"');
	  str = XSTRING (obj)->data;
	  size_byte = STRING_BYTES (XSTRING (obj));

		  PRINTCHAR (c);
		}
	    }
	  PRINTCHAR ('\"');

#ifdef USE_TEXT_PROPERTIES
	  if (!NULL_INTERVAL_P (XSTRING (obj)->intervals))
	    {
	      traverse_intervals (XSTRING (obj)->intervals,
				  0, 0, print_interval, printcharfun);
	      PRINTCHAR (')');
	    }
#endif

	  UNGCPRO;
	}
      break;

    }

  print_depth--;
}

#ifdef USE_TEXT_PROPERTIES

/* Print a description of INTERVAL using PRINTCHARFUN.
   This is part of printing a string that has text properties.  */

void

	 printcharfun, 1);
  PRINTCHAR (' ');
  print_object (interval->plist, printcharfun, 1);
}

#endif /* USE_TEXT_PROPERTIES */

void
syms_of_print ()
{
  Qtemp_buffer_setup_hook = intern ("temp-buffer-setup-hook");

26404:c3c9cc1c2379

#include "window.h"
#include "process.h"
#include "dispextern.h"
#include "termchar.h"
#include "keyboard.h"
#include "intervals.h"

Lisp_Object Vstandard_output, Qstandard_output;

Lisp_Object Qtemp_buffer_setup_hook;

}


static void print ();
static void print_preprocess ();
static void print_preprocess_string ();
static void print_object ();

DEFUN ("terpri", Fterpri, Sterpri, 0, 1, 0,
  "Output a newline to stream PRINTCHARFUN.\n\
If PRINTCHARFUN is omitted or nil, the value of `standard-output' is used.")

	}

      switch (XGCTYPE (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);
	  break;

	case Lisp_Cons:
	  print_preprocess (XCAR (obj));
	  obj = XCDR (obj);

	    print_preprocess (XVECTOR (obj)->contents[i]);
	}
    }
}

static void
print_preprocess_string (interval, arg)
     INTERVAL interval;
     Lisp_Object arg;
{
  print_preprocess (interval->plist);
}

static void
print_object (obj, printcharfun, escapeflag)
     Lisp_Object obj;
     register Lisp_Object printcharfun;

	     cannot be taken as part of a hex character escape.  */
	  int need_nonhex = 0;

	  GCPRO1 (obj);

	  if (!NULL_INTERVAL_P (XSTRING (obj)->intervals))
	    {
	      PRINTCHAR ('#');
	      PRINTCHAR ('(');
	    }

	  PRINTCHAR ('\"');
	  str = XSTRING (obj)->data;
	  size_byte = STRING_BYTES (XSTRING (obj));

		  PRINTCHAR (c);
		}
	    }
	  PRINTCHAR ('\"');

	  if (!NULL_INTERVAL_P (XSTRING (obj)->intervals))
	    {
	      traverse_intervals (XSTRING (obj)->intervals,
				  0, 0, print_interval, printcharfun);
	      PRINTCHAR (')');
	    }

	  UNGCPRO;
	}
      break;

    }

  print_depth--;
}


/* Print a description of INTERVAL using PRINTCHARFUN.
   This is part of printing a string that has text properties.  */

void

	 printcharfun, 1);
  PRINTCHAR (' ');
  print_object (interval->plist, printcharfun, 1);
}


void
syms_of_print ()
{
  Qtemp_buffer_setup_hook = intern ("temp-buffer-setup-hook");