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').

(record_delete): Record last_point_position when there's
no record other than marker adjustment before undo boundary.

(top_distclean): Check the existence of `lock' subdir.

(xterm-mouse-translate, xterm-mouse-event): Replace
obsolete `concat with integer' by format.

(resize-minibuffer-mode): Make it a proper minor
mode: toggle resize-minibuffer mode when called without argument.

(popup_get_selection): On receiving a KeyPress event
only deactivate the menu when the key is not a modifier key.

(Fx_create_frame): Use "borderWidth", not "borderwidth",
as resource name, to be consistent with other X applications.

(PC-expand-many-files): Apply completion-ignored-extensions.

(install-arch-indep): Put special subdirs.el files
in site-lisp dirs.  Use normal-top-level-add-subdirs-to-load-path.

(normal-top-level-add-subdirs-to-load-path): New function.

(find-file-noselect): Use set-buffer-multibyte
instead of setting enable-multibyte-characters.

(standard-display-underline): Shift face id by 19 bits.

(Fdirectory_files): In FULL case, compute number of characters

(substring_both, Fsubstring): Use make_specified_string.
(concat): Make string result unibyte or multibyte as appropriate.

(syms_of_sunfns): Pass new arg to make_pure_string.

(make_specified_string): New function.
(make_string_from_bytes): New function.
(compact_strings): Get byte size from size, if size_byte < 0.
(Fmake_string): Use make_uninit_string for single-byte char.
(make_unibyte_string): Mark string as unibyte.
(make_uninit_string): Likewise.
(make_string): Likewise, if size == size in bytes.
(make_pure_string): New arg MULTIBYTE.
(Fpurecopy): Pass new arg to make_pure_string.

(Fchar_to_string): Use make_string_from_bytes.
(Fformat): Use make_specified_string.
(make_buffer_string_both): Use make_uninit_string if buffer is unibyte.

(casify_object): Use make_specified_string.

(Fstring): Use make_string_from_bytes.
(Fcompose_string): Likewise.

(internal_self_insert): Use make_string_from_bytes.

(code_convert_string): Use make_string_from_bytes.

(Fsubstitute_command_keys): Use make_string_from_bytes.

(read1): Pass new arg to make_pure_string.
(make_symbol): Likewise.
(init_obarray): Likewise.
(read1): Use make_specified_string.

(PRINTPREPARE): Use make_string_from_bytes.

(read_process_output): Use make_string_from_bytes.

(Fregexp_quote): Use make_specified_string.

(selection_data_to_lisp_data): Use make_string_from_bytes.

(insert_from_string_1, replace_range):
Use STRING_MULTIBYTE to determine whether string is multibyte.

Use STRING_BYTES and SET_STRING_BYTES.

(Ftranspose_regions): Try to handle combining bytes.

Use STRING_BYTES and SET_STRING_BYTES.