(replace_range): Fix previous change.

(quail-start-translation): Handle
switching of the frame in read-key-sequence.
(quail-start-conversion): Likewise.
(quail-show-guidance-buf): Detach quail-guidance-buf from any
windows before setting an appropriate window for it.
(quail-hide-guidance-buf): Use window-minibuffer-p.  Set
quail-guidance-win to nil.
(quail-update-guidance): If quail-guidance-buf is not in the
selected frame, call quail-show-guidance-buf again.

(do_switch_frame): Update minibuf_window if necessary.

(byte_combining_error): New function.
(CHECK_BYTE_COMBINING_FOR_INSERT): Call byte_combining_error.
(insert_from_string_1): Set *(GPT_ADDR) to 0 before calling
CHECK_BYTE_COMBINING_FOR_INSERT.
(insert_from_buffer_1): Likewise.
(adjust_after_replace): Check the posibility of inhibitted byte
combining correctly.
(replace_range): Before signaling an error for inhibitted byte
combining, recover the buffer in a safe state.
(del_range_2): Check the posibility of inhibitted byte combining
correctly.

(Fsubst_char_in_region): Fix previous change.
(Ftranslate_region): Fix previous change.

(Fbase64_decode_region): Fix previous change.
n

(pascal-mode): `blink-matching-paren-dont-ignore-comments' set to t.

(cal-menu-update): Fix menu wording.

(vc-backend-merge-news): Check for "P" output.

(describe-variable): Hyperlink the definition.

Don't mkdir cpp.

(sh-canonicalize-shell): Fix regexp.
(sh-set-shell): Likewise.

(shell-command-on-region): Doc fix.

(edebug-initial-mode): Fix customize type.
(edebug-on-error): Fix customize type to match that of
debug-on-error.

(eldoc-argument-case): Fix customize type.

(lm-report-bug): Use
report-emacs-bug-address instead of undefined bug-gnu-emacs.

Don't require 'w3 and 'url unprotected.

(select-message-coding-system): Doc
fix.

(describe-coding-system): Describe
all flags.

(sendmail-coding-system,
default-sendmail-coding-system): Doc fix.

(Vselection_coding_system): Doc fix.

(Fbase64_encode_region): Use SET_PT_BOTH instead of SET_PT
when we have both char and byte position.  Fix type clashes.

(Fsignal): Use a separate format string when passing
error message string to fatal, in case it contains %'s.

(Fchar_after): Fix type clashes.

(Fchar_bytes): Doc fix.
(char_bytes): Fix returned value to match returned type.
(syms_of_charset): Fix type clash in initialisation of
Vauto_fill_chars.

Write fns-*.el in current directory instead of
data-directory since no installation directory exists yet.  Mark
buffer unmodified afterwards.

(symbol-file): Load fns-*.el from exec-directory
instead of data-directory since it is architecture dependent.
(load-history-loaded): Update doc string.

(install-arch-dep): Install src/fns-*.el in
${archlibdir}.

(initialize_w32_display): Use buffer coords
instead of buffer size (which may be larger than the window).

Remove a dangling reference to a directory on the
build machine.

(ange-ftp-canonicalize-filename): Do not use a UNC
path as a default directory when canonicalizing names.

fileio.c (init_fileio_once): New function.

emacs.c (main): Invoke init_fileio_once.

(XTread_socket): Check the returned value of XmbLookupString more carefully.

(check_markers): Check if markers are at character
boundry.
(adjust_markers_for_insert): Fix previous change.
(count_combining_before): Don't limit the check at BEGV.
(count_combining_after): Don't limit the check at ZV.
(CHECK_BYTE_COMBINING_FOR_INSERT): New macro.
(insert_1_both): Call CHECK_BYTE_COMBINING_FOR_INSERT.
(insert_from_string_1): Likewise.
(insert_from_buffer_1): Likewise.
(adjust_after_replace): Inhibit bytes combined across region
boundary.  Update end_unchanged correctly.
(replace_range): Call CHECK_BYTE_COMBINING_FOR_INSERT.  Update
end_unchanged correctly.
(del_range_2): Inhibit bytes combined across region boundary.
Update end_unchanged correctly.

(Fsubst_char_in_region): Fix previous change.
(Ftranslate_region): Fix previous change.

(DECODE_CHARACTER_ASCII): Check validity of inserted
code.
(DECODE_CHARACTER_DIMENSION1): Likewise.
(DECODE_CHARACTER_DIMENSION2): Likewise.
(decode_coding_sjis_big5): Check the 2nd byte of SJIS correctly.

(Fset_message_beep): Recognize 'silent.
(w32_sys_ring_bell): Do nothing for the 'silent sound.

(Vnext_selection_coding_system): New variable.
(syms_of_w32select): DEFVAR_LISP it.
(Fw32_set_clipboard_data): Use Vnext_selection_coding_system if
non-nil.  Always convert multibyte strings.
(Fw32_get_clipboard_data): Use Vnext_selection_coding_system if
non-nil.  Always convert a string that includes non-ASCII characters.

(initialize-new-tags-table):
Do not alter find-tag-marker-ring and tags-location-ring.

(w32-use-w32-font-dialog, w32-fixed-font-alist):
New variables.
(mouse-set-font): Use font menus instead of dialog according to
w32-use-w32-font-dialog.

(check_windows_init_file): Also look in load path specified
in environment.

(w32_color_map_lookup): Remove duplicate definition.

(Fbase64_decode_string): Doc fix.
(Fbase64_decode_region, Fbase64_encode_string Fbase64_encode_region):
Likewise.

(Fbase64_decode_region, Fbase64_encode_region): Fix
newline in doc string.

(adjust_after_replace): Correctly handle the case that
both byte combining before and byte combining after happen.
(replace_range): Likewise.

(Fsubst_char_in_region): Correctly handle the case
that byte combining before happens.
(Ftranslate_region): Likewise.

(Fformat): Increase buffer size for floating format.

Add title parameters to frames.

Doc fixes.

User option for multibyte buffer handling and doc fix.
(ps-multibyte-buffer): New user option.
(ps-setup): Print new user option.
(ps-print-quote): New fun.
(ps-color-p, ps-mule-font-info-database-latin): New var.
(ps-default-color, ps-mule-font-info-database)
(ps-mule-font-info-database-ps-bdf): Adjust initialization.
(ps-mule-get-font-spec, ps-mule-begin, ps-begin-file)
(ps-plot-with-face, ps-generate-postscript-with-faces, ps-generate):
Little code improvement.
(ps-mule-initialize): Initialize ps-mule-font-info-database.
(ps-print-prologue-header, ps-font-family, ps-font-size)
(ps-header-font-family, ps-header-font-size, ps-header-title-font-size)
(ps-build-face-reference, ps-mule-font-info-database-bdf)
(ps-mule-external-libraries, ps-mule-init-external-library)
(ps-mule-prepare-font, ps-mule-find-wrappoint, ps-mule-plot-string): doc
fix.

To make it work also on Emacs 20.2 and the earlier
version, check the value of mule-version.

(ps-print-version): New version number (4.1.1) and doc
fix.
(ps-print-prologue-header): New user option.
(ps-color-values, ps-xemacs-face-kind-p, ps-mapper, ps-extent-sorter):
Conditional compilation for GNU Emacs and emacsens.
(ps-generate-postscript-with-faces): Skip invisible text better.
(ps-setup): Print new user option.
(ps-print-preprint): Check if input file name exists and is unwritable.
(ps-begin-file): Adjust PostScript prologue header for duplex printers
and insert user PostScript prologue header comments.
(ps-mule-encode-bit, ps-mule-string-ascii, ps-mule-string-encoding): New
funs.
(dos-ps-printer, lazy-lock-fontify-buffer): Eliminated.
(ps-mule-prologue, ps-mule-cmpchar-prologue, ps-mule-bitmap-prologue):
PostScript programming normalization.
(ps-mule-encode-7bit, ps-mule-encode-8bit, ps-mule-generate-font)
(ps-mule-generate-glyphs, ps-mule-prepare-font, ps-mule-plot-string)
(ps-mule-skip-same-charset, ps-mule-plot-rule-cmpchar)
(ps-mule-plot-cmpchar, ps-mule-prepare-cmpchar-font)
(ps-mule-initialize, ps-mule-begin, ps-face-bold-p, ps-do-despool):
Programming style normalization.

(compose-region): Insert then delete
to preserve markers.
(decompose-region): Use search-forward for efficiency.

(in-is13194-devanagari-pre-write-conversion): Cancel previous
change, use generate-new-buffer instead of get-buffer-create.

(pre-write-encode-hz): Cancel previous
change, use generate-new-buffer instead of get-buffer-create.

(thai-pre-write-conversion): Cancel previous
change, use generate-new-buffer instead of get-buffer-create.

(tibetan-pre-write-conversion): Cancel previous
change, use generate-new-buffer instead of get-buffer-create.

(viqr-pre-write-conversion): Cancel previous
change, use generate-new-buffer instead of get-buffer-create.

(syms_of_category): Doc-string modified.

(code_convert_region): Kill the work buffer created by
pre-write-conversion.

(desktop-buffer-dired): Use dired-maybe-insert-subdir.

(main) [HAVE_NTGUI]: Invoke syms_of_fontset().

Fix maintainer email addr.

(adjust_markers_for_insert): Adjust markers by taking
combined_before_bytes and combined_after_bytes into account.
(count_combining_after): Handle the case that LENGTH is zero.
(adjust_after_replace): Record deletion at correct buffer
position.  Handle the case that LEN is zero.
(replace_range): Record deletion at correct buffer position.
(del_range_2): Call adjust_makers_for_replace to adjust makers for
combined bytes.

(code_convert_region): While preserving the orignal
point, pay attention to the byte combining problem.

(Fbase64_decode_region): Pay attention to the byte
combining problem.

(desktop-create-buffer): Handle old (broken) minor mode support.

(Fgarbage_collect): Block input around most of the function.

(Info-next-menu-item): Stay on top of node.

(menu-bar-options-menu): Add options for truncate-lines and show-paren.

Add doc strings CORRECTLY!

(rmail-get-new-mail): Delete garbage in any case.

(whois-get-tld): Rewrite not to use `do'.

