(Fset_buffer_modified_p): Use the truename for locking.

(Finsert_file_contents): Use file_truename for unlocking.

(prepare_to_modify_buffer): Use file_truename for locking.

(union fail_stack_elt): New union.
(fail_stack_elt_t): Use that union.
(PUSH_PATTERN_OP, PUSH_FAILURE_POINTER, PUSH_FAILURE_INT)
(POP_FAILURE_POINTER, POP_FAILURE_INT): Corresponding changes.
(re_compile_fastmap): Corresponding changes.
(PUSH_FAILURE_ELT): New macro.
(FAIL_STACK_TOP): Macro deleted.
(WIDE_INT): Macro deleted.
(PUSH_FAILURE_POINT): Use PUSH_FAILURE_ELT.
(POP_FAILURE_ELT): New macro.
(POP_FAILURE_POINT): Use POP_FAILURE_ELT.

(xmenu_show, menubar_selection_callback): Move declaration
of entry to an outer block, to guarantee its value is preserved.

(kbd_buffer_get_event): New arg USED_MOUSE_MENU.
[USE_X_TOOLKIT]: Set *USED_MOUSE_MENU if returning menu-bar symbols.
(read_char): Pass used_mouse_menu to kbd_buffer_get_event.
This variable is now meaningful for toolkit menus as well as
non-toolkit menus.

(S-delete): Fix typo (was C-delete).

(hide-ifdef-mode-prefix-key): Change to C-c @.
(hide-ifdef-mode-submap): Get rid of \e from all bindings.

Warn about nested repetition.

(update_frame): Don't put cursor in echo area unless
the echo area is on this frame.

(display_text_line): Don't move the cursor if it's supposed to
be in the echo area.
(echo_area_display): Put cursor in echo area if appropriate.

Describe uses of C-c followed by punctuation chars.

(outline-minor-mode-prefix): Change to C-c @.

(texinfo-mode-map): Delete C-c ] binding.

(forms--mode-commands): Delete C-c ? binding.

(news-reply-mode-map): Delete C-c ? binding.

(isearch-mode): Doc fix.

(iso-accents-mode): Doc fix.

(redisplay): Don't move the cursor if it's supposed to
be in the echo area.

(buffer-substring-no-properties): New function.

(expand-mail-aliases): Use buffer-substring-no-properties.

(makefile-mode): Set dabbrev-abbrev-skip-leading-regexp.

(tpu-copy-keyfile): New function.
(tpu-load-xkeys): Copy key definition file to new default name.

(set-auto-mode): If buffer has no file, use buffer name.

(jka-compr-write-region): Handle the append
argument correctly when the can-append flag is false.
(jka-compr-write-region): Make temp-buffer name unique to this fn.
(jka-compr-file-local-copy): Ditto.

(main): Delete duplicate code for -version.
(standard_args): Add -help and -version.

Comment change.

(Fdo_auto_save): Record visited file name
as well as auto-save file name in the auto-save-list-file-name file.
Call Fexpand_file_name for auto-save-list-file-name.

(normal-top-level): Set auto-save-list-file-name.

(multiple-recover, multiple-recover-finish): New commands.

(standard_args): Add #ifdef VMS for -map.

Fix delq example.

(datearg): If rlog options are specified explicitly,
omit the implicit '-d>DATE' option.
(repository, rlog): Allow absolute paths to CVS repositories.
Look only at the first line of CVS/Repository.

Mention file-regular-p operation.

(command-line-1): Implement -L/--directory option.

[HAVE_UNISTD_H]: Include unistd.h.

(standard_args): Add -L/--directory/-directory.

(PUSH_FAILURE_INT, POP_FAILURE_INT): Use WIDE_INT.
(WIDE_INT): Defined (two alternate definitions).

(C_ALLOCA): Undef it, if __GNUC__.

(REGEX_ALLOCATE_STACK, REGEX_REALLOCATE_STACK)
(REGEX_FREE_STACK): New macros.
(INIT_FAIL_STACK, DOUBLE_FAIL_STACK, FREE_VARIABLES): Use them.
(re_max_failures) [REL_ALLOC]: Alternative larger initial value.
(re_compile_fastmap): Use REGEX_FREE_STACK.
(re_match_2_internal): Always call FREE_VARIABLES before returning.
Always init regstart, old_regstart, etc. whenever MATCH_MAY_ALLOCATE
is defined.
(FREE_VARIABLES) [REL_ALLOC]: Define non-trivially.

(jka-compr-insert-file-contents): When visiting,
bind buffer-file-name to nil temporarily.

(command-line): Handle -iconic and -icon-type here.

(Fcall_process): Extend BUFFER arg so it can specify
a separate output file for stderr output.
(Fcall_process_region): Doc fix.

(compile-internal): Disable undo before erasing
the buffer, then enable again afterward.
(compilation-sentinel): Use force-mode-line-update.

