(do_switch_frame): Don't call choose_minibuffer_frame.
(choose_minibuf_frame): Choose frame regardless of minibuffer level.

(echo_area_display): Use selected frame's minibuf window
but don't set the minibuf_window (don't call choose_minibuffer_frame).
(message2_nolog, message): Likewise.
(echo_area_window): New variable.
(echo_area_display): Set echo_area_window.
(redisplay_window): Distinguish minibuf_window and echo_area_window.

(redisplay): Skip shortcuts if buffer's clip_changed is set.
(redisplay_window): If buffer's clip_changed is set, update mode line.

(command_loop_1): Clear echo area after 2 sec
only if the minibuffer is in the same place as the echo area.

(update_frame): Check that the echo area is in the frame being displayed.

(font-lock-make-faces): Redo logic for whether
to call font-lock-make-face for a given face.

(syms_of_xmenu): Set up Qdebug_on_next_call.
(set_frame_menubar): Bind it to nil.

(indent-new-comment-line): fill-prefix overrides comment indentation.

(Fformat): Doc fix.

(Fsubst_char_in_region): Bind buffer-file-name to nil if NOUNDO is true.

(prepare_to_modify_buffer): Don't lock the file
if current_buffer->filename is nil.

Update disk requirements.
Document `make clean'.
Update directory descriptions.

(local-variables-section): Delete autoload cookie.
(skeleton-pair-insert-maybe): Renamed from pair-insert-maybe.
(skeleton-pair, skeleton-pair-filter, skeleton-pair-alist)
(skeleton-pair-on-word): Renamed from pair-...
(mirror-mode): Commented out.

(Fsafe_length): Use conservative upper bound.

Comment change.

[USE_MOTIF]: Don't include X11/Xaw/Paned.h, X11/Xaw/Label.h.

(init_callproc): Set Vdoc_directory based on
Vinstallation_directory when that's non-nil, regardless of whether
we had to set Vexec_directory.

(init_environment): Move alloca call out of function arg.

(mail-fetch-field): Use buffer-substring-no-properties.

[!MULTI_FRAME] (BASE_PURESIZE): Increased to 325000.

(derived-mode-set-keymap): Cope if old-map is nil.

(menu-bar-update-yank-menu): Treat all-dashes specially.

M-ESC => M-:

(unload_color): Don't free colors if immutable colormap.

(mail-default-reply-to): Doc fix.

(backquote): Doc fix.

(init_alloc_once): Set gc_cons_threshold from Lisp obj size.

(outline-next-visible-heading): Rewritten to handle
backwards motion and handle beg/end of buffer properly.

(Fformat): Increment total for size of control string.

(Fmessage): Doc fix.

(electric-helpify): Autoload with-electric-help, electric-helpify.

Update overriding-local-map-menu-flag.

Document overriding-terminal-local-map.

(decode_mode_spec): New arg spec_width.
Use pint2str for %l and %c.  New code to output ??.
(display_mode_element): New var minendcol.
Pass new arg to decode_mode_spec.
(pint2str): New function.

(Fwindow_start): Doc fix.

Explain how redisplay updates window-start.

(font-lock-defaults): New variable.
(nroff-mode-syntax-table): New variable to provide comment syntax
for font-lock; I'm not sure if this is (or should be) necessary in
19.29 with font-lock-defaults.
(nroff-font-lock-keywords): New variable.
(nroff-mode): Install nroff syntax table and font lock keywords.
Comment about comments in filling and line-counting.

Fix update of finder-inf.el, and byte-compile it.

(forward-same-syntax): New function.

Don't (require 'backquote).

(mouse-extend-internal): Select space in between "things" when
extending selection, ie. we are extending to "thing" boundaries.

Use x-lost-selection-hooks to handle loss of selection.
(mouse-sel-lost-selection-hook): New function.
(mouse-sel-selection-owner-p-function): Variable removed.
(mouse-sel-selection-owner-p): Function removed.
(mouse-sel-validate-selection): Function removed.

(file-name-sans-versions): Recognize version control version numbers.

(vc-mode-line, vc-find-file-hook): Moved the test for
version-controlled symbolic link from the former to the latter.

(vc-do-command): Added parameter BUFFER (the default,
if nil, is *vc*). Updated all callers.
(vc-next-action-on-file, vc-diff, vc-version-diff, vc-backend-diff):
Use buffer *vc-diff* for diff output instead of *vc*.

(menu-bar-tools-menu): Don't define gnus entry if no network support.

(auto-mode-alist): Recognize *.ads and *.adb as Ada specs and bodies.

(ada-ident-re): Doc fix.
(ada-end-stmt-re): Corrected serious pb of wrong parentheses.
(ada-subprog-start-re): Removed 'body' from the list.
(ada-format-paramlist): Simplified a regexp.
(ada-indent-current): On first line of the buffer, indent to column 0.
Don't reindent if new position is the same as the old one.  Thus, a
correcly indended line is not modified.
(ada-get-indent-subprog): Simplified a regexp.
(ada-goto-matching-decl-start): Distinguish between normal type
declaration and protected types, which are more like procedures.
(ada-remove-trailing-spaces): Use save-match-data, save-restriction
and widen when removing whitespace.
(ada-font-lock-keywords-1): Add 'pragma' as keyword.
(ada-font-lock-keywords-2): Allow *qualified* idents after 'end'.

(SUNOS4_SHARED_LIBRARIES): Defined.

(unexec): If not SUNOS4_SHARED_LIBRARIES
or if apparently not dynamically linked, just clear rel and erel.

(Ffuncall, Fapply): Doc fix.

(Fcall_interactively): Doc fix.

(x-create-frame-with-faces):
Specify frame arg to x-color-values and frame-parameters.
(set-face-background): Pass background-p arg to face-color-supported-p.

Rename {src,lib-src}/Makefile.in.in to Makefile.in.
Use Makefile.c for intermediate file.
Rename src/config.h.in to src/config.in.

(src/paths.h, paths-force): Rename src/paths.h.in to src/paths.in.
(Makefile): Depend on src/Makefile.in, not src/Makefile.in.in.

(distclean): Delete Makefile.c, not Makefile.in.

(distclean): Delete Makefile.c, not Makefile.in.
(SOURCES): Corresponding changes for file renamings.

(paths.h): Depend on paths.in.
(config.h): Depend on config.in.

Fix the other instance too.

(Fbyte_code): Fix variable names in previous change.

(mouse_get_pos, mouse_check_moved, XMenuActivate):
Access mouse_moved in selected_frame.

Comment change.

(mouse_moved): Variable deleted.
(kbd_buffer_get_event, readable_events):
Check mouse_moved in all frames.
Check do_mouse_tracking for non-nil ness.
(Ftrack_mouse): Set do_mouse_tracking to t.
(kbd_buffer_get_event): Discard a selection_clear_event
before processing it.

Fix conditional.

(bookmark-make): Strip text properties off name.
(bookmark-make-cell): Use `buffer-substring-no-properties'.
(bookmark-yank-word): Use buffer-substring-no-properties.