(rmail-output): Insert newline only if necessary.

Setup charset property nospace-between-words.

(get-charset-property): If CHARSET is
composition, return nil.
(put-charset-property): If CHARSET is composition, do nothing.

(in-is13194-devanagari-pre-write-conversion): Use with-temp-buffer.

(pre-write-encode-hz): Use with-temp-buffer.

(thai-pre-write-conversion): Use with-temp-buffer.

(tibetan-pre-write-conversion): Use with-temp-buffer.

(viqr-pre-write-conversion): Use with-temp-buffer.

(do-auto-fill): Adjust argument for fill-find-break-point.

(sentence-end-without-period): New variable.
(canonically-space-region): Pay attention to
sentence-end-without-period.
(fill-find-break-point): The first argument CHARSET deleted.
Caller changed.
(fill-region-as-paragraph): Pay attention to charset property
nospace-between-words and text property nospace-between-words.

(Fx_list_fonts): Access frame parameters throught
general macros.   Don't call x_list_font directory, instead call a
function set in list_fonts_func.

Include frame.h before fontset.h.
(list_fonts_func): Fix prototype.

(list_fonts_func): Fix prototype.

Include frame.h before fontset.h.

(setup_coding_system): Fix setting up
coding->spec.ccl.valid_codes for CCL based coding system.
(code_convert_region): Set point to FROM before inserting the
result of pre-write-funciton.  Preserve original point.
(code_convert_string): If coding->type is coding_type_ccl, do
conversion even if the length of conversion region is zero.

