(imenu-syntax-alist): New buffer-local variable.
(imenu--generic-function): Use it.
(imenu--split-menu): Don't (setcdr nil) with, say, empty functions
list.

(imenu-case-fold-search): New buffer-local variable.

Comment change.

(archive-find-type): Accept d or s after digit, for lzh.
(archive-rename-entry): Likewise.  Parse mode, uid and gid right.
Allow newline in header.
(archive-lzh-summarize): Fix paren error.  Use prname to set `files'.

(back_comment): Move the find_defun_start call
out of the scan_sexps_forward call.
No need to call find_defun_start
if we found the defun start in the initial scan.

(hscroll-global-mode): New customize variable to automatically load the
package.

Customized.

(calendar-french-single-byteify): Function deleted.
(calendar-goto-french-date): Don't call calendar-french-single-byteify.
Delete local var oldval.
(calendar-print-french-date): Don't bind enable-multibyte-characters.

(menu-bar-file-menu): Add Recover Session menu item.
(menu-bar-help-menu): Add Getting New Versions, Copying Conditions
and (Non)Warranty menu items.

(lisp-font-lock-keywords-1): Correct defmethod addition.

(main): Fix interwoven brace and cpp conditional nesting.

Delete garbage line "int use_dialog_box".

(msb--strip-dir): Use Emacs filename primitives, not regexps.

Added speedbar support for RMAIL files.

Added gud-speedbar-buttons, and support for GDB buttons.

Added speedbar support function `Info-speedbar-buttons',
`Info-speedbar-button', and `Info-speedbar-menu'

(Fread-string): Doc fix.
(Fread-from-minibuffer): Doc fix.

Encoded by new iso-2022-7bit.

(vc-annotate-compcar): Iterate instead of recursing.
(vc-annotate-car-last-cons, vc-annotate-time-span):
Rename arg assoc-list to a-list.

(vc-annotate-display): All support for XEmacs extents removed.
Functions `set-face-*' are called only when a face is created.

(SYSTEM_MALLOC): Defined.

(define-compiler-macro): Handle empty arglist.

(byte-optimize-form-code-walker):
If compiler-macroexpand is defined, use it.

(Finsert_file_contents): Fix previous change.

Exclude describe-indian-environment-map
and setup-indian-environment-map for args of call to
set-language-info-alist.  Adjusted for the change of
make-coding-system.  Register coding-priority key in
language-info-alist.

Remove setting up of
describe-chinese-environment-map and
setup-chinese-environment-map.  Exclude them in args of calls to
set-language-info-alist.  Adjusted for the change of
make-coding-system.  Register coding-priority key in
language-info-alist.
(iso-2022-cn-ext): New coding system.

Remove setting up of
describe-cyrillic-environment-map and
setup-cyrillic-environment-map.  Exclude them in args of calls to
set-language-info-alist.  Adjusted for the change of
make-coding-system.  Register coding-priority key in
language-info-alist.

Register coding-priority key in
language-info-alist.

Remove setting up of
describe-european-environment-map and
setup-european-environment-map.  Exclude them in args of calls to
set-language-info-alist.  Adjusted for the change of
make-coding-system.  Register coding-priority key in
language-info-alist.  Add "German" language env.
(setup-8-bit-environment): Delete CODING-SYSTEM arg.
(iso-latin-1): Make it compatible with MIME-charset "iso-8859-1"
(compound-text): New coding system.  `ctext' is now alias of it.
(setup-german-environment): New function.

Adjusted for the change of
make-coding-system and setup-8-bit-environment.
(setup-greek-environment): For Greek lang. env., change default
input method to "greek-postfix".

Adjusted for the change of
make-coding-system and setup-8-bit-environment.

Remove setting up of
describe-indian-environment-map and setup-indian-environment-map.

Adjusted for the change of make-coding-system.  Register
coding-priority key in language-info-alist.

In setup-LANGUAGE-environment functions,
call set-language-environment-coding-systems.

In setup-LANGUAGE-environment functions, adjust for the change of
setup-8-bit-environment.

(skkdic-jbytes): Variable deleted.
All codes using this variable adjusted.

Comment about CCL syntax modified.
(ccl-command-table): Add read-multibyte-character,
write-multibyte-character, and unify-character.
(ccl-code-table): Add ex-cmd.
(ccl-extended-code-table): New variable.
(ccl-embed-extended-command): New function.
(ccl-compile-read-multibyte-character,
ccl-compile-write-multibyte-character,
ccl-compile-unify-character, ccl-compile-iterate-multiple-map,
ccl-compile-translate-multiple-map,
ccl-compile-translate-single-map,
ccl-compile-multiple-map-function) New functions.
(ccl-dump-ex-cmd, ccl-dump-read-multibyte-character,
ccl-dump-write-multibyte-character, ccl-dump-unify-character,
ccl-dump-unify-character-const-tbl, ccl-dump-iterate-multiple-map,
ccl-dump-translate-multiple-map, ccl-dump-translate-single-map):
New functions.

