HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use dynwind_begin and dynwind_end
[bpt/emacs.git]
/
src
/
coding.c
diff --git
a/src/coding.c
b/src/coding.c
index
55e2145
..
fc21795
100644
(file)
--- a/
src/coding.c
+++ b/
src/coding.c
@@
-7879,7
+7879,7
@@
void
decode_coding_gap (struct coding_system *coding,
ptrdiff_t chars, ptrdiff_t bytes)
{
decode_coding_gap (struct coding_system *coding,
ptrdiff_t chars, ptrdiff_t bytes)
{
-
ptrdiff_t count = SPECPDL_INDEX
();
+
dynwind_begin
();
Lisp_Object attrs;
coding->src_object = Fcurrent_buffer ();
Lisp_Object attrs;
coding->src_object = Fcurrent_buffer ();
@@
-7973,6
+7973,7
@@
decode_coding_gap (struct coding_system *coding,
coding->produced = bytes;
coding->produced_char = chars;
insert_from_gap (chars, bytes, 1);
coding->produced = bytes;
coding->produced_char = chars;
insert_from_gap (chars, bytes, 1);
+ dynwind_end ();
return;
}
}
return;
}
}
@@
-7996,7
+7997,7
@@
decode_coding_gap (struct coding_system *coding,
coding->produced += Z_BYTE - prev_Z_BYTE;
}
coding->produced += Z_BYTE - prev_Z_BYTE;
}
-
unbind_to (count, Qnil
);
+
dynwind_end (
);
}
}
@@
-8036,7
+8037,7
@@
decode_coding_object (struct coding_system *coding,
ptrdiff_t to, ptrdiff_t to_byte,
Lisp_Object dst_object)
{
ptrdiff_t to, ptrdiff_t to_byte,
Lisp_Object dst_object)
{
-
ptrdiff_t count = SPECPDL_INDEX
();
+
dynwind_begin
();
unsigned char *destination IF_LINT (= NULL);
ptrdiff_t dst_bytes IF_LINT (= 0);
ptrdiff_t chars = to - from;
unsigned char *destination IF_LINT (= NULL);
ptrdiff_t dst_bytes IF_LINT (= 0);
ptrdiff_t chars = to - from;
@@
-8209,7
+8210,7
@@
decode_coding_object (struct coding_system *coding,
}
Vdeactivate_mark = old_deactivate_mark;
}
Vdeactivate_mark = old_deactivate_mark;
-
unbind_to (count, coding->dst_object
);
+
dynwind_end (
);
}
}
@@
-8220,7
+8221,7
@@
encode_coding_object (struct coding_system *coding,
ptrdiff_t to, ptrdiff_t to_byte,
Lisp_Object dst_object)
{
ptrdiff_t to, ptrdiff_t to_byte,
Lisp_Object dst_object)
{
-
ptrdiff_t count = SPECPDL_INDEX
();
+
dynwind_begin
();
ptrdiff_t chars = to - from;
ptrdiff_t bytes = to_byte - from_byte;
Lisp_Object attrs;
ptrdiff_t chars = to - from;
ptrdiff_t bytes = to_byte - from_byte;
Lisp_Object attrs;
@@
-8418,7
+8419,7
@@
encode_coding_object (struct coding_system *coding,
Fkill_buffer (coding->src_object);
Vdeactivate_mark = old_deactivate_mark;
Fkill_buffer (coding->src_object);
Vdeactivate_mark = old_deactivate_mark;
-
unbind_to (count, Qnil
);
+
dynwind_end (
);
}
}
@@
-8516,7
+8517,7
@@
are lower-case). */)
(Lisp_Object prompt, Lisp_Object default_coding_system)
{
Lisp_Object val;
(Lisp_Object prompt, Lisp_Object default_coding_system)
{
Lisp_Object val;
-
ptrdiff_t count = SPECPDL_INDEX
();
+
dynwind_begin
();
if (SYMBOLP (default_coding_system))
default_coding_system = SYMBOL_NAME (default_coding_system);
if (SYMBOLP (default_coding_system))
default_coding_system = SYMBOL_NAME (default_coding_system);
@@
-8524,7
+8525,7
@@
are lower-case). */)
val = Fcompleting_read (prompt, Vcoding_system_alist, Qnil,
Qt, Qnil, Qcoding_system_history,
default_coding_system, Qnil);
val = Fcompleting_read (prompt, Vcoding_system_alist, Qnil,
Qt, Qnil, Qcoding_system_history,
default_coding_system, Qnil);
-
unbind_to (count, Qnil
);
+
dynwind_end (
);
return (SCHARS (val) == 0 ? Qnil : Fintern (val, Qnil));
}
return (SCHARS (val) == 0 ? Qnil : Fintern (val, Qnil));
}