* Makefile.in (${lisp} ${SOME_MACHINE_LISP}, ../lisp/loaddefs.el):
Use $(BOOTSTRAPEMACS) rather than witness-emacs.
(bootstrap-emacs${EXEEXT}): Merge witness-emacs into it.
(witness-emacs): Remove.
(lisp, shortlisp): Move loaddefs.el earlier.
(mostlyclean): Forget about witness-emacs.
* Makefile.in (COMPILE_FIRST): Trim down and add autoload.el.
(bug-reference-url-format): Autoload safe if string.
(bug-reference-bug-regexp): Make space after "bug" optional.
(bug-reference-fontify): Save match data.
(calendar-month-digit-width, calendar-month-width)
(calendar-right-margin): New variables.
(calendar-recompute-layout-variables, calendar-set-layout-variable):
New functions.
(calendar-left-margin, calendar-intermonth-spacing)
(calendar-column-width, calendar-day-header-width)
(calendar-day-digit-width): New options.
(calendar-first-date-row): New constant.
(calendar-move-to-column, calendar-ensure-newline): New functions,
replacing calendar-insert-indented.
(calendar-insert-indented): Remove function.
(calendar-generate-month): Use calendar-move-to-column and
calendar-ensure-newline. Use layout variables.
(calendar-generate, calendar-update-mode-line)
(calendar-font-lock-keywords): Use layout variables.
(calendar-column-to-month): New function.
(calendar-cursor-to-date): Use calendar-column-to-month.
Use layout variables.
(${lisp} ${SOME_MACHINE_LISP}): Remove pseudo dependency on PRECOMP.
(witness-emacs): Run `compile-first'.
(.el.elc): Use the new compile-onefile target.
* lisp/Makefile.in (update-elclist): Don't exclude COMPILE_FIRST.
(all): Run compile-last.
(compile-onefile): New target.
(compile-first): Simplify.
(compile-last): Don't treat COMPILE_FIRST specially.
(COMPILE_FIRST): List the elc files rather than the el files.
(ELCFILES): Update.
(rst-mode): Don't set the font-lock-multiline var.
(rst-font-lock-find-unindented-line, rst-font-lock-handle-adornment):
Set the font-lock-multiline property by hand.
* src/Makefile.in (emacs${EXEEXT}): Link the new emacs to bootstrap-emacs.
(bootstrapclean): Remove.
(.el.elc): New rule.
(PRECOMP): New var.
(../lisp/subdirs.el): Remove.
(bootstrap-emacs${EXEEXT}): Remove subdirs.el and charpro.el dependency.
(witness-emacs): New target.
(mostlyclean): Remove witness-emacs as well.
(../lisp/loaddefs.el, ${lisp} ${SOME_MACHINE_LISP}):
Add witness-emacs dependency.
* lisp/loadup.el: Don't add emacs-<VERS> name when bootstrapping.
* lisp/Makefile.in (emacs-deps): Remove.
($(lisp)/cus-load.el, $(lisp)/finder-inf.el): Re-add.
(all): Use them.
(autogen-clean): Remove.
* Makefile.in (maybe_bootstrap, src/bootstrap-emacs${EXEEXT})
(bootstrap-build): Remove.
(top_bootclean): New var.
(top_distclean, bootstrap-clean): Use it.
(bootstrap): Don't recheck config. Make normally.
(bootstrap-clean): New target that keeps TAGS around.
(../lisp/subdirs.el, ../lisp/loaddefs.el): New targets.
(bootstrap-emacs${EXEEXT}): Depend on subdirs.el.
* lisp/Makefile.in (all): New target.
(bootstrap-prepare): Remove.
* Makefile.in (SUBDIR): Include `lisp'.
(lisp): Depend on `src'.
(top_distclean): Don't remove config.status.
(bootstrap-clean): New target.
(maintainer-clean): Use it.
(bootstrap): Use bootstrap-clean. Re-run config.status.
(src/bootstrap-emacs${EXEEXT}): New target.
(bootstrap-build): Use it. Don't use bootstrap-prepare because
src/Makefile now takes care of it.
(bootfast, bootstrap-clean-before, bootstrap-clean-before-fast): Remove.
Move vars to before their first use.
(rst-mode): Don't mess with font-lock-support-mode.
(rst-suggest-new-decoration, rst-adjust-decoration):
Avoid CL's copy-list.
(rst-delete-entire-line): Use line-beginning-position.
(rst-position): New fun.
(rst-straighten-decorations): Use it instead of CL's position.
(rst-straighten-bullets-region): Avoid CL's mapcar*.
(rst-toc-mode): Use define-derived-mode.
(rst-iterate-leftmost-paragraphs, rst-iterate-leftmost-paragraphs-2):
Remove unused var `in-par'. Use `point' rather than `point-marker'.
(rst-line-block-region): Reduce redundancy. Use the `pfxarg' arg.
(rst-replace-lines): Simplify.
cus-load.el with `echo', and include "Local Variables" section to prevent
the empty file from being compiled.
(cus-load.el-SH, cus-load.el-CMD): New SHELLTYPE-specific targets that
generate an empty cus-load.el.
Don't copy ldefs-boot.el over loaddefs.el.
(bootstrap-clean): Remove loaddefs.el and don't depend on it.
(loaddefs.el-SH, loaddefs.el-CMD): Don't add autoloads and defvars
to loaddefs.el; they are not needed now. Add coding cookie.