Put `prefered-coding-system'
property to each character set.

(set-language-info): Doc-string
describes `coding-priority' KEY.
(set-language-environment-coding-systems): New function.
(list-subset-p): New function.
(select-safe-coding-system): New function.
(set-language-info): New optional args DESCRIBE-MAP and SETUP-MAP.
(set-language-info-alist): New optionla arg PARENTS.  Call
set-language-info with apropriate DESCRIBE-MAP and SETUP-MAP args.
(set-language-environment-coding-systems): New function.

(prefer-coding-system): Call update-iso-coding-systems.

Adjusted for the change of the
format of make-coding-system's 6th argument.  Initialize
coding-category-iso-7-tight to iso-2022-jp.
(oldjis-newjis-jisroman-ascii): New character unification table.
(standarad-character-unification-table-for-decode): Initialize to
`unification-table' property of `oldjis-newjis-jisroman-ascii'.

(describe-coding-system): Change the
format of showing safe charsets.

(find-safe-coding-system): Moved to
mule-cmds.el.
(detect-coding-with-priority): New macro.
(detect-coding-with-language-environment): New function.

(string-to-sequence): Adjusted for the change of
multibyte-form handling (byte-base to char-base).
(store-substring): Likewise.
(truncate-string-to-width): Likewise.
(decompose-region): Likewise.
(decompose-string): Likewise.
(decompose-composite-char): Call string instead of concat-chars.

(define-character-unification-table): New
function.
(coding-system-base): Doc-string modified.
(make-coding-system): The 6th optional arg is changed to
PROPERTIES.
(set-buffer-file-coding-system): Show "(default, nil)" in prompt.
(set-coding-priority): Code tuned.

(quail-show-kbd-layout): Bug fix for the
case that TRANSLATION is a cons.

(sendmail-coding-system): Doc-string modified.
(sendmail-send-it): Select a safe coding system to encode an
outgoing mail.

Call update-iso-coding-systems after loading files
under language subdir.

(adjust_before_replace, adjust_after_replace): New
functions.

(Fcall_process): Use raw-text instead of emacs-mule
when enable-multibyte-characters is nil.  Adjusted for the change
of encode_coding and decode_coding.

(detect_coding_system): Extern it.

