Fix previous change.

(help-highlight-face): Use underline.
(help-mode-maybe): Ensure read-only.
(help-xref-button): Obey help-highlight-p.
(help-follow): Remove check for args being a list.
(help-mode): Doc fix.
(help-highlight-p): Put in help group.

(help-make-xrefs): Insert button label in scope of
inhibit-read-only binding.
(help-mode-map, help-make-xrefs): Define TAB, RET correctly.

Make hyperlinks for cross-reference info intuited from *Help* buffer.
(help-font-lock-keywords): Removed.
(help-mode-map): Define keys for navigating hyperlinks.
(help-xref-stack, help-xref-stack-item): New permanent-local variables.
(help-mode): Set font-lock-defaults to nil.
(help-mode-maybe): Invoke help-make-xrefs in Help mode.
(help-setup-xref): New function.
(describe-key, describe-mode, describe-function,
describe-variable): Call it.
(view-lossage, describe-bindings): Nullify help-xref-stack,
help-xref-stack-item.
(help-highlight-p): New option.
(help-highlight-face): New variable.
(help-back-label, help-xref-symbol-regexp, help-xref-info-regexp):
New variables.
(help-setup-xref, help-make-xrefs, help-xref-button,
help-xref-interned, help-xref-mode, help-follow-mouse,
help-xref-go-back, help-go-back, help-follow, help-next-ref): New functions.

(vc-dired-mode): Make dired-after-readin-hook a local hook, not a local variable.

(update-file-autoloads): Redo 1997-08-23 change.

(vc-merge, vc-backend-merge): New functions.
(vc-resolve-conflicts): Added optional parameters for buffer names.
(vc-branch-p): New function.

(vc-prefix-map): Added "m" for vc-merge.

(vc-ensure-vc-buffer): New function.
(vc-registration-error): Replaced by the above.  Updated all callers.
(file-executable-p-18, file-regular-p-18): Removed.

Customized.

Fix header line.

Customized.

(command-line): Fix paren error.

(webjump): Use assoc-ignore-case for locating the proper URL.

(report-emacs-bug-hook): Use skip-chars-forward
to check for non-ASCII characters, and to find them.
Don't use find-charset-region.
(report-emacs-bug-pretest-address): Update address.
(report-emacs-bug-address): Likewise.

(make_frame_without_minibuffer): Conditionalize on HAVE_WINDOW_SYSTEM.
(make_minibuffer_frame): Likewise.

(Fmessage_box): Pass the missing third argument
STRING_MULTIBYTE (val) to message2.

(vc-next-action-dired): Use dired-do-redisplay.  Handle
window configuration correctly.
(vc-next-action): Save window configuration for vc-next-action-dired.
(vc-finish-logentry): Only kill log buffer if it does exist.
(vc-dired-mode): Rewritten so that it works entirely through
dired-after-readin-hook.  Subdirectories are handled just as in
ordinary dired.
(vc-dired-hook): New function.
(vc-state-info, vc-dired-reformat-line): Adapted.
(vc-dired-update, vc-dired-update-line): Removed.
(vc-directory): Rewritten.
(vc-directory-18): Removed.
(vc-dired-mark-locked): New function, bound to "*l" in vc-dired-mode.
(vc-do-command): Only compute vc-name if it is really needed.
(vc-fetch-cvs-status): New function.
(vc-dired-hook): Use it.

