(Fsave_restriction): Doc fix.

(help-make-xrefs): Fix typo affecting Info references.

(popmail, pop_retr) [MAIL_USE_POP]: When displaying
an error message from POP, mention that it's from POP, to
distinguish it from local error messages.

Fix previous change.

(highlight-compare-with-file): Renamed from
compare-with-file.

(find-function-search-for-symbol): Fix error messages.

Write load-history into etc/fns-VERSION.el, then clear it.

(load-history-loaded): New variable.
(symbol-file): Load etc/fns-VERSION.el if that has not been done.

(build_load_history): Do add to Vload_history
even when dumping Emacs.

(eldoc-message): Check for 1-arg case, and store string in
eldoc-last-message without consing a new string.
Rearrange logic from nested if's into cond's.

(eldoc-print-fnsym-args): Renamed to eldoc-get-fnsym-args-string.
Do not print message; just return string.

(eldoc-get-var-docstring): Renamed from eldoc-print-var-docstring.
Do not print message; just return string.
Cache that string in eldoc-last-data.

(eldoc-last-data): Make into a vector.
(eldoc-get-fnsym-args-string): Use new data form of structure.
(eldoc-get-var-docstring): Here also.

(eldoc-last-data-store): New function.
(eldoc-get-fnsym-args-string): Use it.
(eldoc-get-var-docstring): Here also.

(eldoc-docstring-first-line): Minimize interim string consing.
Call substitute-command-keys on the result.

(eldoc-print-var-docstrings, eldoc-print-docstring,
eldoc-docstring-message): Functions removed.
(eldoc-docstring-format-sym-doc): New function, functionality ripped out of
eldoc-docstring-message.
(eldoc-get-fnsym-args-string, eldoc-get-var-docstring): Use it.

(Extensions): Removed request to have dejagnu rewritten in scheme,
because that is now done.

(make-coding-system): Doc-string modified.

(CCL_WRITE_CHAR): Don't use bcopy.
(ccl_driver): If BUFFER-MAGNIFICATION of the CCL program is 0,
cause error if the program is going to output some bytes.  When
outputing a string to notify an error, check the case that
DST_BYTES is zero.

(ccl_coding_driver): If ccl_driver is interrupted by a
user or the CCL program executed an invalid command, return
CODING_FINISH_INTERRUPT.
(code_convert_region): Pay attention to the converters return
value CODING_FINISH_NORMAL and CODING_FINISH_INTERRUPT.

(CODING_FINISH_INTERRUPT): New macro.

*** empty log message ***

(site-run-file): Fix customize type.

(speedbar-initial-expansion-list-name): Fix
customize type.

(shell-input-autoexpand): Fix customize type.

(ps-font-info-database): Add missing dots in value.
Improve layout of customize type.

(vhdl-header-file): Fix customize type.

(cpp-face-light-list, cpp-face-dark-list): Fix
customize type.

(cperl-lazy-help-time): Fix customize
type.

(traceroute-program-options, ping-program-options,
ipconfig-program-options, netstat-program-options,
arp-program-options, route-program-options,
nslookup-program-options, ftp-program-options): Fix customize
type.

(clean-buffer-list-kill-regexps,
clean-buffer-list-kill-buffer-names,
clean-buffer-list-kill-never-buffer-names,
clean-buffer-list-kill-never-regexps): Fix customize type.

(Man-init-defvars): Avoid trailing nil on
Man-filter-list.

(rmail-movemail-program): Fix customize type.

(feedmail-x-mailer-line-user-appendage,
feedmail-fiddle-plex-user-list,
feedmail-spray-address-fiddle-plex-list,
feedmail-prompt-before-queue-user-alist,
feedmail-prompt-before-queue-help-supplement,
feedmail-queue-reminder-alist, feedmail-queue-default-file-slug,
feedmail-queue-alternative-mail-header-separator): Fix customize
type.
-------------------------------------------------------------------

(printer-name): Fix customize type.