(electric-buffer-list): Save point before
finding the first buffer line, and use that saved point to
determine the buffer to use, if it is a reasonable value.

(ff-set-point-accordingly): Doc fix.

(vc-backend-merge-news): Force to refetch the
properties after the merge.

(shell-command): Use save-match-data.
Put the buffer in shell mode, don't use shell-command-filter.
(shell-command-filter): Deleted.
(shell-command-sentinel): Don't reset the mode line.
Don't test the buffer name--what was that for, anyway?.
(column-number-mode): New variable and new command.

(mail-setup-hook): New defvar.
(mail): Doc fix.

(normal-top-level): Don't use mail-host-address
for auto-save-list-file-name.

(x-create-frame-with-faces): Set background-mode
and display-type frame parameters.
(x-frob-font-slant, x-frob-font-weight):
Replace the adstyle field with *, if we can find it.
(set-face-background): Use face-color-supported-p.
(face-color-gray-p): New function.
(face-default-stipple): New variable.
(set-face-background): Use face-default-stipple for all grays.
(set-face-stipple): Change arg name.
(face-color-supported-p): Use face-color-gray-p.

(vc-mode-line): Don't write-protect a
VC-Log buffer.  Better mode line text for initial comments.
Streamlined the function.
(vc-locking-user): Consider a cvs file "locked"
if its status is either 'locally-modified or 'needs-merge.
(vc-workfile-version): Catch 'found when calling vc-find-cvs-master.
(vc-fetch-master-properties): Handle cvs status "Needs Checkout".
This is intended for future use.
(vc-fetch-master-properties): Shrink the window
that displays the error message.