(tex-view): Nice error if tex-dvi-view-command is nil.

(*-sun-sunos4.1.3*): Use sunos4shr.h.

(ORDINARY_LINK): Defined.
(LINKER): Definition deleted.

(popup_get_selection): Use x_non_menubar_window_to_frame.
Either queue or dispatch the event, but not both.
(dialog_selection_callback): Clear popup_activated_flag.

(Fx_popup_menu): If POSITION is just (menu-bar), use the
current mouse position.
(menubar_selection_callback): Use (menu-bar) instead of 'menu-bar.

(read_char, read_char_x_menu_prompt): Exclude
menu-bar clicks when processing mouse clicks.

Declare x_non_menubar_window_to_frame.

(x_non_menubar_window_to_frame): New function.

(x_term_init): Add stub to initialize Vsystem_key_alist.

(create_process): Don't reference pty_name if !HAVE_PTYS.

(sunos4.1.3): Use shared libraries, since that's
what the header file expects.

Support for pre-BFD versions of Linux ld.

(i[34]86:*:3.2:*) test for /usr/options/cb.name before calling uname.

(vc-next-action-on-file): Add missing let-binding.

(vc-default-backend, vc-keep-workfiles, vc-consult-headers):
(vc-mistrust-permissions, vc-path): Vars moved to vc-hooks.el.
(vc-match-substring, vc-lock-file, vc-parse-buffer, vc-master-info):
(vc-log-info, vc-consult-rcs-headers, vc-fetch-properties):
(vc-backend-subdirectory-name, vc-locking-user, vc-true-locking-user):
(vc-latest-version, vc-your-latest-version, vc-branch-version):
(vc-workfile-version): Functions moved to vc-hooks.el.
(vc-trunk-p, vc-minor-revision, vc-branch-part): Functions moved
here from vc-hooks.el.

(vc-default-backend, vc-path, vc-consult-headers):
(vc-mistrust-permissions, vc-keep-workfiles): Customization
variables, moved here from vc.el.
(vc-trunk-p, vc-minor-revision, vc-branch-part): Moved to vc.el.
(vc-backend): Renamed from vc-backend-deduce.  Callers changed.
(vc-match-substring, vc-lock-file, vc-parse-buffer, vc-master-info):
(vc-log-info, vc-consult-rcs-headers, vc-fetch-properties):
(vc-backend-subdirectory-name, vc-locking-user, vc-true-locking-user):
(vc-latest-version, vc-your-latest-version, vc-branch-version):
(vc-workfile-version): Functions moved here from vc.el.
(vc-log-info): Log program is no longer called through vc-do-command,
to avoid including the lengthy vc-do-command here.  It is done
directly through call-process now.  Removed obsolete parameter LAST.
(vc-status): Replaced by the much simpler version that gets the
information from the file properties.  Removed the obsolete
parameter vc-type.
(vc-parse-buffer): changed format of PATTERNS.  Each pattern is now a
list of 2 to 3 elements, the first being the pattern, the remaining
ones the numbers of subexpressions to refer to.
(vc-cvs-status): New per-file property, only used in the CVS case.
(vc-cvs-status): New function.
(vc-log-info): Adapted to new version of vc-parse-buffer
(vc-fetch-properties): Adapted to new version of vc-parse-buffer.
Better search regexp for CVS latest version.
(vc-log-info): Search for branch version only in the RCS case,
since this doesn't make sense for SCCS or CVS.
(vc-fetch-properties): CVS case: set vc-cvs-status.
(vc-locking-user): CVS case: use vc-cvs-status to determine if
the file is up-to-date, thus avoiding an expensive call to
vc-workfile-unchanged-p.
(vc-mode-line): Re-activated the code that makes the buffer read-only
if the work file is unchanged.  But the status of the work file
is now determined by looking at the already-computed mode string.

(extraclean): Depend on maintainer-clean, not
realclean.

(maintainer-clean): Renamed from realclean.

Support Linux elf and a.out systems; Add parisc support

(CRAY*Y-MP:*:*:*): New entry.

(Ffile_regular_p): Use Qfile_regular_p.
(syms_of_fileio): Set up Qfile_regular_p.

(vc-buffer-backend): New function.
Also new variable, local in all buffers.
(vc-kill-buffer-hook): Kill local vc-buffer-backend.

(vc-kill-buffer-hook): Don't put it on kill-buffer-hook.
(vc-file-clearprops): Function moved here.
(vc-workfile-version): Function moved here.
(vc-mode-line): Don't call vc-locking-user.

