(libexecdir): Renamed from libdir.

Use libexecdir and sharedstatedir as appropriate.

(libexecdir): Renamed from libdir.  New default.
(sharedstatedir): Renamed from statedir.  New default.
(datadir): New default.

(clean): rm DOC/* and *.tab.[ch].
(distclean): Not here.

(makefile-mode-name): Removed.
(makefile-mode): Skip any number of "#"s at beginning of comments.
(makefile-electric-keys): New variable.
(makefile-electric-dot): Self insert if not at bol.
(makefile-electric-equal): Really self-insert if not at bol.
(makefile-pickup-everything): Prefix arg means force pickups to be
redone.
(makefile-insert-macro-ref): Don't use format.
(makefile-runtime-macros-list): Added "$" to list.
(makefile-insert-special-target): Don't use format.
(makefile-insert-macro): Don't use format.
(makefile-insert-target): Don't use format.
(makefile-insert-target-ref): Don't use format.
(makefile-electric-colon): Really self-insert if not at bol.
(makefile-complete): New function.  Bound to M-TAB.
(makefile-do-macro-insertion): New function.
(makefile-mode-map): Add menu bar bindings.
(makefile-font-lock-keywords): New constant.
(makefile-mode): Deal with font-lock, add-log, imenu.
(makefile-macroassign-regex): Changed for use with font-lock.
(makefile-dependency-regex): Changed for use with font-lock.
(makefile-add-log-defun): New function.
(makefile-menu-index-function): New function.

menu-bar-lines fix.

(scan_buffer): After temporarily turning immediate_quit off, turn it
back on by setting it to allow_quit, never 1.

(find_before_next_newline): Declare the arguments' types explicitly;
don't let them default to int.

(display_scan_buffer): Pass the correct number of arguments to
scan_buffer.

(compare-windows-whitespace): Eliminate initial value.

(tex-region): Don't delete temp files if we do
one buffer twice in a row.

(rmail-find-all-files): Fix several errors and make faster.
Always return a single-level list of file names.
(rmail-construct-io-menu): If FILES is null, turn off the menus.
(rmail-disable-menu): A phony "command", always disabled in menus.
(rmail-list-to-menu): Reverse the list L.

(rmail-summary-resend): New function.
(rmail-summary-mode-map - resend): Call rmail-summary-resend
instead of rmail-resend.

* etags.c (C_entries): Name the #define's that are macros.

(x_term_init): Call XtSetLanguageProc or XSetLocaleModifiers.

(x_make_frame_visible, x_iconify_frame):
Call x_bitmap_icon if frame wants a bitmap icon.

(read_key_sequence): The output of function-key-map
goes to key-translation-map, but not vice versa.
Don't exit if either of them is a possibility.

(font-lock-set-defaults): Do nothing if font-lock-keywords already non-nil.
Use font-lock-defaults.
(font-lock-defaults): New variable.

(normal-top-level-add-to-load-path): New function.
(normal-top-level): Load subdirs.el in each dir in load-path.

Write the subdirs.el file.

Don't distribute subdirs.el.

(print): Check the substructure.

(internal_equal): Check the substructure.

(buffer_slot_type_mismatch): Test against Lisp_Misc.

(MARKER_BLOCK_SIZE, marker_block, marker_free_list): Now refers to the
superset type, not just markers.
(allocate_misc): New function, extracted from Fmake_marker.
(Fpurecopy): Check the substructure.
(clear_marks, mark_object, gc_sweep): Likewise.

(OVERLAY_POSITION): Marker assert now tests substructure.

(Lisp_Misc): new type code, replacing Lisp_Marker (and soon to replace other
type codes as well).
(XMARKER, SETMARKER, MARKERP): Check/set the new type field.
(XMISC, SETMISC, MISCP): New accessor macros for the superset type.
(struct Lisp_Free): New structure.
(Lisp_Misc_Free): Type code for that structure.

(blink-matching-open): Check there is a previous
nonblank line before trying to display it.
No need for backward-char before the skip-chars-backward.

(list_buffers_1): Fix indentation in header lines.

(rmail-summary-rmail-update): Pass new arg to rmail-show-message.

(rmail-show-message): New argument no-summary.

(system-key-alist): Add sun versions of
mute-grave, mute-diaeresis, mute-asciicircum.

(c-mode-map): Use "C mode" for the menu bar item name.

(tcl-mode): imenu-create-index-function made buffer local.

(mouse-select): Pass an arg to mouse-extend.

(sys_subshell): Use NILP macro directly, not its expansion.  Previous code was
leftover from when NULL was a bad word.

(mail-hist-put-headers-into-history)
(mail-hist-current-header-contents, mail-hist-forward-header)
(mail-hist-current-header-name):
Use regexp-quote on mail-header-separator.

Fix typo in previous change.

(calculate-lisp-indent): Local var
last-sexp renamed to calculate-lisp-indent-last-sexp.
(lisp-indent-function): Use new name of var.
(calculate-lisp-indent-last-sexp): Var defined.

(menu-bar-file-menu): Don't include the frame
commands in a non-frame version of Emacs.

entered into RCS

(redisplay_window): Fix Oct 1 change:
don't call cancel_my_columns unless we will call try_window.

(syms_of_buffer): Doc fix for cache-long-line-scans.

[! SYSVIPC] (main): Fix uses of FD_* macros: fd_set arg is a pointer,
descriptor arg comes first.

(calendar-holiday-marker): Copy holiday-face from highlight face.

(ispell-highlight-spelling-error):
Have just one definition, which decides what to do.
(ispell-command-loop): New args START and END.  Do highlighting
and unhighlighting here.
(ispell-word, ispell-region, ispell-complete-word): Not here.
(ispell-highlight-spelling-error-generic): Bind buffer-undo-list to t.

(emacs-lisp-mode-syntax-table): Don't set syntax of formfeed.

(byte-compile-insert-header): Use user-mail-address.

(appt-delete-window): Look on all frames for the window.
(appt-disp-window): If frame is unsplittable, use display-buffer.

* xdisp.c (redisplay_window): Invalidate width_run_cache, if the
buffer's display table doesn't match the width table the cache was
built for.
(display_text_line): Use compute_motion to skip forward to the
left edge of the window when the window is hscrolled; this is
faster than rendering all the characters into the bit bucket when
the hscroll is large.
Doc fixes.
(display_count_lines): Call scan_buffer with new args.

* syntax.c (find_defun_start): Call scan_buffer with new args.

* search.c: #include "region-cache.h".
(max, min): Make these functions, not macros; we'd like to pass
them arguments that would be bad to evaluate more than once.
(newline_cache_on_off): New function.
(scan_buffer): New argument END.  Call newline_cache_on_off.  If
this buffer's newline cache is enabled, consult it to see if we
need to scan a region for newlines, and store information in the
cache after doing so.
(find_next_newline): Pass new arg to scan_buffer.
(find_before_next_newline): New function.

* insdel.c (prepare_to_modify_buffer): Invalidate width run and
newline caches, if they exist.

* indent.h (disptab_matches_widthtab, recompute_width_table): New
declarations.

* indent.c: #include "region-cache.h".
(character_width, disptab_matches_widthtab, recompute_width_table,
width_run_cache_on_off): New functions.
(compute_motion): Call width_run_cache_on_off.  If this buffer's
width run cache is enabled, consult it to see if we need to
traverse a region character-by-character; store information in the
cache after doing so.  Call find_before_next_newline instead of
writing out an equivalent loop explicitly, to take advantage of
the newline cache.
Doc fixes.

* disptab.h (window_display_table): Doc fix.
(buffer_display_table): New declaration.

* cmds.c (Fforward_line): Call scan_buffer with new args.
(Fend_of_line): Replace call to Fforward_line and search loop with
call to find_before_next_newline.

* buffer.h (struct buffer): New members: newline_cache,
width_run_cache, width_table, and cache_long_line_scans.

* buffer.c: #include region-cache.h.
(Fget_buffer_create): Initialize new members of struct buffer.
(Fkill_buffer): Free memory occupied by caches.
(init_buffer_once): Set default value for cache_long_line_scans in
buffer_defaults, and give it a bit in buffer_local_flags.
(syms_of_buffer): Add DEFVAR_PER_BUFFER for cache_long_line_scans.

* Makefile.in.in (obj) Add region-cache.o to the list of files.
(region-cache.o): New target.
(buffer.o, indent.o, search.o): Depend on region-cache.h.

Document cache-long-line-scans in @node Text Lines.
Cross-reference it in @node Screen Lines.

Added entry for cache-long-line-scans

(file_name_completion): Ignore files "." and ".." in first pass.
(Ffile_name_completion): Perform the completion even if the
name part is empty.

(test_completion): New function, extracted from do_completion.
(do_completion): Use test_completion.
(Fminibuffer_complete_and_exit): If completion is already
exact, don't try to complete it.

(add-log-current-defun): In texinfo-mode,
handle the case of no commas after @node.

(inhibit_local_menu_bar_menus): New variable.
(read_char_x_menu_prompt): Optionally don't use local maps.
(syms_of_keyboard): Set up Lisp variable.

(fit_to_screen): Don't put the menu off the left or top.

(rmail-delete-forward): Use rmail-select-summary.

Add a tip about enabling/disabling features.

(enum Lisp_Misc_Type): New type.
(struct Lisp_Marker): Add a member of that type.  Delete unused member
`modified'.

(make_gap): Keep input blocked till after we set BEG_ADDR.

Re-delete code deleted in rms's Oct 5 change.

(compilation-mode-font-lock-keywords,
rmail-summary-font-lock-keywords, dired-font-lock-keywords,
shell-font-lock-keywords, texi-font-lock-keywords,
perl-font-lock-keywords): Deleted.

(font-lock-mode): Doc fix; use add/remove-hook, not
setq; removed make-local-variable of font-lock-no-comments.
(font-lock-set-defaults): Do it there, and use:
(font-lock-defaults-alist): Use it to set font-lock-keywords,
font-lock-keywords-case-fold-search and font-lock-no-comments.
(turn-on-font-lock): New function.
(font-lock-fontify-buffer): Made interruptible; deleted messages.

(font-lock-fontify-region): Made syntax state reliable
by widening within new restriction; let cstart and cend for speed;
outputs message.
(font-lock-after-change-function): Remove spurious goto-char and use
forward-line, not 1+ end-of-line, for end of fontification region.
(font-lock-any-properties-p): Removed, use text-property-not-all.

(font-lock-*-face): facename values are themselves.
(font-lock-variable-name-face, font-lock-reference-face): New vars.
(font-lock-doc-string-face): Removed.
(font-lock-keywords): Extended value syntax.
(font-lock-hack-keywords): Cope with it; outputs initial message.

Merged in face-lock.el:
(font-lock-display-type, font-lock-background-mode)
(font-lock-face-attributes): New variables, use it.
(font-lock-make-face): New function, use them.

(comint-check-proc): Recognise `open'.
(comint-exec): Use open-network-stream if command is a cons pair.

(pascal-font-lock-keywords):  New variable.
(pascal-mode): Set comment-start-skip and comment-end.
Set font-lock-keywords locally.

(perl-font-lock-keywords): New variable.

(perl-mode): Set font-lock-keywords locally.

(asm-font-lock-keywords): New variable.

(asm-mode): Set font-lock-keywords locally.

(texinfo-font-lock-keywords): New variable.

(texinfo-mode): Set font-lock-keywords locally.

(shell-font-lock-keywords): New variable.

(shell-mode): Set font-lock-keywords locally.

(dired-font-lock-keywords): New variable.

(dired-mode): Set font-lock-keywords locally.

(mail-font-lock-keywords): New variable.

(mail-mode): Set font-lock-keywords locally.

(rmail-font-lock-keywords): New variable.

(rmail-variables): Set font-lock-keywords locally.

(rmail-summary-font-lock-keywords): New variable.

(rmail-summary-mode): Set font-lock-keywords locally.

(outline-font-lock-keywords): New variable.

(outline-mode): Set font-lock-keywords locally.

(change-log-mode): Set font-lock-keywords locally.

(change-log-font-lock-keywords): New variable.

(compilation-mode-font-lock-keywords): New variable.

(compilation-mode): Use kill-all-local-variables.
Set font-lock-keywords locally.

(sh-font-lock-keywords): Default to nil.

(check_writable, check_executable): Test HAVE_EACCESS.

(eaccess): Check for it.

(HAVE_EACCESS): Add #undef.

(HAVE_MKTIME): Add #undef.

Patch to handle old Convex systems (without uname).

(Lisp_Void, VOIDP): Deleted.

(Fboundp, Ffboundp, find_symbol_value, Fset, Fdefault_boundp, Fdefault_value):
Don't check for Lisp_Void; nothing ever creates that type.

(Fbyte_code): Delete case Lisp_Void.

(mark_object): Delete case Lisp_Void.

(Flsh, Fadd1, Fsub1, Flognot): Don't use XFASTINT when negative.

(Fabs): Don't use XFASTINT when negative.

(Fset, default_value, Fset_default, Fkill_local_variable): Access
buffer_local_flags as Lisp_Object, not int.

(defvar_per_buffer): Access buffer_local_flags as Lisp_Object, not int.
Give XSETBUFFER_OBJFWD an integer offset, not a pointer.

(init_buffer_once): Don't use XSETFASTINT when negative.
(reset_buffer_local_variables, Fbuffer_local_variables): Access
buffer_local_flags as Lisp_Object, not int.

(Fload, load_unwind): Store stream pointer as a cons of two integers,
obviating the need for Lisp_Internal_Stream datatype.

(Lisp_Internal_Stream, XSETINTERNALSTREAM, INTERNALSTREAMP): Deleted.

(mark_object): Delete case Lisp_Internal_Stream.