(remote-shell-program): Try rcmd also.

(ediff-skip-unsuitable-frames): Use make-frame,
not ediff-make-frame.

(menu-bar-help-menu): Add finder-by-keyword.

(canonically-space-region): Doc fix.
(fill-region-as-paragraph): In adaptive-fill-mode,
if paragraph has one line, take the fill prefix from it.
(adaptive-fill-regexp): Doc fix.
(fill-individual-paragraphs): Use `adaptive-fill-regexp'
to determine `fill-prefix' if `adaptive-fill-mode' is non-nil.

(vendor-specific-keysyms):
In Sun keys, f36 was misnamed f35 and f37 misnamed f36.

(dabbrev--search): Don't let spurious match in middle
of word obscure real match at start of same word.

(auto-mode-alist): Move .scm.[0-9] before nroff-mode.
Escape the second period.

(mouse-major-mode-menu): Catch quit in read-key-sequence.
(mouse-major-mode-menu): Don't call command-execute
if lookup-key gives nil.

(byte-compile-output-file-form): Bind print-length
and print-level to nil.

(add-log-current-defun): Handle C struct definitions.
(add-change-log-entry): Use case-sensitive search for file name.
Find first blank line correctly.

(byte-optimize-nth, byte-optimize-nthcdr):
Do nothing if form wrong length.
(byte-optimize-multiply): Fix bug in 0 case.
(byte-optimize-divide): Optimize (/ CONST CONST) if safe.
(byte-optimize-logmumble): Fix (logior -1 ...) case.
(byte-optimize-if): Optimize (if (not foo) nil ...).

Add provide.

[linux]: Include values.h and #undef
certain macros, to avoid conflict later.

(sys_close): Handle Sunos 4.1 bug in close errno value.
(init_system_name): Add cast in init for fqdn.

(Fx_list_fonts): Don't free thisinfo if it is 0.

(Fread): Rename arg READCHARFUN to STREAM.

(win32_mouse_position, mouse_moved_to):
Access mouse_moved in selected_frame.

(struct frame): New field `mouse_moved'.

(current_minor_maps): Catch errors in Findirect_function.
(current_minor_maps_error): New function.

(keyboard_bit_set): Fix one-off in loop end.

(Fwrite_region): If fsync fails with EINTR, don't
report a Lisp error.

(lispsource): Renamed from lispdir.
(TAGS): Use etags from build dir, but make TAGS
file in source dir.
(${lispsource}TAGS): Renamed from ../lisp/TAGS.  Deps changed too.
(tags): Corresponding changes.
(lisptagsfiles): Delete the term/*.el files.

(last_overlay_modification_hooks): New variable.
(last_overlay_modification_hooks_used): Likewise.
(syms_of_buffer): Init last_overlay_modification_hooks.
(add_overlay_mod_hooklist): New function.
(call_overlay_mod_hooks): Call add_overlay_mod_hooklist.
(report_overlay_modification): When AFTER is non-nil,
call the functions recorded in last_overlay_modification_hooks.

(Fexpt): Use EMACS_INT for integer calculation.
(Ffloor): Likewise.

(_setjmp, _longjmp): Add #undef's.

(SCO_R4): Defined.

(AMPERSAND_FULL_NAME): Defined.

(main): Add to usage message.

(Fsit_for): Don't call prepare_menu_bars here.

(x_clear_frame_selections): Delete duplicate code.