(function-form): Fix spec for
"function*".

(profile-timer-program): Var deleted.
(profile-timer-process, profile-temp-result-, profile-time): Likewise.
(profile-filter, profile-reset-timer): Functions deleted.
(profile-check-zero-init-times, profile-get-time): Likewise.
(profile-find-function, profile-quit): Likewise.
(profile-distinct, profile-call-stack, profile-last-time): New vars.
(profile-time-list, profile-init-list): Doc fix.
(profile-functions): Simplify.
(profile-print): Use float.  Make output include space separators.
(profile-add-time): New helper function.
(profile-function-prolog): Renamed from profile-start-function.
Handle profile-distinct.
(profile-function-epilog): Renamed from profile-update-function.
Handle profile-distinct.
(profile-a-function): If the function to be profiled is an
autoload form, load it.  If it's lazy-loaded, fetch it.
(profile-fix-fun): Simplify profiling wrapper, and unwind-protect it.
(profile-restore-fun): Arg FUN is now a function symbol, as was
documented, rather than a one-element list.
(profile-finish): Call profile-restore-fun properly.

(sh-font-lock-keywords): Don't crash for an unrecognized shell.

(w32_use_unicode_for_codepage): Interpret w32_no_unicode_output properly.
(syms_of_w32term): Reference w32_no_unicode_output properly.