(Vccl_translation_table_vector, Qccl_program,
Qccl_translation_table, Qccl_translation_table_id): New variables.
append new symbols.  Qccl_translation_table and
Qccl_translation_table_id.
(CCL_Call): Fix the comment.
(CCL_ReadMultibyteCharacter, CCL_WriteMultibyteCharacter,
CCL_UnifyCharacter, CCL_UnifyCharacterConstTbl,
CCL_IterateMultipleMap, CCL_TranslateMultipleMap): New macros for
CCL Commands.
(EXCMD): New macro.
(ccl_driver): New case lable `CCL_Extention'.
(setup_ccl_program): Initialize the member `private_state' of CCL.
(Fregister_ccl_program): Delete unused variable IDX.
(Fregister_ccl_translation_table): New function.
(syms_of_ccl): Intern and staticpro Qccl_program,
Qccl_translation_table, and Qccl_translation_table_id.  Declare
`ccl-translation-table-vector' as a Lisp variable.  Declare
register-ccl-translation-table as a Lisp function.

Definition of macros CCL_STAT_XXX are moved from ccl.c to here.
(struct ccl_program): New member private_state.

(min_composite_char): New variable.
(Vcharacter_unification_table_vector): New variable.
(syms_of_charset): Declare it as a Lisp symbol.  Declare a Lisp
variable min-composite-char.
(unify_char): Delete unnecessary codes.

(BCOPY_SHORT): New macro.
(MAX_CHAR_COMPOSITION): New macro.
(CHAR_CHARSET): Check more strictly.
(CODING_FLAG_ISO_DESIGNATION): New macro.
(Vcharacter_unification_table_vector): Extern it.
(UNIFICATION_ID_TABLE): New macro.

Vselect_safe_coding_system_function): New variable.
(coding_category_table): This variable deleted.
(Vcoding_category_table): New variable.
(coding_category_name): Add "coding-category-iso-7-tight".
(detect_coding_iso2022): Check the mask
CODING_FLAG_ISO_DESIGNATION in CODING->FLAGS.  Check a new coding
category coding-category-iso-7-tight.
(DECODE_DESIGNATION): Decode only such designations that CODING
can handle.
(check_composing_code): New function.
(decode_coding_iso2022): Decode only such characters that CODING
can handle.
(encode_coding_iso2022): Before and after encoding composite
characters, reset designation and invocation status.
(detect_coding_sjis): Delete unnecessary check.
(detect_coding_big5): Likewise.
(encode_designation_at_bol): Check the validity of requested
designation register.
(setup_coding_system): Set requested designation registers for
non-supported charsets to
CODING_SPEC_ISO_NO_REQUESTED_DESIGNATION.  Set mask
CODING_FLAG_ISO_DESIGNATION in CODING->FLAGS.  Code tuned for
no-conversion and undecided.
(detect_coding): Adjusted for the new variable
Vcoding_category_table.
(syms_of_coding): Initialize Vcoding_category_table and staticpro
it.  Register select-safe-coding-system as a Lisp variable.

(DECODE_CHARACTER_ASCII): Update coding->produced_char;
(DECODE_CHARACTER_DIMENSION1): Likewise.
(Qraw_text, Qcoding_category): New variables.
(syms_of_coding): Intern and staticpro them.
(coding_system_table): New variable.
(CHARSET_OK, SHIFT_OUT_OK): New macros.
(detect_coding_iso2022): Detection algorithm improved.
(decode_coding_iso2022): Arg CONSUMED deleted, and the meaning of
return value changed.  Update members produced, produced_char,
consumed, consumed_char of the struct *coding.  Pay attention to
CODING_MODE_INHIBIT_INCONSISTENT_EOL.
(encode_coding_iso2022): Likewise.
(decode_coding_sjis_big5, encode_coding_sjis_big5): Likewise.
(decode_eol, encode_eol): Likewise.
(ENCODE_ISO_CHARACTER): Update coding->consumed_char.
(DECODE_SJIS_BIG5_CHARACTER): Update coding->produced_char.
(ENCODE_SJIS_BIG5_CHARACTER): Update coding->consumed_char.
(detect_coding(detect_coding(detect_ITIES and SKIP.
(detect_coding): Adjusted for the change of detect_coding_mask.
Update coding->heading_ascii.
(detect_eol_type): New arg SKIP.
(detect_eol): Adjusted for the change of detect_eol_type.
(ccl_codign_driver): New function.
(decode_coding): Arg CONSUMED deleted, and the meaning of return
value changed.  Update members produced, produced_char, consumed,
consumed_char of the struct *coding.
(encode_coding): Likewise.
(shrink_decoding_region, shrink_encoding_region): New function.
(code_convert_region, code_convert_string): Completely rewritten.
(detect_coding_sy(detect_coding_sy(detect_coding_sy(detect_coding_sy(detect_codiT.
(Fdetect_coding_string): New function.
(Fdecode_coding_region, Fencode_coding_region): Adjusted for the
change of code_convert_region.
(Fdecode_coding_string, Fencode_coding_string): Adjusted for the
change of code_convert_string.
(Fupdate_iso_coding_systems): New function.
(init_coding_once): Initialize coding_system_table.

(CODING_FLAG_ISO_DESIGNATION): New macro.
(struct iso2022_spec): New member.
last_invalid_designation_register.
(struct coding_system): New member inhibit_inconsistent_eol_type.
(CODING_CATEGORY_IDX_ISO_7_TIGHT,
CODING_CATEGORY_MASK_ISO_7_TIGHT): New macros.
(CODING_CATEGORY_MASK_ANY): Include
CODING_CATEGORY_MASK_ISO_7_TIGHT.
(coding_category_table, coding_category_name): Extern deleted.
(Vselect_safe_coding_system_function): Extern it.

(CODING_FINISH_XXX): New macros.
(CODING_MODE_XXX): New macros.
(struct coding_system): New member mode, category_idx,
heading_ascii.  Deleted members last_block, direction, selective,
carryover, carryover_size.
(CODING_MAY_REQUIRE_DECODING): New macro.
(CODING_CATEGORY_MASK_ISO_7BIT, CODING_CATEGORY_MASK_ISO_8BIT,
CODING_CATEGORY_MASK_ISO_SHIFT, CODING_CATEGORY_MASK_ISO): New
macros.
(Qraw_text): Extern it.

(Faset): Allow setting a multibyte character in a
multibyte string as far as it doesn't change the size_byte of the
string.

(Fstart_process): Use raw-text instead of emacs-mule
if enable-multibyte-characters is nil.  Initialize members
decoding_carryover and encoding_carryover of PROC.
(create_process): Adjusted for the change of encode_coding.
(Fopen_network_stream): Initialize members decoding_carryover and
encoding_carryover of PROC.
(read_process_output): Adjusted for the change of decode_coding.
(send_process): Adjusted for the change of encode_coding.

(struct Lisp_Process): New members decoding_carryover
and encoding_carryover.

(Finsert_file_contents): Even if
enable-multibyte-characters is nil, we must check `coding:' tag
and `file-coding-system-alist' to handle eol-conversion.

(Finsert_file_contents): Adjusted for the change of
struct coding_system and function decode_coding.  For normail file
reading, use code_convert_region.
(Fwrite_region): Adjusted for the change of struct coding_system.
(e_write): Adjusted for the change of encode_coding.

(mapcar1): Keep `i' in `i_before' before `i' is
incremented by FETCH_STRING_CHAR_ADVANCE.

(encode_terminal_code): Adjusted for the change of
encode_coding.
(write_glyphs): Likewise.  Adjusted for the change of struct
coding_system.
(insert_glyphs): Likewise.

(selection_data_to_lisp_data): Adjusted for the change
of decode_coding.
(lisp_data_to_selection_data): Adjusted for the change of
encode_coding.
(syms_of_xselect): Initialize clipboard-coding-system to
compound-text.

(PC-try-load-many-files): Load files in reverse
order so they come in the right order in the buffer list.

Update copyright year.

(Fsubstitute_in_file_name): Use unibyte_char_to_multibyte.

Update copyright year.

(nonascii_insert_offset): Variable moved from cmds.c.
(syms_of_charset): Initialize variable.

(unibyte_char_to_multibyte): New function.
(DEFAULT_NONASCII_INSERT_OFFSET): New macro definition.

(skip_chars): Use unibyte_char_to_multibyte,

(message_dolog): Use unibyte_char_to_multibyte.
Pass different args to scan_newline.
Properly compare oldpoint with Z.

(command_loop_1): Use unibyte_char_to_multibyte.

(internal_self_insert, Fself_insert_command):
Use unibyte_char_to_multibyte.
(nonascii_insert_offset): Variable moved to charset.c.
(syms_of_cmds): Don't initialize nonascii_insert_offset.

(WINDOW_RIGHT_MARGIN): Deduct width of vertical line
if frame has no scroll bars.

(concat): Use unibyte_char_to_multibyte.
Fix lossage in installing previous patch.

(set_buffer_if_live): New function.

(Fbyte_code) <Bsave_current_buffer_1>: Use set_buffer_if_live.

(Fsave_current_buffer): Use set_buffer_if_live.

(command-line-1): Add alternate startup message
for use when there is a mouse.

(current_column_1): Eliminate argument POS; use PT and PT_BYTE.
When doing FETCH_BYTE, use scan_byte.
(current_column): Check whether buffer really has multibyte chars,
not whether they are enabled.

(tq-filter): Use with-current-buffer.

(ange-ftp-date-regexp): Make l pattern match any non-ASCII char.

(unreadchar): For unreading an ASCII char
thru a buffer or marker, really decrement point or the marker position.

(info-lookup): Report if Info-goto-node fails.
(info-lookup-make-completions): Likewise.

(display_menu_bar): Don't set maxendcol too large.

(Fchar_equal): Fix case-conversion code.

(momentary-string-display): Fix backward test
for whether end of message is off the screen.

(mouse-drag-vertical-line): Properly determine which
side the scroll bar or vertical line is on.

(mldrag-drag-vertical-line): Delete debugging code.

(dired-move-to-filename-regexp):
Make l pattern match any non-ASCII char.

(rfc822-snarf-word): Don't reject non-ASCII chars.
(rfc822-snarf-subdomain): Likewise.
(rfc822-addresses-1, rfc822-addresses): Likewise.

(etags): Fix defgroup syntax.

(rmail): Don't bind enable-multibyte-characters;
read the file normally.
(rmail-revert): Likewise.

(rmail): Don't kill local enable-multibyte-characters.
Don't bind coding-system-for-read.  Fix error message.

(rmail-make-in-reply-to-field):
Make foo and bar patterns match all non-ASCII chars.

(code_convert_region): Always count chars inserted
in accord with value of enable-multilibyte-characters.
(Fcoding_system_p): Doc fix.
(Fcheck_coding_system): Doc fix.
(Fterminal_coding_system): Doc fix.
(Fkeyboard_coding_system): Doc fix.

(Fset_buffer_multibyte): New function.
(syms_of_buffer): defsubr it.

(clear_charpos_cache): New function.

(set_intervals_multibyte): New function.
(set_intervals_multibyte_1): New function.

(window_scroll): Set opoint_byte properly.

(number-to-register, increment-register): Args
renamed to match doc.

(skip_chars): Fix test for end of string, looking for `-'.
(back_comment): Don't allow quoting a comment-end.
(scan_lists): Likewise.

(install-arch-indep): Add semicolon before `else'.

Make GDB not handle SIGINT.

(compile_pattern_1): If representation of STRING
does not fit MULTIBYTE, convert its contents.
(fast_c_string_match_ignore_case): Pass 0 to compile_pattern
as MULTIBYTE.
(search_buffer): If representation of STRING
does not fit MULTIBYTE, convert its contents.