xemacs-beta: src/buffer.c comparison

comparison src/buffer.c @ 408:501cfd01ee6d r21-2-34

Import from CVS: tag r21-2-34

author	cvs
date	Mon, 13 Aug 2007 11:18:11 +0200
parents	b8cc9ab3f761
children	de805c49cfc1

comparison

equal deleted inserted replaced

-:ed6218a7d4d3
+:501cfd01ee6d
 }
 #else
 #define coding_system_is_binary(coding_system) 1
 #endif
-static Extbyte_dynarr *conversion_out_dynarr;
+typedef struct
-static Bufbyte_dynarr *conversion_in_dynarr;
+{
+Dynarr_declare (Bufbyte_dynarr *);
+} Bufbyte_dynarr_dynarr;
+typedef struct
+{
+Dynarr_declare (Extbyte_dynarr *);
+} Extbyte_dynarr_dynarr;
+static Extbyte_dynarr_dynarr *conversion_out_dynarr_list;
+static Bufbyte_dynarr_dynarr *conversion_in_dynarr_list;
 static int dfc_convert_to_external_format_in_use;
 static int dfc_convert_to_internal_format_in_use;
 static Lisp_Object
 #endif
 				dfc_conversion_type sink_type,
 				dfc_conversion_data *sink)
 {
 int count = specpdl_depth ();
+Extbyte_dynarr *conversion_out_dynarr;
 type_checking_assert
 (((source_type == DFC_TYPE_DATA) ||
 (source_type == DFC_TYPE_LISP_LSTREAM && LSTREAMP (source->lisp_object)) ||
 (source_type == DFC_TYPE_LISP_STRING && STRINGP (source->lisp_object)))
 &&
 ((sink_type == DFC_TYPE_DATA) ||
 (sink_type == DFC_TYPE_LISP_LSTREAM && LSTREAMP (source->lisp_object))));
-if (dfc_convert_to_external_format_in_use != 0)
-error ("Can't call a conversion function from a conversion function");
-else
-dfc_convert_to_external_format_in_use = 1;
 record_unwind_protect (dfc_convert_to_external_format_reset_in_use,
-			 Qzero);
+			 make_int (dfc_convert_to_external_format_in_use));
+if (Dynarr_length (conversion_out_dynarr_list) <=
+dfc_convert_to_external_format_in_use)
+Dynarr_add (conversion_out_dynarr_list, Dynarr_new (Extbyte));
+conversion_out_dynarr = Dynarr_at (conversion_out_dynarr_list,
+				     dfc_convert_to_external_format_in_use);
+dfc_convert_to_external_format_in_use++;
+Dynarr_reset (conversion_out_dynarr);
 #ifdef FILE_CODING
 coding_system = Fget_coding_system (coding_system);
 #endif
-Dynarr_reset (conversion_out_dynarr);
 /* Here we optimize in the case where the coding system does no
 conversion. However, we don't want to optimize in case the source
 or sink is an lstream, since writing to an lstream can cause a
 garbage collection, and this could be problematic if the source
 #endif
 				dfc_conversion_type sink_type,
 				dfc_conversion_data *sink)
 {
 int count = specpdl_depth ();
+Bufbyte_dynarr *conversion_in_dynarr;
 type_checking_assert
 ((source_type == DFC_TYPE_DATA ||
 source_type == DFC_TYPE_LISP_LSTREAM)
 &&
 (sink_type   == DFC_TYPE_DATA ||
 sink_type   == DFC_TYPE_LISP_LSTREAM));
-if (dfc_convert_to_internal_format_in_use != 0)
-error ("Can't call a conversion function from a conversion function");
-else
-dfc_convert_to_internal_format_in_use = 1;
 record_unwind_protect (dfc_convert_to_internal_format_reset_in_use,
-			 Qzero);
+			 make_int (dfc_convert_to_internal_format_in_use));
+if (Dynarr_length (conversion_in_dynarr_list) <=
+dfc_convert_to_internal_format_in_use)
+Dynarr_add (conversion_in_dynarr_list, Dynarr_new (Bufbyte));
+conversion_in_dynarr = Dynarr_at (conversion_in_dynarr_list,
+				    dfc_convert_to_internal_format_in_use);
+dfc_convert_to_internal_format_in_use++;
+Dynarr_reset (conversion_in_dynarr);
 #ifdef FILE_CODING
 coding_system = Fget_coding_system (coding_system);
 #endif
-Dynarr_reset (conversion_in_dynarr);
 if (source_type != DFC_TYPE_LISP_LSTREAM &&
 sink_type   != DFC_TYPE_LISP_LSTREAM &&
 coding_system_is_binary (coding_system))
 {
 }
 void
 reinit_vars_of_buffer (void)
 {
-conversion_in_dynarr  = Dynarr_new (Bufbyte);
+conversion_in_dynarr_list = Dynarr_new2 (Bufbyte_dynarr_dynarr,
-conversion_out_dynarr = Dynarr_new (Extbyte);
+					   Bufbyte_dynarr *);
+conversion_out_dynarr_list = Dynarr_new2 (Extbyte_dynarr_dynarr,
+					    Extbyte_dynarr *);
 staticpro_nodump (&Vbuffer_alist);
 Vbuffer_alist = Qnil;
 current_buffer = 0;
 }
 */ );
 DEFVAR_BUFFER_LOCAL ("modeline-format", modeline_format /*
 Template for displaying modeline for current buffer.
 Each buffer has its own value of this variable.
-Value may be a string, a symbol or a list or cons cell.
+Value may be a string, symbol, glyph, generic specifier, list or cons cell.
-For a symbol, its value is used (but it is ignored if t or nil).
+For a symbol, its value is processed (but it is ignored if t or nil).
 A string appearing directly as the value of a symbol is processed verbatim
 in that the %-constructs below are not recognized.
 For a glyph, it is inserted as is.
+For a generic specifier (i.e. a specifier of type `generic'), its instance
+is computed in the current window using the equivalent of `specifier-instance'
+and the value is processed.
 For a list whose car is a symbol, the symbol's value is taken,
 and if that is non-nil, the cadr of the list is processed recursively.
 Otherwise, the caddr of the list (if there is one) is processed.
 For a list whose car is a string or list, each element is processed
 recursively and the results are effectively concatenated.
 For a list whose car is an integer, the cdr of the list is processed
 and padded (if the number is positive) or truncated (if negative)
 to the width specified by that number.
 For a list whose car is an extent, the cdr of the list is processed
 normally but the results are displayed using the face of the
 extent, and mouse clicks over this section are processed using the
 keymap of the extent. (In addition, if the extent has a help-echo
 property, that string will be echoed when the mouse moves over this
-section.) See `generated-modeline-string' for more information.
+section.) If extents are nested, all keymaps are properly consulted
-For a list whose car is a face, the cdr of the list is processed
+when processing mouse clicks, but multiple faces are not correctly
-normally but the results will be displayed using the face in the car.
+merged (only the first face is used), and lists of faces are not
-For a list whose car is a keymap, the cdr of the list is processed
+correctly handled.  See `generated-modeline-string' for more information.
-normally but the keymap will apply for mouse clicks over the results,
-in addition to `modeline-map'.  Nested keymap specifications are
-handled properly.
 A string is printed verbatim in the modeline except for %-constructs:
 (%-constructs are processed when the string is the entire modeline-format
 or when it is found in a cons-cell or a list)
 %b -- print buffer name.      %c -- print the current column number.
 %f -- print visited file name.

Mercurial > hg > xemacs-beta

comparison src/buffer.c @ 408:501cfd01ee6d r21-2-34