(compilation-error-screen-columns): New
variable.
(compilation-next-error-locus): Use it to decide whether to use
forward-char or move-to-column.

(quail-japanese-katakana-update-translation):
Adjusted for the change of input method handling.

(reset-language-environment): Call
update-coding-systems-internal.

Call update-coding-systems-internal at the tail.

(adjust_markers_for_replace): Don't adjust a byte
position if it is FROM.
(adjust_markers_for_combining): New function.
(combine_bytes): Call adjust_markers_for_combining instead of
adjust_markers_for_replace.
(adjust_after_replace): Record deletion of combining after bytes
with the correct position.  Don't add combining bytes to the args
given to adjust_point.  Handle correctly the case that there are
both before and after combining bytes.
(replace_range): Likewise.  Record the actual deletion after
recoding deletions of combining bytes.

(code_convert_region): Update beg_unchanged and
end_unchanged after we delete the source text.

(message_log_check_duplicate): Count byte length of the
latest message correctly.

(X Windows Projects): Removed the raytracing program at rms's request,
because people are writing one.

(vc-menu-map): Change the vc-directory label.  Don't
use the menu-enable properties, pending doing it correctly and
acceptably fast.

(map-y-or-n-p): Mention RET, `q' in the help text.

(hs-grok-mode-type) Handle nil `comment-start' and `comment-end'.

Added a reprogram to reformat HTML, at rms's request.

(blink-matching-open): Don't log paren matching
messages in *Messages*.

(Fmake_local_variable): Doc fix.

(redisplay_internal): Use TEMP_SET_PT_BOTH
instead of SET_PT_BOTH.
(try_window_id, display_text_line): Likewise.

(scroll-bar-scroll-down, scroll-bar-scroll-up):
Set point-before-scroll at end even if there was an error.

(mark-sexp-diary-entries): Fix previous chg.

(ange-ftp-insert-file-contents):
Use binary mode for dumb-unix hosts as for unix hosts.
(ange-ftp-copy-file-internal): Likewise.

(use-hard-newlines): Doc fix.

Doc fixes.

(widget-menu-max-shortcuts): New variable.
(widget-choose): Don't use single-char shortcuts if # items
exceeds that many.  Use minibuffer instead.

Version letter

(speedbar-frame-mode): Only set the position on window systems.

Comment fixes only.

(type-break-mode): remove :version field from defcustom declaration.
It's wreaking too much havoc with XEMacs and older versions of Emacs, which
share this code.

(resize-minibuffer-mode): remove :version field from defcustom declaration.
It's wreaking too much havoc with XEMacs and older versions of Emacs, which
share this code.

(rlogin): If using make-local-hook, pass the 4th arg t to add-hook also to
modify the new local value.

(Fwith_output_to_temp_buffer): Doc fix.

(vc-insert-headers): Doc fix.

(flyspell-mode-on): Make the
ispell-... variables permanent locals.
(flyspell-mode-off): Add autoload cookie.

(flyspell-mode-on): fix kill-buffer-hook
to make killing of ispell process work even if
kill-all-local-variables has been run.

(mark-sexp-diary-entries): Avoid infinite loop when
sexp entry ends at end of file with no newline.