Add branch support for RCS;  treat CVS more like RCS and SCCS.
(vc-occurences, vc-trunk-p, vc-branch-p, vc-minor-revision)
(vc-branch-part): new functions that operate on RCS revision numbers.
(vc-status): Use the new property vc-workfile-version
and vc-locking-user (see vc.el).  Display "locking state" for CVS.
(vc-find-cvs-master): Search for file name case-sensitively, store
version number into the new property vc-workfile-version.
(vc-find-file-hook): kill any remaining properties.  Like this,
when re-finding a file (for example because it has changed on disk),
the version control state gets re-computed.
(vc-mode-line): CVS case: make the buffer read-only if the file
is unmodified.
(vc-kill-buffer-hook): Clear file's vc props when buffer is killed.

(vc-backend-checkout): Pass vc-checkout-switches arg
properly to vc-do-command.

(vc-update-change-log): Use vc-buffer-backend in menu-enable.

(vc-file-clearprops, vc-workfile-version): Functions moved to vc-hooks.el.

Add branch support for RCS; treat CVS more like RCS and SCCS.
(vc-next-action-on-file): changed CVS handling, such that C-x C-q
works as with RCS and SCCS.
(vc-consult-rcs-headers): New function.
(vc-branch-version): New per-file property, refers
to the RCS version selected by `rcs -b'.
(vc-workfile-version): New function.  Also new per-file property
(vc-consult-headers): New parameter variable.
(vc-mistrust-permissions): Default set to `nil'.
(vc-locking-user): Property is now cached.  The other functions
update it as necessary.  Attempts to use RCS headers if enabled.
(vc-log-info, vc-parse-buffer): Various bug fixes.  Added support
for property `vc-branch-version'.
(vc-backend-checkout): RCS case: if no explicit version
is specified, check out `vc-workfile-version'.  After check-out,
set `vc-workfile-version' according to the version number
reported by "co".
(vc-backend-checkin): RCS case: remove any remaining locks
if a new branch was created.  After every check-in, adjust
the current branch using `rcs -b' (this cannot be avoided).
CVS case: allow for explicit checkin, but only on the trunk.
(vc-next-action-on-file, vc-backend-checkout, vc-backend-checkin,
vc-backend-revert, vc-backend-diff): Explicitly use
vc-workfile-version as the default version to operate on.

(standard_args): Move -iconic and --icon-type (etc.)
to the end of the initial args.

Eval key definitions and clean up upon completion.
Persistent completion status message.

Removed reference to tpu-gnu-emacs18-p.

(mark_kboards): Mark the kbd macro and Vsystem_key_alist.

(appt-check): Use force-mode-line-update.

(array-mode): Use force-mode-line-update.

(byte-recompile-directory): Use force-mode-line-update.

(delete-selection-mode): Use force-mode-line-update.

(dired-omit-expunge): Use force-mode-line-update.

(dired-sort-set-modeline): Use force-mode-line-update.

(edt-advance, edt-backup): Use force-mode-line-update.

(find-dired-sentinel): Use force-mode-line-update.

(fortran-auto-fill-mode): Use force-mode-line-update.

(gud-sentinel): Use force-mode-line-update.

(hanoi): Use force-mode-line-update.

(hide-ifdef-toggle-read-only): Use force-mode-line-update.
(hide-ifdef-toggle-outside-read-only): Use force-mode-line-update.

(Info-edit-mode, Info-cease-edit): Use force-mode-line-update.

(isearch-mode, isearch-done): Use force-mode-line-update.

(mh-insert-signature): Use force-mode-line-update.

(mh-set-scan-mode): Use force-mode-line-update.

(mh-set-mode-name): Use force-mode-line-update.

(outline-minor-mode): Use force-mode-line-update.

(picture-set-motion, picture-mode-exit): Use force-mode-line-update.

(rmail-edit-current-message): Use force-mode-line-update.
(rmail-cease-edit): Use force-mode-line-update.

(auto-fill-mode): Use force-mode-line-update.

(sc-raw-mode-toggle): Use force-mode-line-update.

(term-update-mode-line, term-process-pager): Use force-mode-line-update.
(term-pager-continue): Use force-mode-line-update.

(te-edit, te-more-break-unwind): Use force-mode-line-update.
(te-update-pending-output-display): Use force-mode-line-update.

(display-time-sentinel, display-time-filter): Use force-mode-line-update.

(vi-switch-mode, vi-back-to-old-mode): Use force-mode-line-update.
(vi-mode, vi-goto-insert-state): Use force-mode-line-update.

(vip-change-mode): Use force-mode-line-update.

(xscheme-set-runlight, xscheme-set-prompt): Use force-mode-line-update.

(emerge-fast-mode, emerge-edit-mode): Use force-mode-line-update.
(emerge-auto-advance, emerge-skip-prefers): Use force-mode-line-update.
(emerge-refresh-mode-line): Use force-mode-line-update.

(toggle-read-only, rename-uniquely): Use force-mode-line-update.

(ispell-minor-mode): Use force-mode-line-update.

(double-mode): Use force-mode-line-update.

(gomoku-display-statistics): Use force-mode-line-update.