(vc-parse-cvs-status): New function.
(vc-fetch-master-properties): Moved cvs status retrieval to the above.
(vc-backend): If a file is not registered, remember that by setting
the property to `none'.
(vc-name): Use the mechanism of vc-backend to compute the value.
(vc-after-save): Don't access vc-backend property directly.

(put_entries): Use %ld.

(fatal): Declare the arg.

(report-emacs-bug-hook): Don't bind enable-multibyte-characters.

(regex_compile) [!MATCH_MAY_ALLOCATE]: Fix paren error.

(set_intervals_multibyte): Function moved after set_intervals_multibyte_1.

(command-line): If already unibyte, just load
latin-N instead of calling set-language-environment.

(report-emacs-bug): Use set-buffer-multibyte.

(compile_range): Unused function deleted.
(regex_compile): Special handling for range \177-\377.
(regex_compile): Cast args to TRANSLATE to unsigned char.
(re_search_2): Fix forward scan handling multibyte.
Recognize that nonascii characters are not in the fastmap.
Handle fetching multibyte characters for backward scan,
(re_match_2_internal): Handle multibyte and translation
in exactn and anychar.
(bcmp_translate): Handle multibyte chars for translation.

(TRANSLATE): Don't cast to  unsigned char.

(PATFETCH): Use RE_TRANSLATE to translate.

(rmail-mode-2): Locally set enable-local-variables
to nil, so a local var list in a message won't confuse things.

(report-emacs-bug-hook): Fix the regexp for
matching non-ASCII characters.

(rul-generic-mode): Use font-lock-builtin-face,
not font-lock-em[hasized-face.

(Fmake_variable_frame_local): Doc fix.

Remove some directories that don't really work now.

(Fstring_as_multibyte): Never return unibyte string unchanged.
Set size_byte field.

(main): Add [--unibyte] to usage.

(RE_TRANSLATE): Use char_table_translate.

(char_table_translate): New function.

(widget-beginning-of-line): Don't set zmacs-region-stays.
(widget-end-of-line): Likewise.
(widget-glyph-click): Use read-event.
(widget-color-choice-list): Delete compatibility code.
(widget-color-sample-face-get): Likewise.
(widget-choose): Likewise.
(widget-event-point): Fix paren error.

Delete some compatibility code.
(widget-event-point, widget-read-event): Define unconditionally.

(widget-echo-help-mouse): Don't use window-end.

(widget-choice-value-create): If there is an :explicit-choice, respect it.
(widget-choice-action): Record an explicit choice in :explicit-choice.

Add support for jdb (Java debugger).
(jdb): New function.
(gud-jdb-history): New variable.
(gud-jdb-directories): New variable.
(gud-jdb-source-files): New variable.
(gud-jdb-build-source-files-list): New function.
(gud-jdb-package-of-file): New function.
(gud-jdb-class-source-alist): New variable.
(gud-jdb-build-class-source-alist): New function.
(gud-jdb-massage-args): New function.
(gud-jdb-find-source-file): New function.
(gud-jdb-marker-filter): New function.
(gud-jdb-find-file): New function.
(gud-jdb-command-name): New variable.
(gud-perldb-command-name): Variable renamed from perldb-command-name.

(redisplay_window): Fix computing pos from last_point.

(info-lookup->topic-cache): Use defun, not defsubst.
(info-lookup->mode-cache, info-lookup->initialized): Likewise.
(info-lookup->completions, info-lookup->refer-modes): Likewise.
(info-lookup->all-modes): Likewise.

(info-lookup-quick-all-modes): New function.
(info-complete): Find the symbol to complete first,
then compute list of completions.

(lisp-mode): Add info-lookup-maybe-add-help for it.

(follow-scroll-up): Cope if `window-end' returns nil.
(follow-select-if-end-visible): Likewise.
(follow-mode-version): Variable removed.

(buf_charpos_to_bytepos): Delete local variable gapend_byte.

(CHARSET_OK): Don't reject safe charsets.
(DECODE_DESIGNATION): Likewise.
(check_composing_code): Likewise.

(selection_data_to_lisp_data): Give
make_string_from_bytes a correct char size.

(vc-revert-buffer): Rewrote handling of vc-diff buffer,
        so that the file's buffer is always current when the actual
        revert is done.

Customized.

(hack-one-local-variable): Variables named ...-predicate are treated as risky.

(write-file): Omit directory part when making default file name.

Many doc fixes.
(iswitchb-method): No longer a user variable.
(iswitchb-minibuffer-setup-hook): Customized.
(iswitchb-default): New variable.
(iswitchb-complete): Use iswitchb-common-match-string rather than recomputing
the value.
(iswitchb-toggle-ignore): Recompute list of buffers.
(iswitchb-init-XEmacs-trick): Renamed from iswitchb-init-Xemacs-trick.

(vc-backend-revert): CVS bug fix.

* vc.el (vc-resolve-conflicts): New function.
        (vc-next-action-on-file): Use it.
        (vc-backend-revert): For CVS, revert to the version the buffer was
        based on, not the latest on the current branch (same behavior as
        for RCS).  For SCCS, forget vc-workfile-version so that it gets
        recomputed.
        (vc-revert-buffer): Rewrote doc string to explain the above.
        (vc-finish-logentry): Don't add extra newline.

(adjust_markers_for_replace): New function.
(adjust_after_replace): Arguments changed.  Call
adjust_markers_for_replace if this function is called after
replacement.
(adjust_after_insert): New function.

(adjust_after_replace, adjust_after_insert): Extern them.

(code_convert_region): Handle skipped ASCII characters
at the head and tail of conversion region correctly when adjusting
position keepers.  Call adjust_after_insert to record undo info
and adjust markers when we don't have to change byte sequence of
a buffer.

(struct coding_system): Comment for the member
heading_ascii modified.

(Finsert_file_contents): Call adjust_after_insert when
a text is inserted in a multibyte buffer without any code
conversion.

(info): Run man in build dir, not srcdir.

(battery-linux-proc-apm): Re-use the temporary buffer.

(battery-insert-file-contents): Disable code conversion.

