emacs: src/coding.c comparison

comparison src/coding.c @ 64308:93129de4b8a4

(code_convert_region_unwind): ARG is changed to a cons. (code_convert_region): Adjusted for the above change. (set_conversion_work_buffer): If the work buffer is already in use, generate a new buffer and return it. Otherwise return Qnil. (run_pre_post_conversion_on_str): Adjusted for the above change. (run_pre_write_conversin_on_c_str): Likewise.

author	Kenichi Handa <handa@m17n.org>
date	Thu, 14 Jul 2005 07:57:21 +0000
parents	3de1b955c31a
children	a0d1312ede66

comparison

equal deleted inserted replaced

-:487eee037b09
+:93129de4b8a4
 if (encodep) shrink_encoding_region (beg, end, coding, str);	\
 else shrink_decoding_region (beg, end, coding, str);		\
 }									\
 } while (0)
+/* ARG is (CODING . BUFFER) where CODING is what to be set in
+Vlast_coding_system_used and BUFFER if non-nil is a buffer to
+kill.  */
 static Lisp_Object
 code_convert_region_unwind (arg)
 Lisp_Object arg;
 {
 inhibit_pre_post_conversion = 0;
-Vlast_coding_system_used = arg;
+Vlast_coding_system_used = XCAR (arg);
+if (! NILP (XCDR (arg)))
+Fkill_buffer (XCDR (arg));
 return Qnil;
 }
 /* Store information about all compositions in the range FROM and TO
 of OBJ in memory blocks pointed by CODING->cmp_data.  OBJ is a
 new buffer.  */
 struct buffer *prev = current_buffer;
 Lisp_Object new;
 record_unwind_protect (code_convert_region_unwind,
-			     Vlast_coding_system_used);
+			     Fcons (Vlast_coding_system_used, Qnil));
 /* We should not call any more pre-write/post-read-conversion
 functions while this pre-write-conversion is running.  */
 inhibit_pre_post_conversion = 1;
 call2 (coding->pre_write_conversion,
 	     make_number (from), make_number (to));
 if (from != PT)
 	TEMP_SET_PT_BOTH (from, from_byte);
 prev_Z = Z;
 record_unwind_protect (code_convert_region_unwind,
-			     Vlast_coding_system_used);
+			     Fcons (Vlast_coding_system_used, Qnil));
 saved_coding_system = Vlast_coding_system_used;
 Vlast_coding_system_used = coding->symbol;
 /* We should not call any more pre-write/post-read-conversion
 functions while this post-read-conversion is running.  */
 inhibit_pre_post_conversion = 1;
 /* Name (or base name) of work buffer for code conversion.  */
 static Lisp_Object Vcode_conversion_workbuf_name;
 /* Set the current buffer to the working buffer prepared for
 code-conversion.  MULTIBYTE specifies the multibyteness of the
-buffer.  */
+buffer.  Return the buffer we set if it must be killed after use.
+Otherwise return Qnil.  */
-static struct buffer *
+static Lisp_Object
 set_conversion_work_buffer (multibyte)
 int multibyte;
 {
-Lisp_Object buffer;
+Lisp_Object buffer, buffer_to_kill;
 struct buffer *buf;
 buffer = Fget_buffer_create (Vcode_conversion_workbuf_name);
 buf = XBUFFER (buffer);
+if (buf == current_buffer)
+{
+/* As we are already in the work buffer, we must generate a new
+	 buffer for the work.  */
+Lisp_Object name;
+name = Fgenerate_new_buffer_name (Vcode_conversion_workbuf_name, Qnil);
+buffer = buffer_to_kill = Fget_buffer_create (name);
+buf = XBUFFER (buffer);
+}
+else
+buffer_to_kill = Qnil;
 delete_all_overlays (buf);
 buf->directory = current_buffer->directory;
 buf->read_only = Qnil;
 buf->filename = Qnil;
 buf->undo_list = Qt;
 set_buffer_internal (buf);
 if (BEG != BEGV || Z != ZV)
 Fwiden ();
 del_range_2 (BEG, BEG_BYTE, Z, Z_BYTE, 0);
 buf->enable_multibyte_characters = multibyte ? Qt : Qnil;
-return buf;
+return buffer_to_kill;
 }
 Lisp_Object
 run_pre_post_conversion_on_str (str, coding, encodep)
 Lisp_Object str;
 {
 int count = SPECPDL_INDEX ();
 struct gcpro gcpro1, gcpro2;
 int multibyte = STRING_MULTIBYTE (str);
 Lisp_Object old_deactivate_mark;
+Lisp_Object buffer_to_kill;
 record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
-record_unwind_protect (code_convert_region_unwind,
-			 Vlast_coding_system_used);
 /* It is not crucial to specbind this.  */
 old_deactivate_mark = Vdeactivate_mark;
 GCPRO2 (str, old_deactivate_mark);
 /* We must insert the contents of STR as is without
 unibyte<->multibyte conversion.  For that, we adjust the
 multibyteness of the working buffer to that of STR.  */
-set_conversion_work_buffer (multibyte);
+buffer_to_kill = set_conversion_work_buffer (multibyte);
+record_unwind_protect (code_convert_region_unwind,
+			 Fcons (Vlast_coding_system_used, buffer_to_kill));
 insert_from_string (str, 0, 0,
 		      SCHARS (str), SBYTES (str), 0);
 UNGCPRO;
 inhibit_pre_post_conversion = 1;
 {
 struct gcpro gcpro1, gcpro2;
 struct buffer *cur = current_buffer;
 Lisp_Object old_deactivate_mark, old_last_coding_system_used;
 Lisp_Object args[3];
+Lisp_Object buffer_to_kill;
 /* It is not crucial to specbind this.  */
 old_deactivate_mark = Vdeactivate_mark;
 old_last_coding_system_used = Vlast_coding_system_used;
 GCPRO2 (old_deactivate_mark, old_last_coding_system_used);
 /* We must insert the contents of STR as is without
 unibyte<->multibyte conversion.  For that, we adjust the
 multibyteness of the working buffer to that of STR.  */
-set_conversion_work_buffer (coding->src_multibyte);
+buffer_to_kill = set_conversion_work_buffer (coding->src_multibyte);
 insert_1_both (*str, nchars, nbytes, 0, 0, 0);
 UNGCPRO;
 inhibit_pre_post_conversion = 1;
 args[0] = coding->pre_write_conversion;
 args[1] = make_number (BEG);
 move_gap (BEG);
 bcopy (BEG_ADDR, *str, coding->produced);
 coding->src_multibyte
 = ! NILP (current_buffer->enable_multibyte_characters);
 set_buffer_internal (cur);
+if (! NILP (buffer_to_kill))
+Fkill_buffer (buffer_to_kill);
 }
 Lisp_Object
 decode_coding_string (str, coding, nocopy)

Mercurial > emacs

comparison src/coding.c @ 64308:93129de4b8a4