From: Michael Albinus Date: Tue, 8 Apr 2008 20:18:14 +0000 (+0000) Subject: * coding.c (detect_coding_emacs_mule) X-Git-Tag: emacs-pretest-23.0.90~6423 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3ed051d450ea43d7731a01ad1202b68404603697;p=emacs.git * coding.c (detect_coding_emacs_mule) (Ffind_operation_coding_system): Fix typo. --- diff --git a/src/ChangeLog b/src/ChangeLog index 78f286cde9f..e6b81874bd4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2008-04-08 Michael Albinus + + * coding.c (detect_coding_emacs_mule) + (Ffind_operation_coding_system): Fix typo. + 2008-04-08 Jason Rumney * w32uniscribe.c (SNAME): Extract only symbol name. @@ -6,7 +11,7 @@ (w32font_info): Use it. (W32METRIC_NO_ATTEMPT, W32METRIC_SUCCESS, W32METRIC_FAIL) (CACHE_BLOCKSIZE): New constants. - + * w32font.c (Qja, Qko, Qzh): New symbols. (syms_of_w32font): Initialise them. (font_matches_spec): Use them to filter by language. diff --git a/src/coding.c b/src/coding.c index 10443090eff..81e8e4e10bc 100644 --- a/src/coding.c +++ b/src/coding.c @@ -900,7 +900,7 @@ static INLINE void produce_charset P_ ((struct coding_system *, int *, static void produce_annotation P_ ((struct coding_system *, EMACS_INT)); static int decode_coding P_ ((struct coding_system *)); static INLINE int *handle_composition_annotation P_ ((EMACS_INT, EMACS_INT, - struct coding_system *, + struct coding_system *, int *, EMACS_INT *)); static INLINE int *handle_charset_annotation P_ ((EMACS_INT, EMACS_INT, struct coding_system *, @@ -1961,7 +1961,7 @@ detect_coding_emacs_mule (coding, detect_info) /* Perhaps the start of composite character. We simple skip it because analyzing it is too heavy for detecting. But, at least, we check that the composite character - constitues of more than 4 bytes. */ + constitutes of more than 4 bytes. */ const unsigned char *src_base; repeat: @@ -4752,7 +4752,7 @@ encode_coding_ccl (coding) else { ASSURE_DESTINATION (ccl.produced); - for (i = 0; i < ccl.produced; i++) + for (i = 0; i < ccl.produced; i++) *dst++ = destination_charbuf[i] & 0xFF; produced_chars += ccl.produced; } @@ -4941,7 +4941,7 @@ detect_coding_charset (coding, detect_info) if (src == src_end) goto too_short; ONE_MORE_BYTE (c); - if (c < charset->code_space[(dim - 1 - idx) * 2] + if (c < charset->code_space[(dim - 1 - idx) * 2] || c > charset->code_space[(dim - 1 - idx) * 2 + 1]) break; } @@ -5809,7 +5809,7 @@ detect_coding (coding) break; } } - + if (i < coding_category_raw_text) setup_coding_system (CODING_ID_NAME (this->id), coding); else if (null_byte_found) @@ -5855,7 +5855,7 @@ decode_eol (coding) { Lisp_Object eol_type; unsigned char *p, *pbeg, *pend; - + eol_type = CODING_ID_EOL_TYPE (coding->id); if (EQ (eol_type, Qunix)) return; @@ -6878,7 +6878,7 @@ make_conversion_work_buffer (multibyte) } current = current_buffer; set_buffer_internal (XBUFFER (workbuf)); - Ferase_buffer (); + Ferase_buffer (); current_buffer->undo_list = Qt; current_buffer->enable_multibyte_characters = multibyte ? Qt : Qnil; set_buffer_internal (current); @@ -8723,7 +8723,7 @@ usage: (find-operation-coding-system OPERATION ARGUMENTS...) */) operation = args[0]; if (!SYMBOLP (operation) || !INTEGERP (target_idx = Fget (operation, Qtarget_idx))) - error ("Invalid first arguement"); + error ("Invalid first argument"); if (nargs < 1 + XINT (target_idx)) error ("Too few arguments for operation: %s", SDATA (SYMBOL_NAME (operation))); @@ -9342,7 +9342,7 @@ usage: (define-coding-system-internal ...) */) = Fcons (QCcategory, Fcons (AREF (Vcoding_category_table, category), CODING_ATTR_PLIST (attrs))); CODING_ATTR_PLIST (attrs) - = Fcons (QCascii_compatible_p, + = Fcons (QCascii_compatible_p, Fcons (CODING_ATTR_ASCII_COMPAT (attrs), CODING_ATTR_PLIST (attrs)));