(desktop-buffer-info, desktop-buffer-rmail)
(desktop-buffer-mh, desktop-buffer-dired, desktop-buffer-file):
Return the buffer produced.
(desktop-create-buffer): Use the buffer that was returned.

(tex-start-shell): Call compilation-minor-mode.

(tex-send-command): Return the process.
(tex-start-tex): New function.
(tex-region, tex-file): Use tex-start-tex.
(tex-start-tex-marker): New variable.

(tex-compilation-parse-errors): Completely rewritten.
(tex-print): Reset or restart the subshell before using it.

(ange-ftp-kill-ftp-process): Convert buffer name to the buffer.

(reporter-bug-hook): Fix error message.

(reporter-beautify-list): Break infloop when
reaching the end of the buffer without crossing an unbalanced
paren.  Use scan-sexps instead of forward-sexp for the loop break test.

(reporter-submit-bug-report): Only call
display-buffer if pop-up-windows is non-nil.

(install-arch-indep): Fix previous change.

(display_text_line): Handle overlay-arrow correctly.

(completion-ignored-extensions): Add a few.

(debug-ignored-errors): Add file-supersession.

(code_convert_region): Call adjust_before_replace
in the no-conversion case.  Adjust GPT, ZV and Z in chars.

(check_markers_debug_flag): New variable.
(syms_of_insdel): Set up Lisp var.
(CHECK_MARKERS): New macro.  Use it everywhere
instead of calling check_markers directly.
It tests check_markers_debug_flag.

(mark_buffer): Mark the undo_list slot specially;
don't mark a marker just cause it is in this list.
(Fgarbage_collect): Discard from all undo-lists
all elements that adjust markers that were not marked.

(struct buffer): Field `undo_list' moved before `name'
so it won't get marked in the usual way.

(barf_or_query_if_file_exists): New arg QUICK.  All calls changed.

(desktop-load-default): Add autoload cookie.
(desktop-read): Likewise.

(menu-bar-options-menu): Remove "Toggle" from item
names, using buttons instead.
(menu-bar-make-toggle): Define a menu-item toggle button.
(menu-bar-options-menu [save-place]): (require 'saveplace).
(menu-bar-options-menu [toggle-auto-compression], [auto-fill-mode])
(menu-bar-options-menu [toggle-global-lazy-font-lock-mode]):
Define a menu-item button.

use a string that will never match.

(${TIT}): Fix shell conditional syntax.

Fix shell syntax in check for missing .el or .elc files.

(calendar-mode-map): Add bindings for appt-add and appt-delete.

(item_properties): New variable.
(ITEM_PROPERTY_...): New macros.

*** empty log message ***

(pop_getline): Renamed from getline.

(perform-replace): Before recursive edit,
get the match data as markers, and set real-match-data.

(rmail-clear-headers): Handle failure to find "\n[^ \t]".

(normal-top-level-add-subdirs-to-load-path):
Reverse order of subdirs to add.  Don't duplicate the parent dir.

(init_lread): Init Vstandard_input.

(redisplay_window): Fix previous change.

Fix header line.

Various doc fixes, mainly grammar.

(auto-insert, auto-insert-query): :tag choices.
(define-auto-insert): Rename arg key to match doc.

add some C/C++ keywords.

use new UPDATE window-end arg.

check length of mail-header-separator before using in font-lock-keywords.

(compute_motion): Call strwidth only when necessary.
Set wide_column_end_hpos only when MULTIBYTE_BYTES_WIDTH set
nonzero to wide_column.

(make_buffer_string, make_buffer_string_both): Extern them.

(read_process_output): Count multibyte characters.  If
received data is stored in p->decoding_buf, copy it to a temporary
buffer and call insert_before_makers instead of
insert_from_string_before_markers.

(redisplay_window): Give byte position to FETCH_BYTE.
Call pos_tab_offset appropriately.
(try_window_id): Give byte position to FETCH_BYTE.  Set
val.bytepos to pos_byte.

(dired-run-shell-command): Maybe run handler.

(shell-command): Define handler.
(ange-ftp-shell-command): Add optional arg.
(comint-last-output-start, comint-last-input-start,
comint-last-input-end): Defvar to silence compiler.

(record_delete): The second arg is Lisp_Object.

Declarations changed.
(STRING_MULTIBYTE, STRING_BYTES, SET_STRING_BYTES):
New definitions treating negative size_byte as a flag for unibyte.

(MULTIBYTE_BYTES_WIDTH): Set wide_column only when we
encounter a wide-column character.

(del_range_2): Move gap again to a proper place just
after calling make_buffer_string_both.

(shrink_decoding_region): If EOL_CONVERSION is nonzero,
don't skip `\r' (instead of `\n').