diff options
| author | Karoly Lorentey | 2005-12-19 19:57:22 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2005-12-19 19:57:22 +0000 |
| commit | e93b29568add51c918892153759a1fcd440e85be (patch) | |
| tree | 4ca3494b355f5df3d0cdbe155eeaa3f630f293c1 /src/coding.c | |
| parent | 8d3cdf56502e89f00e86b02f24422acfa1b34beb (diff) | |
| parent | 3031d8b0bb97f21c79b3022ff3e7564173facd18 (diff) | |
| download | emacs-e93b29568add51c918892153759a1fcd440e85be.tar.gz emacs-e93b29568add51c918892153759a1fcd440e85be.zip | |
Merged from miles@gnu.org--gnu-2005 (patch 169-173, 671-676)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-671
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-672
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-673
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-674
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-675
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-676
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-169
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-170
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-171
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-172
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-173
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-454
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/coding.c b/src/coding.c index d032f8c9483..0ffb37f4bfa 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -5356,10 +5356,15 @@ static Lisp_Object | |||
| 5356 | code_convert_region_unwind (arg) | 5356 | code_convert_region_unwind (arg) |
| 5357 | Lisp_Object arg; | 5357 | Lisp_Object arg; |
| 5358 | { | 5358 | { |
| 5359 | struct gcpro gcpro1; | ||
| 5360 | GCPRO1 (arg); | ||
| 5361 | |||
| 5359 | inhibit_pre_post_conversion = 0; | 5362 | inhibit_pre_post_conversion = 0; |
| 5360 | Vlast_coding_system_used = XCAR (arg); | 5363 | Vlast_coding_system_used = XCAR (arg); |
| 5361 | for (arg = XCDR (arg); ! NILP (arg); arg = XCDR (arg)) | 5364 | for (arg = XCDR (arg); ! NILP (arg); arg = XCDR (arg)) |
| 5362 | Fkill_buffer (XCAR (arg)); | 5365 | Fkill_buffer (XCAR (arg)); |
| 5366 | |||
| 5367 | UNGCPRO; | ||
| 5363 | return Qnil; | 5368 | return Qnil; |
| 5364 | } | 5369 | } |
| 5365 | 5370 | ||