Include charset.h and fontset.h.

Remove redundant font_info struct definition.
(Vx_pixel_size_width_font_regexp,
unibyte_display_via_language_environment): Declare variables.
(w32_list_fonts, w32_get_font_info, w32_query_font, w32_load_font):
Declare functions.
w32_output): New fields font_baseline and fontset.
(FRAME_FONTSET, FRAME_W32_FONT_TABLE): New macros.

Include fontset.h.  Define codepage macros.
Add ENCODE_BIG5 macro from coding.c.
(w32_no_unicode_output): New variable.
(w32_codepage_for_charset, w32_use_unicode_for_codepage): New
functions.
(BUILD_WCHAR_T, BYTE1, BYTE2): New macros.
(dumpglyphs): Rewrite based on xterm.c equivalent.
(x_new_font): Use functionality provided in fontset.c.
(x_new_fontset): New function based on the one in xterm.c.
(syms_of_w32term): Add w32-no-unicode-output flag.

(Vx_pixel_size_width): New global variable.
(unibyte_display_via_language_environment): New global variable.
(x_set_font): Add support for setting fontsets.
(Fx_create_frame): Add check_w32(). Initialize fontsets.  Fix
font names to match xlfd-tight-regexp.
(w32_load_font): Rewrite based on x_load_font.
(x_to_w32_charset, w32_to_x_charset): Add character sets.  Use
`iso8859-1' rather than `ansi'.
(w32_to_x_font): Remove `-' from font name.  Remove the `-' off the
end. Move charset into `charset registry' field.
(enum_font_cb2): Check charsets match.  Include width in font list.

(w32_list_fonts): Rewrite based on x_list_fonts.
Moved from w32term.c to have access to enumfont_t struct.
(Fx_list_fonts): w32 specific version eliminated.  Include
`x-list-fonts.c'.
(w32_get_font_info, w32_query_font, w32_find_ccl_program): New
functions for fontset support - adapted from x_ equivalents.
(syms_of_w32fns): New lisp variables initialised.  Function
pointers for fontset.c set up.

Update comments referring to obsolete structs.
(allocate_face, copy_face, face_eql, load_font,
Fpixmap_spec_p, free_frame_faces, new_computed_face,
frame_update_line_height, merge_faces, compute_base_face,
Fset_face_attribute_internal): Use fontset support based on xfaces.c.

(w32fns.c): Add x-list-font.c to dependancies.

(syms_of_syntax): Fix the setup of Qscan_error.

(desktop-save, desktop-create-buffer): Handle all minor modes.

(sh-mode): Handle .spec and .mspec files.
(sh-font-lock-keywords): Handle rpm and rpm2.
(sh-ancestor-alist): Handle rpm.