Commit 1cf21850 authored by Lute Kamstra's avatar Lute Kamstra
Browse files

(PRINTPREPARE): Check if the marker PRINTCHARFUN is within the

accessible part of the buffer.
parent 2a9e192d
2005-04-09 Lute Kamstra <lute@gnu.org>
* print.c (PRINTPREPARE): Check if the marker PRINTCHARFUN is
within the accessible part of the buffer.
2005-04-09 Kim F. Storm <storm@cua.dk> 2005-04-09 Kim F. Storm <storm@cua.dk>
   
* lread.c (readevalloop): Add args START and END as region in * lread.c (readevalloop): Add args START and END as region in
...@@ -41,8 +46,8 @@ ...@@ -41,8 +46,8 @@
   
2005-04-01 Kenichi Handa <handa@m17n.org> 2005-04-01 Kenichi Handa <handa@m17n.org>
   
* lisp.h (Vascii_upcase_table, Vascii_canon_table, * lisp.h (Vascii_upcase_table, Vascii_canon_table)
Vascii_eqv_table): Extern them. (Vascii_eqv_table): Extern them.
   
* casetab.c (set_case_table): If standard is nonzero, setup * casetab.c (set_case_table): If standard is nonzero, setup
Vascii_upcase_table, Vascii_canon_table, and Vascii_eqv_table. Vascii_upcase_table, Vascii_canon_table, and Vascii_eqv_table.
......
/* Lisp object printing and output streams. /* Lisp object printing and output streams.
Copyright (C) 1985, 86, 88, 93, 94, 95, 97, 98, 1999, 2000, 01, 03, 2004 Copyright (C) 1985, 1986, 1988, 1993, 1994, 1995, 1997, 1998, 1999,
Free Software Foundation, Inc. 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Emacs. This file is part of GNU Emacs.
...@@ -211,13 +211,17 @@ void print_interval (); ...@@ -211,13 +211,17 @@ void print_interval ();
} \ } \
if (MARKERP (printcharfun)) \ if (MARKERP (printcharfun)) \
{ \ { \
if (!(XMARKER (original)->buffer)) \ EMACS_INT marker_pos; \
if (!(XMARKER (printcharfun)->buffer)) \
error ("Marker does not point anywhere"); \ error ("Marker does not point anywhere"); \
if (XMARKER (original)->buffer != current_buffer) \ if (XMARKER (printcharfun)->buffer != current_buffer) \
set_buffer_internal (XMARKER (original)->buffer); \ set_buffer_internal (XMARKER (printcharfun)->buffer); \
marker_pos = marker_position (printcharfun); \
if (marker_pos < BEGV || marker_pos > ZV) \
error ("Marker is outside the accessible part of the buffer"); \
old_point = PT; \ old_point = PT; \
old_point_byte = PT_BYTE; \ old_point_byte = PT_BYTE; \
SET_PT_BOTH (marker_position (printcharfun), \ SET_PT_BOTH (marker_pos, \
marker_byte_position (printcharfun)); \ marker_byte_position (printcharfun)); \
start_point = PT; \ start_point = PT; \
start_point_byte = PT_BYTE; \ start_point_byte = PT_BYTE; \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment