(SETUP_SYNTAX_TABLE_FOR_OBJECT): Call bytepos_to_charpos.
Wrap in  if (1) ... else.

(casify_region): Scan in bytes and chars.
(casify_object, casify_region): Declare str, workbuf as unsigned char.

(marker.o): Depend on charset.h.

(forward_point): Function deleted.
(Fforward_point): Just add.
(Fforward_char): Don't call forward_point, just add.
(Fforward_line): Use scan_newline.
(Fdelete_char): No need for forward_point, just add.
(Fdelete_backward_char): Handle bytes and chars.
(internal_self_insert): Handle bytes and chars.

(struct position): New field bytepos.

(command_loop_1): Use PT_BYTE when calling FETCH_BYTE.
Instead of Fforward_point, just add.

(Fmake_indirect_buffer): Use set_marker_both.
(set_buffer_internal_1): Likewise.
(set_buffer_temp): Likewise.

(set_buffer_temp): Update BUF_PT_BYTE, BUF_BEGV_BYTE and BUF_ZV_BYTE.
(Fmake_indirect_buffer, set_buffer_internal_1):
Set up the pt, begv and zv markers with both kinds of position.
Set BUF_PT_BYTE, BUF_BEGV_BYTE, BUF_ZV_BYTE.
(Fget_buffer_create): Set BUF_..._BYTE.

(marker_byte_position): Renamed from marker_position.
(marker_position): New function returns the charpos.
(Fbuffer_has_markers_at): Test the marker's charpos.
(set_marker_restricted, Fset_marker): Set both kinds of position.
Optimize case where POSITION is a marker.
(set_marker_both, set_marker_restricted_both): New functions.
(Fmarker_position): Use the charpos.

(charpos_to_bytepos, bytepos_to_charpos): New functions.
(buf_charpos_to_bytepos, buf_bytepos_to_charpos): New functions.

(redisplay_internal): Use scan_newline.
(try_window_id): Use scan_newline.
(display_text_line): Use scan_newline.

(pos_tab_indent): Moved from indent,c.  Now static.
Take POS in bytes and chars.  Callers changed.

(redisplay_window): Handle byte and char positions.
(try_window): Don't move W->start if it's already at right place.

(display_count_lines): Several changes in args.
Do the work directly.
(display_scan_buffer): Function deleted.
(decode_mode_spec): Pass new arg.
(message_log_check_duplicate): Take charpos and bytepos args.
(message_dolog): Use markers to update old PT, BEGV, ZV.
Use scan_newline.  Handle positions in bytes and chars.

(try_window): Pass bytepos to and from display_text_line.
(try_window_id): Likewise.  Use byte pos as well as charpos.
(redisplay_internal): Handle bytepos for tlbufpos.

(message): Cast last arg to doprnt.

(unshow_buffer): Set PT with TEMP_SET_PT_BOTH.

(Fset_window_buffer): Use set_marker_both.
(Fselect_window, Fscroll_other_window, save_window_save): Likewise.
(Fset_window_configuration): Pass p->mark itself to Fset_marker
and set_marker_restricted_both.
(temp_output_buffer_show): Use set_marker_restricted_both.
(window_scroll): Save and restore both kinds of pointers.

(Fdelete_other_windows): Rely on vmotion to give bytepos.
Use set_marker_both.  Use byte positions.
(Frecenter): Likewise.
(Fmove_to_window_line): Use set_marker_both and Fgoto_char.

(Fchars_in_string): Update call to CHAR_HEAD_P.
(chars_in_text, str_cmpchar_id, Fcompose_string): Likewise.

(Fchar_boundary_p): Always return 0.
(Fchars_in_region): Just subtract the arguments.
(chars_in_text): New function.
(Ffind_charset_region): Scan in bytepos as well as charpos.

(Finsert_file_contents): Update call to CHAR_HEAD_P.

(Fwrite_region): Use scan_newline.

(restore_point_unwind): Now static.  Use Fgoto_char.
(Funhandled_file_name_directory): Doc fix.
(Finsert_file_contents): Handle bytes vs chars.
(Fwrite_region): Handle bytes vs chars.
(a_write): Take args in bytes; handle annotations labeled in chars.
(e_write): Rename args.
(Funhandled_file_name_directory): Doc fix.
(a_write, e_write): Now static.

(Fminibuffer_complete_word): Handle bytes vs characters
when comparing buffer against string.
(temp_echo_area_glyphs): Save, update, delete text using
byte and char positions.
(read_minibuf): BACKUP_N counts bytes.

(CHAR_HEAD_P): Take char, not pointer, as arg.

(INC_POS, DEC_POS): Fix because arg is a bufpos.
(BUF_INC_POS, BUF_DEC_POS): New macros.
(INC_BOTH, DEC_BOTH): New macros.

(doprnt1): Call to CHAR_HEAD_P fixed.

(describe_abbrev): Return void.
(write_abbrev): Return void.
(Fexpand_abbrev): Scan in bytepos along with charpos.
(Funexpand_abbrev): Use bytepos to delete the expansion.

(LIB_MOTIF): Define, if HAVE_LIBINTL.
(LIBX11_SYSTEM): Undo previous change.

(abort): New function.

(desktop-enable): New variable.
(after-init-hook): Add a hook to test desktop-enable.
(desktop-save-hook): Doc fix.

(Fcall_process): Cast new_argv for child_setup.

(Fx_rotate_cut_buffers_internal): Doc fix.

(Fread_command, Fread_variable): Fix previous change.

(Ftext_properties_at): Doc fix.

Declare nonascii_insert_offset.

(undigestify-rmail-message): If in summary, switch to the Rmail buffer.
(unforward-rmail-message): Simplify using with-current-buffer.

(info-lookup-symbol-alist): Handle Emacs Lisp mode.
(info-lookup-make-completions): Catch errors one file at a time.
Use a special temp buffer, not the usual info buffer,
and never display it in a window.

(HAVE_STRING_H): Add #undef.
[HAVE_STRING_H]: Include string.h.

(Vminor_mode_overriding_map_alist): New variable.
(syms_of_keymap): Set up Lisp var.
(current_minor_maps): Use Vminor_mode_overriding_map_alist first,
then Vminor_mode_map_alist.

Some comment, doc and bug fixes.
(ps-print-version): New version number (3.05.3) and doc fix.
(ps-output-string-prim, ps-begin-job, ps-control-character)
(ps-plot-region): Bug fix.
(ps-print-control-characters): New custom var.
(ps-string-escape-codes, ps-string-control-codes): New var.
(ps-color-device, ps-font-lock-face-attributes, ps-eval-switch)
(ps-flatten-list, ps-flatten-list-1): New fn.
(ps-setup): Update current setup.
(ps-begin-file): Adjust PostScript header file.
(ps-plot, ps-face-attribute-list): Little programming improvement.
(ps-print-prologue-1): Replace NumberOfZebra by ZebraHeight.
(ps-print-without-faces, ps-print-with-faces): Little reprogramming.
(ps-plot-with-face): Get color only on color screen device.
(ps-build-reference-face-lists): Handle obsolete
font-lock-face-attributes.
(ps-print-ensure-fontified): Little programming setting.
(ps-generate-postscript-with-faces): Adjust initializations, get color
only on color screen device.
(ps-generate): Replace (if A B) by (and A B).
(ps-do-despool): Dynamic evaluation for ps-lpr-switches,
Replace (if A B) by (and A B).
(color-instance-rgb-components, ps-color-values): Replace
pixel-components by color-instance-rgb-components.
(ps-xemacs-face-kind-p): Replace face-font by face-font-instance,
replace x-font-properties by font-instance-properties.

Customized.
(tags-revert-without-query): New option.
(tags-verify-table): Test tags-revert-without-query.

(Info-mode): Doc fix.

(dired-mark-sexp): Skip leading space in defining `uid'.

(mouse-avoidance-mode): Variable customized to automatically load the package.

(view-register): Show register type file-query.

(previous-matching-history-element): Bind
case-fold-search to nil if REGEXP contains an uppercase letter.
(previous-matching-history-element, next-matching-history-element):
Doc fixes.

(browse-url-path-regexp, browse-url-short-regexp,
browse-url-regexp): Variables deleted.  (They were moved to
thingatpt.el.)
(browse-url-filename-alist): Default now has leading ange-ftp-type
patterns so that the "^/+" pattern doesn't mung such names in
advance.
(browse-url-file-url): Don't do explicit ange-ftp path munging
here.
(browse-url-netscape-program): Doc addition.

(apropos-print): Pass t instead of DO-KEYS
when calling apropos-print-doc.

(cc-imenu-objc-function): Use bufsubst-fun as a variable, not as a function.

Fix mailer-introduced garbling.
(msb--toggle-menu-type): Don't pass arg to menu-bar-update-buffers.

Fix copyright notice.

(msb--home-dir): Renamed from msb--home-path.
(msb--strip-dir): Renamed from msb--strip-path.

Doc fixes.  Changed `append' to `nconc'
in a number of places.  Changed the separator in menus
from "---" to "--" to work in Windows 95.
(msb--home-path): New internal variable to cache the value of $HOME.
(msb--strip-path): Now handles MSDOG style of file names.
(msb--init-file-alist): Now expands `buffer-file-name'.
(msb--format-title): New subroutine for `msb--choose-file-menu'.
(msb--choose-file-menu): Use msb--format-title.  Minor simplifications.

(LIBX11_SYSTEM) [HAVE_LIBINTL and MOTIF]: Add -lintl.

(HAVE_LIBINTL): Add #undef.

(find-file-noselect): Fix previous change.

(isearch-mode-map): Don't count above 256
when setting up printing characters.

(message2_nolog): Fix arg types.

(sys_signal): Undo previous change.

(jka-compr-insert-file-contents):
If enable-multibyte-characters is nil, decode as raw-text.

(Fexecute_extended_command):
Save message_enable_multibyte and pass it to message2_nolog.

(Fgarbage_collect):
Save message_enable_multibyte and pass it to message2_nolog.

(message2_nolog): New arg MULTIBYTE.
(message2): Pass new arg to message2_nolog.
(message1_nolog): Likewise.

(Fexecute_extended_command):
Save and restore message_enable_multibyte.

(find-file-noselect): Signal error if file is unreadable.

(match-string-no-properties): New function.

(define-mail-alias): Handle backslash-quoting
within "-strings in DEFINITION if it comes from .mailrc.

(Vsignal_USR1_hook, Vsignal_USR2_hook): New variables.
(syms_of_emacs): Set up Lisp variables.
(handle_USR1_signal, handle_USR2_signal): New signal handlers.
(main): Set up signal handlers.

(x_display_cursor): Abort if X or Y is out of range.

Comment changes.

(Fparse_partial_sexp): Return nil for 9th element
whenever not inside a string or a comment.

(mule-keymap): Delete the binding for toggle-enable-multibyte-characters.
(mule-menu-keymap): Delete the menu item for it.

(copy-region-as-kill): Deactivate mark in transient-mark-mode.

(copy-region-as-kill, kill-ring-save): Doc fixes.

(toggle-enable-multibyte-characters): Doc fix.

(completion-setup-hook): Add definition.

(menu-bar-select-yank): Add apropos-inhibit property.

(apropos, apropos-command): Ignore symbols that have apropos-inhibit property.

(standard-display-european): Doc fix.

(Fread_variable): If DEFAULT_VALUE is symbol, use its name.
(Fread_command): Likewise.

(sparc-fujitsu-sysv4*): New target.

(split-string): Handle empty matches reasonably.

Comment and whitespace changes.

(calendar-french-single-byteify): New function.
(calendar-goto-french-date): Use calendar-french-single-byteify
instead of changing enable-multibyte-characters.
test french-calendar-accents.

(message_dolog): Update PT and ZV properly when at end of
buffer, when we convert between multibyte and single-byte.
Properly initialize i.

(message_dolog): Convert between single-byte and multibyte
when inserting text into *Messages*.

(read-password): New function.

(update_one_menu_entry): Add conditional in case XmNpositionIndex is missing.

(iswitchb-completion-help): Multiple TAB presses
scroll the completion window.
(iswitchb-read-buffer): New function to act as drop-in replacement
for read-buffer.

Don't call set-terminal-coding-system
if it was already set.

(Vread_buffer_function): New var.
(syms_of_minibuf): Set up Lisp var.
(Fread_buffer): Use Vread_buffer_function.

(set-language-info): Doc fix.
(input-method-inactivate-hook): Doc fix.

(widget-choose): Allow scrolling of large lists.

(transpose-subr): Rewrite to make faster with big move
counts.
(transpose-lines): In the mover function handle arbitrary move
counts.

Cache more tests.  Add missing quotes around
message with embedded comma.

(Man-mode-line-format): Update to include the new format
elements.

Add reference to new Calendrical Calculations book.

Define indentation in normal dialect for let-syntax,
letrec-syntax, syntax-rules, call-with-values, dynamic-wind.
(scheme-mode-map): Remove lisp-complete-symbol.  Add
uncomment-region.
(scheme-mode-hook, dsssl-mode-hook): Declare customized.
(dsssl-sgml-declaration): Fix customization.

(browse-url-lynx-emacs): Add sentinel to kill the buffer when lynx
exits.  Doc fix.
(browse-url-browser-function): Better customization.
(browse-url-filename-alist, browse-url-netscape-display,
browse-url-filename-alist, browse-url-generic-program): Likewise.
(browse-url-new-window-p, browse-url-w3, browse-url-mail): Doc fix.
(browse-url-save-file): Customize.

Use imenu-case-fold-search.

(comint-strip-ctrl-m): Don't die if
comint-last-output-start does not point anywhere.

(telnet-filter): Position comint-last-output-start.

(sys_signal): Add two casts.

(GROW_FAIL_STACK): Fix test for stack size at max.

(auto-mode-alist): Add .am as makefile-mode.

(ange-ftp-date-regexp): Fix the problem with misparsing
`-r--r--r-- 1 may 1997' by requiring a digit before the date.

(dired-move-to-filename-regexp):
Fix the problem with misparsing
`-r--r--r-- 1 may 1997' by requiring a digit before the date.
(dired-move-to-filename-regexp):
Allow any month name of 2 letters or more.

Customized.

(GROW_FAIL_STACK): Fix previous change:
update (fail_stack).size properly.

(TYPICAL_FAILURE_SIZE): Renamed from MAX_FAILURE_ITEMS.
Define it simply as a number.
(DOUBLE_FAIL_STACK, regex_compile): Set the limit at the size
TYPICAL_FAILURE_SIZE specifies, rather than at twice that much.
(re_max_failures): Double the initial values.
(INIT_FAIL_STACK): Use TYPICAL_FAILURE_SIZE so that INIT_FAILURE_ALLOC
counts in the proper units.
(INIT_FAILURE_ALLOC): Increase to 20.
(FAIL_STACK_GROWTH_FACTOR): New macro.
(GROW_FAIL_STACK): Renamed from DOUBLE_FAIL_STACK.
FAIL_STACK_GROWTH_FACTOR controls what ratio to increase size by.

(Fcall_process): Don't clobber new_argv[0]
in the case of no args.

(bibtex-generate-autokey): Doc fix.

(custom-add-version): New function.
(custom-handle-keyword): Handle :version.

(customize-changed-options): New function.
(customize-version-lessp): New function.