(ange-ftp-write-region): For `dumb-unix' host,
do use binary mode, just as for `unix'.
(ange-ftp-host-type): If HOST is nil, return `unix'.

(dired-mark-files-containing-regexp):
Don't scan directories.  Ignore non-readable files.

(TIOCSIGSEND): Add #undef.
(bcopy, bcmp, bzero): Add #undef.

(compilation-error-regexp-alist):
Fix previous change: allow . and _ in command name.

(main): Mention --display and --eval in help.

(command_loop_1): When switching to selected window's bfr,
first exit if selected frame is dead (no live frames remain).
(read_key_sequence): Likewise.

(dired-mark-files-containing-regexp): Fix previous change.

(uncompress-while-visiting):
Use just the car of what find-operation-coding-system returns.

(Custom-save, Custom-reset-current, Custom-reset-saved)
(Custom-reset-standard): Fix menu inconsistency.

(feedmail-from-line): Allow t.
(feedmail-message-id-suffix): Allow nil.

(rmail-summary-output-to-rmail-file):
Simplify.  Make prefix arg work right.

(tex-start-tex): Call comint-quote-filename.

(shell-file-name-quote-list): Add # to the value.

Add a comment to emacs_memftime, explaining why it needs to loop.

(use-hard-newlines): Doc fix.

(help-xref-interned): Bind inhibit-read-only when
inserting.

(change-log-font-lock-keywords): Do parenthesized
stuff only after file names or at start of line.  Allow parens
around e-mail, as well as angles.

(require): Wrap requirement of w3 and url in
ignore-errors too, eval'd when compile.  Require w3 stuff at load
time for nicer failure if it's not available.

(emacs_memftime): New function.
(Fformat_time_string): Use it to handle null bytes in formats
correctly.

(adjust_after_replace): Don't add combining bytes to
the args given to adjust_point.  Handle correctly the case that
there are both before and after combining bytes.
(replace_range): Likewise.

(Fsubst_char_in_region): Call replace_range with the
arg MARKERS 1.

(Ffind_charset_region): Optimization for unibyte buffer.
(Ffind_charset_string): For unibyte string, return (ascii).

(comint-arguments): Ignore backslashes when using
w32 shells that expect backslashes as the directory separator.

(base64_decode_1, base64_encode_1): New functions.
(Fbase64_decode_string, Fbase64_encode_string): New functions.
(Fbase64_decode_region, Fbase64_encode_region): New functions.

(Fwidget_put): Return VALUE instead of garbage.

(error): After enlarging buffer, write to it, not to buf.

(resolved-ascii-font): New variable.
(x-complement-fontset-spec): By side effect, set
`resolved-ascii-font' to the resolved name of ASCII font."
(create-fontset-from-fontset-spec): Don't get a value for
resolved-ascii-font from the list full-fontlist.  It is set by
x-complement-fontset-spec now.

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

(count_combining_after): Check also preceding bytes at
POS if all characters in STRING are not character head.

(STRING_CHAR_AND_LENGTH): Return correct value in
ACTUAL_LEN even if LEN is too short to have a valid multibyte
form.
(STRING_CHAR_AND_CHAR_LENGTH): Likewise.

(ccl_coding_driver): Always calculate correct mulibyte
chars in produced byte sequence.
(Ffind_operation_coding_system): Doc-string fixed.

(reftex-view-crossref): Split up into several functions.  No longer moves
to find a macro.
(reftex-view-cr-cite, reftex-view-cr-ref,
reftex-end-of-bib-entry): New functions.
(reftex-auto-view-crossref): New value `window' allowed.
(reftex-view-crossref-when-idle): Process new `window' option in
(reftex-translate-to-ascii-function): New default.
(reftex-label-illegal-re): Default changed, removed Latin1.
(reftex-latin1-to-ascii): New function.
(reftex-what-environment): Check for section regexp before use.
(reftex-find-tex-file, reftex-find-bib-file): Fixed bug with absolute
path names.
(reftex-TeX-master-file): Changed sequence of file checks.
(reftex-do-citation): bibview cache only with RefTeX mode on.

(Extensions): Removed the sed item.

(Fformat_time_string, Fdecode_time, Fcurrent_time_zone):
Don't assume that localtime and gmtime return non-NULL.

(Fformat): Detect incomplete format spec at string's end.

Doc fixes.

(compilation-error-regexp-alist):
In first pattern (GNU utilities and other things),
allow a space after the optional program name at the beginning.

(mail-hist-current-header-contents):
Fix previous change: use mail-header-end.

(Fload): Handle case where openp finds a magic file
but it has no `load' handler or that handler calls `load'.
If FOUND != FILE, find FOUND's handler even if inhibited for FILE.