Mercurial > emacs

comparison src/coding.c @ 83548:c71725faff1a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned! Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-490 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-491 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-492 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-493 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-494 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-495 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-496 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-497 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-498 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-499 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-500 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-501 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-502 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-503 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-504 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-505 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-506 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-507 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-508 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-509 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-510 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-511 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-512 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-513 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-514 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-515 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-516 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-517 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-518 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-519 Update from CVS: etc/TUTORIAL.cn: Updated. * emacs@sv.gnu.org/emacs--devo--0--patch-520 Merge from erc--emacs--22 * emacs@sv.gnu.org/emacs--devo--0--patch-521 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-522 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-523 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-524 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-525 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-526 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-527 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-528 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-529 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-530 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-531 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-532 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-533 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-534 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-535 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-161 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-162 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-163 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-164 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-165 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-166 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-167 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-168 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-169 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-170 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-588
author Karoly Lorentey <lorentey@elte.hu>
date Sun, 03 Dec 2006 15:03:30 +0000
parents 2d56e13fd23d 11025612f889
children 17e0dd217877
comparison
equal deleted inserted replaced
83547:0912b745fc75 83548:c71725faff1a
5575 inhibit_modification_hooks = 1; 5575 inhibit_modification_hooks = 1;
5576 Fset_text_properties (make_number (from), make_number (to), Qnil, Qnil); 5576 Fset_text_properties (make_number (from), make_number (to), Qnil, Qnil);
5577 inhibit_modification_hooks = saved_inhibit_modification_hooks; 5577 inhibit_modification_hooks = saved_inhibit_modification_hooks;
5578 } 5578 }
5579 5579
5580 coding->heading_ascii = 0;
5581
5580 if (! encodep && CODING_REQUIRE_DETECTION (coding)) 5582 if (! encodep && CODING_REQUIRE_DETECTION (coding))
5581 { 5583 {
5582 /* We must detect encoding of text and eol format. */ 5584 /* We must detect encoding of text and eol format. */
5583 5585
5584 if (from < GPT && to > GPT) 5586 if (from < GPT && to > GPT)
6219 to_byte = SBYTES (str); 6221 to_byte = SBYTES (str);
6220 6222
6221 saved_coding_symbol = coding->symbol; 6223 saved_coding_symbol = coding->symbol;
6222 coding->src_multibyte = STRING_MULTIBYTE (str); 6224 coding->src_multibyte = STRING_MULTIBYTE (str);
6223 coding->dst_multibyte = 1; 6225 coding->dst_multibyte = 1;
6226 coding->heading_ascii = 0;
6227
6224 if (CODING_REQUIRE_DETECTION (coding)) 6228 if (CODING_REQUIRE_DETECTION (coding))
6225 { 6229 {
6226 /* See the comments in code_convert_region. */ 6230 /* See the comments in code_convert_region. */
6227 if (coding->type == coding_type_undecided) 6231 if (coding->type == coding_type_undecided)
6228 { 6232 {
6431 coding_save_composition (coding, from, to, str); 6435 coding_save_composition (coding, from, to, str);
6432 6436
6433 /* Try to skip the heading and tailing ASCIIs. We can't skip them 6437 /* Try to skip the heading and tailing ASCIIs. We can't skip them
6434 if we must run CCL program or there are compositions to 6438 if we must run CCL program or there are compositions to
6435 encode. */ 6439 encode. */
6440 coding->heading_ascii = 0;
6436 if (coding->type != coding_type_ccl 6441 if (coding->type != coding_type_ccl
6437 && (! coding->cmp_data || coding->cmp_data->used == 0)) 6442 && (! coding->cmp_data || coding->cmp_data->used == 0))
6438 { 6443 {
6439 SHRINK_CONVERSION_REGION (&from, &to_byte, coding, SDATA (str), 6444 SHRINK_CONVERSION_REGION (&from, &to_byte, coding, SDATA (str),
6440 1); 6445 1);
7268 } 7273 }
7269 return val; 7274 return val;
7270 } 7275 }
7271 7276
7272 DEFUN ("encode-sjis-char", Fencode_sjis_char, Sencode_sjis_char, 1, 1, 0, 7277 DEFUN ("encode-sjis-char", Fencode_sjis_char, Sencode_sjis_char, 1, 1, 0,
7273 doc: /* Encode a Japanese character CHAR to shift_jis encoding. 7278 doc: /* Encode a Japanese character CH to shift_jis encoding.
7274 Return the corresponding code in SJIS. */) 7279 Return the corresponding code in SJIS. */)
7275 (ch) 7280 (ch)
7276 Lisp_Object ch; 7281 Lisp_Object ch;
7277 { 7282 {
7278 int charset, c1, c2, s1, s2; 7283 int charset, c1, c2, s1, s2;
7328 } 7333 }
7329 return val; 7334 return val;
7330 } 7335 }
7331 7336
7332 DEFUN ("encode-big5-char", Fencode_big5_char, Sencode_big5_char, 1, 1, 0, 7337 DEFUN ("encode-big5-char", Fencode_big5_char, Sencode_big5_char, 1, 1, 0,
7333 doc: /* Encode the Big5 character CHAR to BIG5 coding system. 7338 doc: /* Encode the Big5 character CH to BIG5 coding system.
7334 Return the corresponding character code in Big5. */) 7339 Return the corresponding character code in Big5. */)
7335 (ch) 7340 (ch)
7336 Lisp_Object ch; 7341 Lisp_Object ch;
7337 { 7342 {
7338 int charset, c1, c2, b1, b2; 7343 int charset, c1, c2, b1, b2;