changeset 31883:c2b1c16d926c

*** empty log message ***

--- a/ChangeLog	Mon Sep 25 15:41:30 2000 +0000
+++ b/ChangeLog	Mon Sep 25 15:42:25 2000 +0000
@@ -471,6 +471,52 @@
 
 	* configure.in: Grok sparc64-*-linux-gnu*.
 
+After the release of 20.4, development was split into two separate
+code lines.  One line contained the code for Emacs 21, and the other
+one the code for the 20.x releases after 20.4.  The following change
+log entries up to the entry ``20.4 released'' are for the 20.x code
+line.  Change logs above this notice are those for the 21.x code line.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* Version 20.7 released.
+	
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* configure.in: Add powerpc*-*-linux-gnu*.
+
[phone]  NIIBE Yutaka  <[e-mail]>
+
+	* configure.in: Check for grandpt and getpt.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* Version 20.6 released.
+	
[phone]  Dave Love  <[e-mail]>
+
+	* configure.in: Define NON_GNU_CPP on alpha-dec-osf5+.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* configure.in: Add support for arm*-g*-linux-gnu* systems.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* Version 20.5 released.
+	
[phone]  Dave Love  <[e-mail]>
+
+	* configure.in: Recognize sparc64-*-linux-gnu*.
+
[phone]  Erik Naggum  <[e-mail]>
+
+	* configure.in (bitmapdir): Allow for both "bitmaps" directories.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* config.bat: Make --no-debug work again by removing -gcoff.
+
 1999-07-12  Richard Stallman  <[e-mail]>
 
 	* Version 20.4 released.

--- a/etc/ChangeLog	Mon Sep 25 15:41:30 2000 +0000
+++ b/etc/ChangeLog	Mon Sep 25 15:42:25 2000 +0000
@@ -161,6 +161,28 @@
 
 	* TUTORIAL.ro: Change copyright statement.
 
+After the release of 20.4, development was split into two separate
+code lines.  One line contained the code for Emacs 21, and the other
+one the code for the 20.x releases after 20.4.  The following change
+log entries up to the entry ``20.4 released'' are for the 20.x code
+line.  Change logs above this notice are those for the 21.x code line.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* Version 20.7 released.
+	
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* Version 20.6 released.
+	
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* Version 20.5 released.
+	
[phone]  Paul Eggert  <[e-mail]>
+
+	* PROBLEMS: Update Solaris 2.6 and 7 problems.
+
 1999-07-12  Richard Stallman  <[e-mail]>
 
 	* Version 20.4 released.

--- a/leim/ChangeLog	Mon Sep 25 15:41:30 2000 +0000
+++ b/leim/ChangeLog	Mon Sep 25 15:42:25 2000 +0000
@@ -165,6 +165,50 @@
 	("turkish-alt-postfix"): New Turkish input method which inserts
 	Latin-5 characters.
 
+After the release of 20.4, development was split into two separate
+code lines.  One line contained the code for Emacs 21, and the other
+one the code for the 20.x releases after 20.4.  The following change
+log entries up to the entry ``20.4 released'' are for the 20.x code
+line.  Change logs above this notice are those for the 21.x code line.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* Version 20.7 released.
+	
[phone]  Andrew Innes  <[e-mail]>
+
+	* makefile.nt ($(TIT)): Set emacs_dir in the environment before
+	running emacs, to ensure load-path is correct.
+	(leim-list.el): Ditto.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* Version 20.6 released.
+	
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* Version 20.5 released.
+	
[phone]  Andrew Innes  <[e-mail]>
+
+	* makefile.nt: No need to generate subdirs.el.
+
[phone]  Andrew Innes  <[e-mail]>
+
+	* makefile.nt: New file.
+
[phone]  Ken'ichi Handa  <[e-mail]>
+
+	* quail/latin-alt.el ("turkish-latin-3-alt-postfix"): Renamed from
+	turkish-postfix.
+	("turkish-postfix"): New Turkish input method which inserts
+	Latin-5 characters.
+
+	* quail/latin-alt.el ("turkish-latin-3-alt-postfix"): Renamed from
+	turkish-alt-postfix.
+	("turkish-alt-postfix"): New Turkish input method which inserts
+	Latin-5 characters.
+
 1999-07-12  Richard Stallman  <[e-mail]>
 
 	* Version 20.4 released.

--- a/lib-src/ChangeLog	Mon Sep 25 15:41:30 2000 +0000
+++ b/lib-src/ChangeLog	Mon Sep 25 15:42:25 2000 +0000
@@ -464,6 +464,33 @@
 	* grep-changelog: New.
 	* Makefile.in (INSTALLABLE_SCRIPTS): Add it.
 
+After the release of 20.4, development was split into two separate
+code lines.  One line contained the code for Emacs 21, and the other
+one the code for the 20.x releases after 20.4.  The following change
+log entries up to the entry ``20.4 released'' are for the 20.x code
+line.  Change logs above this notice are those for the 21.x code line.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* Version 20.7 released.
+	
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* Version 20.6 released.
+	
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* Version 20.5 released.
+	
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* Makefile.in (b2m): Add dependency on GETOPTDEPS.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* emacsclient.c, etags.c: Change email address to send bugs
+	to.
+
 1999-07-12  Richard Stallman  <[e-mail]>
 
 	* Version 20.4 released.

--- a/lisp/ChangeLog	Mon Sep 25 15:41:30 2000 +0000
+++ b/lisp/ChangeLog	Mon Sep 25 15:42:25 2000 +0000
@@ -1,5 +1,9 @@
 2000-09-25  Gerd Moellmann  <[e-mail]>
 
+	* bytecomp.el (byte-compile-defvar-or-defconst): Only cons onto
+	current-load-list in top-level forms.  Else this leaks a cons cell
+	every time a defun is called.
+	
 	* mail/mail-utils.el (rmail-dont-reply-to): Fix last change.
 	
 2000-09-25  Dave Love  <[e-mail]>

--- a/lisp/ChangeLog.8	Mon Sep 25 15:41:30 2000 +0000
+++ b/lisp/ChangeLog.8	Mon Sep 25 15:42:25 2000 +0000
@@ -4712,6 +4712,426 @@
 
 	* webjump.el (webjump-sample-sites): Update some URLs.
 
+After the release of 20.4, development was split into two separate
+code lines.  One line contained the code for Emacs 21, and the other
+one the code for the 20.x releases after 20.4.  The following change
+log entries up to the entry ``20.4 released'' are for the 20.x code
+line.  Change logs above this notice are those for the 21.x code line.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* Version 20.7 released.
+	
[phone]  Kenichi Handa  <[e-mail]>
+
+	* textmodes/fill.el (fill-find-break-point): Check the validity of
+	charset.
+
[phone]  Andrew Innes  <[e-mail]>
+
+	* browse-url.el (browse-url-filename-alist) [windows-nt, ms-dos]:
+	Conditionalize last change for DOS/Windows only.
+
+	* browse-url.el (browse-url-of-buffer): Add comment for last change.
+
[phone]  Andrew Innes  <[e-mail]>
+
+	* browse-url.el (browse-url-of-buffer): Ensure that file-name ends
+	with .htm or .html, otherwise browse-url-of-file fails on Windows.
+
[phone]  Andrew Innes  <[e-mail]>
+
+	* browse-url.el (browse-url-filename-alist): Support Windows-style
+	filenames with drive specifiers.
+
+	* arc-mode.el (archive-zip-use-pkzip) [windows-nt]: Don't use
+	pkzip on Windows by default, as InfoZIP works better.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* isearch.el (isearch-printing-char): Don't test for `cpXXX'.
+
[phone]  Andrew Innes  <[e-mail]>
+
+	* w32-fns.el (isearch-mode-map): Ignore language-change events in
+	isearch.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* isearch.el (isearch-forward): Extend doc string.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* tmm.el (tmm-prompt): Recognize menu item definitions of the for
+	`(menu-item ...)' when looking for the position of DEFAULT-ITEM.
+
+	* paths.el (Info-default-directory-list): Doc fix.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* dabbrev.el (dabbrev-expand): Don't display messages in the
+	echo area if the minibuffer window is active.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* isearch.el (isearch-printing-char): If in Encoded Kbd mode,
+	decode the character by the current keyboard coding system.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* mail/rmail.el (rmail-retry-failure): Always unprune the header
+	after calling rmail-beginning-of-message.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* progmodes/sh-script.el (sh-ancestor-alist): Add `bash2'.
+
+	* files.el (interpreter-mode-alist): Add `bash2'.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* international/ccl.el (ccl-compile-write-string): Make STR
+	unibyte.
+	(ccl-compile-write-repeat): If ARG is string, make it unibyte.
+
[phone]  Espen Skoglund  <[e-mail]>
+
+	* pascal.el (pascal-indent-alist) (pascal-indent-comment): Changed
+ 	the indent-comment function to just return the appropriate indent.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* international/encoded-kb.el: Be sure to update minor-mode-alist
+	and minor-mode-map-alist.
+	(encoded-kbd-self-insert-iso2022-8bit): Handle ISO's single shift
+	codes SS2 and SS3 correctly.
+	(encoded-kbd-self-insert-ccl): New function.
+	(encoded-kbd-setup-keymap): New function.
+	(encoded-kbd-mode): Handle CCL based coding system.  Setup keymap
+	by calling encoded-kbd-setup-keymap.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* ange-ftp.el (ange-ftp-skip-msgs): Include 500 code.for
+	handling FTP security extensions.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* mail/undigest.el (undigestify-rmail-message): Recognize end
+	of digest differently.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* simple.el (kill-region): Bind both undo-strong-limit and
+	undo-limit.  Add in the values of the global bindings.
+
+	* language/european.el (iso-latin-4): Fix typo.
+	
+	* textmodes/texinfmt.el (texinfo-format-xref): Don't try to insert
+	nil.
+	
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* ediff.el (ediff-buffers-internal): Bind ediff-job-name to the
+	job-name argument when writing buffers to temporary files.
+
+	* ediff-util.el (ediff-make-temp-file): Bind
+	coding-system-for-write to no-conversion if we are comparing
+	buffers (as opposed to files).
+
+	* ediff-diff.el (ediff-exec-process): If we are comparing buffers,
+	bind coding-system-for-read to no-conversion.  On DOS and Windows,
+	when comparing 2 buffers, add --binary to the switches passed to
+	Diff.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* Version 20.6 released.
+	
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* emacs-lisp/helper.el (Helper-describe-mode): Make buffer
+	writable.
+
[phone]  Andrew Innes  <[e-mail]>
+
+	* dos-w32.el (file-name-buffer-file-type-alist): Add missing $ to
+	the end of one of the regexps.
+
[phone]  Gerd Moellmann  <[e-mail]>
+	
+	* progmodes/pascal.el (pascal-mode-syntax-table): Change syntax
+	of `*' to handle `(* ... *)' comments.
+	
[phone]  Francesco Potorti`  <[e-mail]>
+
+	* mail/rmail.el (rmail-retry-failure): Use
+	rmail-beginning-of-message before rmail-toggle-header, because the
+	former toggles headers.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* ange-ftp.el (ange-ftp-write-region): Handle case that
+	succeeding process operation sets a different coding system.
+
[phone]  Dave Love  <[e-mail]>
+
+	* timezone.el (timezone-fix-time): Window against 69 for two-digit
+	years.  Deal with three-digit years.
+	
[phone]  Andre Spiegel  <[e-mail]>
+
+	* vc.el (vc-version-diff): Make sure file name is
+	expanded.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* vc-hooks.el (vc-parse-buffer): Handle mixtures of dates
+	before and after the year 2000.
+
[phone]  Dave Love  <[e-mail]>
+
+	* browse-url.el (browse-url): Fix case of
+	browse-url-browser-function being an alist.
+	
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* Version 20.5 released.
+	
[phone]  Kenichi Handa  <[e-mail]>
+
+	* international/mule-util.el (truncate-string-to-width): Docsting
+	fixed.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* vc.el (vc-update-change-log): Look for rcs2log under
+	exec-directory.
+
[phone]  Ken'ichi Handa  <[e-mail]>
+
+	* international/mule.el (charsetp): Fix typo in docstring.
+
+	* international/mule-diag.el (list-coding-categories): Fix typo;
+	automatic -> autoload.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* calendar/appt.el (appt-convert-time): Handle "12:MMam", 
+	remove extraneous string-match.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* international/mule-cmds.el (select-safe-coding-system): Use
+	display-buffer to show the current buffer instead of showing
+	it in the selected window.   Check existence of "*Warning*" buffer
+	before deleting it.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* finder.el (finder-commentary): Activate Finder mode.
+
[phone]  Anders Lindgren  <[e-mail]>
+
+	* autorevert.el (auto-revert-buffers): Auto-revert mode was turned
+	off when reverting buffers that contained mode specifiers.
+	`revert-buffer' is now called with non-nil PRESERVE-MODES
+	argument.
+
[phone]  Dave Love  <[e-mail]>
+
+	* dired.el (dired-move-to-filename-regexp): Make it work
+	for LANG=de_DE.iso88591 on HPUX 11.0.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* progmodes/f90.el (f90-abbrev-start): Use `eq' instead of `='.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* international/mule.el (set-auto-coding): Call set-auto-coding-1
+	with save-match-data.
+	(set-auto-coding-1): New function.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* locate.el (locate-with-filter): Doc fix.
+
[phone]  Andrew Innes  <[e-mail]>
+
+	* w32-win.el (w32-drag-n-drop): Load files in current window, if
+	drop coords aren't over a specific window.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* emacs-lisp/advice.el (ad-special-forms): Check whether track-mouse
+	is defined.
+
[phone]  Ken'ichi Handa  <[e-mail]>
+
+	* ps-mule.el (ps-mule-font-info-database-bdf): BDF font for
+	chinese-sisheng charset is 7bit encoding, not 8bit.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* mail/rmailedit.el (rmail-cease-edit): Run rmail-mode-hook.
+
[phone]  Andrew Innes  <[e-mail]>
+
+	* select.el (x-set-selection): Call buffer-substring, not
+	substring.  Also fix docstring
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* replace.el (perform-replace): Temporarily disable
+	case-fold-search if search argument contains uppercase
+	characters.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* mail/mh-comp.el (mh-smail-batch): If `to' is nil use an
+	empty string as to-address.
+
[phone]  Andrew Innes  <[e-mail]>
+
+	* dos-w32.el (direct-print-region-helper): Quote arguments in case
+	they contain spaces.
+	
[phone]  Edward M. Reingold  <[e-mail]>
+
+	* calendar.el (redraw-calendar): Move to nearest date before
+	redrawing.
+
+	* diary-lib.el (simple-diary-display): Reset modeline even if
+	there are no diary entries since the diary buffer may be displayed.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* international/mule-cmds.el (read-input-method-name): Handle the
+	case that the arg DEFAULT is symbol.
+
+	* international/mule-diag.el (mule-diag): Handle the case that
+	default-input-method is symbol.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* language/cyrillic.el (cyrillic-koi8-r-decode-table): Map 8-bit
+	code not used by KOI8 to the same 8-bit code instead of mapping to
+	SPC.
+	(cyrillic-alternativnyj-decode-table): Likewise.
+
+	* ps-mule.el (ps-mule-begin-job): Fix malformed regexp.
+	(ps-mule-font-info-database-ps): Typo fixed (normat->normal).  Use
+	correct font names for Korean (Munhwa-Regular-KSC-EUC-H and
+	Munhwa-Bold-KSC-EUC-H).
+
[phone]  Dave Love  <[e-mail]>
+
+	* paren.el (show-paren-mode): Add autoload cookie.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* language/european.el ("Turkish"): New language environment.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* info.el (Info-directory-list): Don't test existence of ALTERNATIVE
+	if we know for some other reason it should not be used.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* vc.el (vc-backend-merge-news): Fix regexp to also match P marker
+	from cvs update.
+
[phone]  Richard Stallman  <[e-mail]>
+
+	* simple.el (shell-command-on-region): EXIT-STATUS can be a string.
+
+	* info.el (Info-search): Don't lose with empty regexp.
+
[phone]  Dave Love  <[e-mail]>
+
+	* help.el (describe-variable): Fix test for customizability.
+
[phone]  Dave Love  <[e-mail]>
+
+	* font-lock.el (global-font-lock-mode): Add autoload cookie and
+	:initialize method.
+
[phone]  Richard Stallman  <[e-mail]>
+
+	* gud.el (gud-make-debug-menu): Make a child for the
+	local menu, for its menu bar, and the debug menu.
+
[phone]  Edward M. Reingold  <[e-mail]>
+
+	* diary-lib.el (list-diary-entries): Make sure two-digit years
+	have leading zeros.
+
[phone]  Richard Stallman  <[e-mail]>
+
+	* vc.el (vc-annotate-display): Use < 69 not < 70
+	to distinguish 20YY from 19YY. 
+
+	* timezone.el (timezone-parse-date): Use < 69 not < 70
+	to distinguish 20YY from 19YY.
+
+	* mail/rmail.el (rmail-retry-failure): Unconditionally move
+	to beginning of message.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* dired.el (dired-re-dir, dired-re-sym): Don't match DOS drive
+	letters with a colon after d or l.
+
[phone]  Richard Stallman  <[e-mail]>
+
+	* vc.el (vc-annotate-display): Treat 2-digit years under 70 as 20YY.
+
[phone]  Dave Love  <[e-mail]>
+
+	* help.el (help-make-xrefs): Don't lose on non-empty blank line
+	after key table.
+
[phone]  Dave Love  <[e-mail]>
+
+	* timezone.el (timezone-parse-date): Assume 2-digit dates <70 are
+	2000+.
+
[phone]  Dave Love  <[e-mail]>
+
+	* auto-show.el (auto-show-mode): Fix :set.
+
+	* man.el (Man-softhyphen-to-minus): Fix for multibyte case; do
+	nothing in Latin-N environment.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* international/mule.el (set-auto-coding): Allow whitespace before
+	and after the "variable: value" pair.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* cus-edit.el (custom-save-delete): Avoid error for empty .emacs.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* emacs-lisp/edebug.el: Delete compatibility code.
+	(edebug-next-token-class): If . is followed by a digit,
+	return `symbol' for the token class.
+
+	* startup.el (command-line): If we don't find the user's init file,
+	set user-init-file to nil.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* international/encoded-kb.el
+	(encoded-kbd-self-insert-iso2022-7bit): Don't insert the character
+	but push it to unread-command-events.
+	(encoded-kbd-self-insert-iso2022-8bit): Likewise.
+	(encoded-kbd-self-insert-sjis): Likewise.
+	(encoded-kbd-self-insert-big5): Likewise.
+
 1999-07-14  Richard Stallman  <[e-mail]>
 
 	* Version 20.4 released.

--- a/lwlib/ChangeLog	Mon Sep 25 15:41:30 2000 +0000
+++ b/lwlib/ChangeLog	Mon Sep 25 15:42:25 2000 +0000
@@ -290,6 +290,24 @@
 	(remap_menubar): Ditto.
 	(draw_arrow): Draw it 3D.
 
+After the release of 20.4, development was split into two separate
+code lines.  One line contained the code for Emacs 21, and the other
+one the code for the 20.x releases after 20.4.  The following change
+log entries up to the entry ``20.4 released'' are for the 20.x code
+line.  Change logs above this notice are those for the 21.x code line.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* Version 20.7 released.
+	
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* Version 20.6 released.
+	
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* Version 20.5 released.
+	
 1999-07-12  Richard Stallman  <[e-mail]>
 
 	* Version 20.4 released.

--- a/man/ChangeLog	Mon Sep 25 15:41:30 2000 +0000
+++ b/man/ChangeLog	Mon Sep 25 15:42:25 2000 +0000
@@ -323,6 +323,36 @@
 
 	* Makefile.in: Add faq.
 
+After the release of 20.4, development was split into two separate
+code lines.  One line contained the code for Emacs 21, and the other
+one the code for the 20.x releases after 20.4.  The following change
+log entries up to the entry ``20.4 released'' are for the 20.x code
+line.  Change logs above this notice are those for the 21.x code line.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* Version 20.7 released.
+	
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* info.texi: Clarify description of Info-directory-list,
+	add description of Info-additional-directory-list.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* Version 20.6 released.
+	
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* Version 20.5 released.
+	
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* gnus.texi: Add coding tag.  Fixes for makeinfo 4.0.
+
+	* dired-x.texi, sc.texii, cc-mode.texi, mh-e.texi: Fixes for 
+	makeinfo 4.0.
+
 1999-07-12  Richard Stallman  <[e-mail]>
 
 	* Version 20.4 released.

--- a/msdos/ChangeLog	Mon Sep 25 15:41:30 2000 +0000
+++ b/msdos/ChangeLog	Mon Sep 25 15:42:25 2000 +0000
@@ -81,6 +81,28 @@
 
 	* sedleim.inp (SHELL, MAKESHELL): Use /xyzzy/command as the shell.
 
+After the release of 20.4, development was split into two separate
+code lines.  One line contained the code for Emacs 21, and the other
+one the code for the 20.x releases after 20.4.  The following change
+log entries up to the entry ``20.4 released'' are for the 20.x code
+line.  Change logs above this notice are those for the 21.x code line.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* Version 20.7 released.
+	
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* Version 20.6 released.
+	
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* Version 20.5 released.
+	
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* sedleim.inp (SHELL, MAKESHELL): Use /xyzzy/command as the shell.
+
 1999-07-12  Richard Stallman  <[e-mail]>
 
 	* Version 20.4 released.

--- a/nt/ChangeLog	Mon Sep 25 15:41:30 2000 +0000
+++ b/nt/ChangeLog	Mon Sep 25 15:42:25 2000 +0000
@@ -132,6 +132,54 @@
 
 	* emacs.bat.in (EMACSLOADPATH): Include leim.
 
+After the release of 20.4, development was split into two separate
+code lines.  One line contained the code for Emacs 21, and the other
+one the code for the 20.x releases after 20.4.  The following change
+log entries up to the entry ``20.4 released'' are for the 20.x code
+line.  Change logs above this notice are those for the 21.x code line.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* Version 20.7 released.
+	
[phone]  Jason Rumney  <[e-mail]>
+	
+	* INSTALL: Remove point 5 and other references to emacs.bat.
+	Renumber following points. Add note in point 1 about emacs.bat
+	and debug.bat being removed.
+
[phone]  Andrew Innes  <[e-mail]>
+
+	* makefile.nt: Remove all references to emacs.bat and debug.bat.
+
+	* emacs.bat.in: Remove obsolete file.
+
+	* debug.bat.in: Remove obsolete file.
+
[phone]  Andrew Innes  <[e-mail]>
+
+	* install.bat: Pass on command line arguments to make.
+	
+	* makefile.nt (fast_install): Bring commands up-to-date, and fix
+	typo.
+
[phone]  Andrew Innes  <[e-mail]>
+
+	* makefile.nt (all): Build leim if present.
+	(install): Install leim if present.
+	(clean): Clean leim if present.
+
+	* addpm.c (env_vars): Include leim in default EMACSLOADPATH
+	definition.
+
+	* emacs.bat.in (EMACSLOADPATH): Include leim.
+
[phone]  Andrew Innes  <[e-mail]>
+
+	* makefile.def (ARCH_CFLAGS): Disable the frame pointer omission
+	optimization, to ensure accurate stack traces.  The performance
+	loss is negligible.
+
 1999-07-12  Richard Stallman  <[e-mail]>
 
 	* Version 20.4 released.

--- a/oldXMenu/ChangeLog	Mon Sep 25 15:41:30 2000 +0000
+++ b/oldXMenu/ChangeLog	Mon Sep 25 15:42:25 2000 +0000
@@ -14,6 +14,24 @@
 
 	* XMenu.h (XmSelect): Add member `help_string'.
 
+After the release of 20.4, development was split into two separate
+code lines.  One line contained the code for Emacs 21, and the other
+one the code for the 20.x releases after 20.4.  The following change
+log entries up to the entry ``20.4 released'' are for the 20.x code
+line.  Change logs above this notice are those for the 21.x code line.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* Version 20.7 released.
+	
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* Version 20.6 released.
+	
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* Version 20.5 released.
+	
 1999-07-12  Richard Stallman  <[e-mail]>
 
 	* Version 20.4 released.

--- a/src/ChangeLog.8	Mon Sep 25 15:41:30 2000 +0000
+++ b/src/ChangeLog.8	Mon Sep 25 15:42:25 2000 +0000
@@ -11194,6 +11194,583 @@
 	* buffer.c (syms_of_buffer): Make
 	default-enable-multibyte-characters a user variable.
 
+After the release of 20.4, development was split into two separate
+code lines.  One line contained the code for Emacs 21, and the other
+one the code for the 20.x releases after 20.4.  The following change
+log entries up to the entry ``20.4 released'' are for the 20.x code
+line.  Change logs above this notice are those for the 21.x code line.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* Version 20.7 released.
+	
[phone]  Andrew Innes  <[e-mail]>
+
+	* w32proc.c (w32_executable_type): Determine whether program is a
+	GUI app.
+	(sys_spawnve): Tell create_child whether app is a GUI app.
+	(create_child): Don't hide window for GUI apps.
+	(syms_of_ntproc): Update docstring for w32-start-process-show-window.
+
[phone]  Andrew Innes  <[e-mail]>
+
+	* w32.c (sys_socket): Revert the previous fix, and use a better
+	approach for detecting when a socket cannot be made
+	non-inheritable by duplicating the handle.
+
[phone]  Dave Love  <[e-mail]>
+
+	* s/irix5-0.h (LD_SWITCH_SYSTEM): Don't define to `-G 0'.
+	(C_SWITCH_SYSTEM) [__GNUC__]: Put in #if 0.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* m/iris5d.h (UNEXEC): Use unexsgi.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* xdisp.c (redisplay_window): Set startp_byte (not startp) to
+	ZV_BYTE.
+
[phone]  Andrew Innes  <[e-mail]>
+
+	* w32.c (sys_socket): To work around a problem with MS Proxy
+	winsock, don't attempt to make sockets non-inheritable if the
+	proxy winsock appears to be present.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* s/gnu-linux.h (setpgrp): Don't define it here because this
+	prevents compilation on GNU/Linux systems with glib 2.2.
+
+	* callproc.c, emacs.c, sysdep.c (setpgrp) [HAVE_SETPGID]: Define
+	as setpgid.
+	
[phone]  NIIBE Yutaka  <[e-mail]>
+	
+	* s/gnu-linux.h (UNIX98_PTYS) [HAVE_GRANTPT]: Define.
+	(PTY_ITERATION, PTY_NAME_SPRINTF, PTY_OPEN, PTY_TTY_NAME_SPRINTF)
+	[HAVE_GRANTPT]: Define.
+	(C_SWITCH_SYSTEM): Add -D_XOPEN_SOURCE.
+
+	* sysdep.c (setup_pty): Treat case that UNIX98_PTYS is defined
+	like SYSV_PTYS.
+
+	* config.in (HAVE_GRANDPT, HAVE_GETPT): New defines.
+
+	* process.c (toplevel) [UNIX98_PTYS]: Include stdlib.h.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* buffer.c (Fbury_buffer): Avoid trouble from burying a killed
+	buffer.
+
+	* keyboard.c (lispy_mouse_names): Variable removed.
+	(Vlispy_mouse_stem): New variable.
+	(syms_of_keyboard): Initialize Vlispy_mouse_stem.
+	(make_lispy_event) <mouse_click, scroll_bar_click>: Don't abort
+	for any mouse button number.  Increase size of mouse_syms and
+	button_down_location as needed.  Call modify_event_symbol with
+	different arguments.
+	(make_lispy_event) <scroll_bar_click> [USE_TOOLKIT_SCROLL_BARS]:
+	Call modify_event_symbol with different arguments.
+	(make_lispy_event) <w32_scroll_bar_click> [WINDOWSNT]: Don't abort
+	for any button number.  Call modify_event_symbol with different
+	arguments.
+	(modify_event_symbol): Rename NAME_ALIST to NAME_ALIST_OR_STEM.
+	Accept a string for NAME_ALIST_OR_STEM.
+
+	* fns.c (larger_vector): New function.
+
+	* keyboard.c (Fclear_this_command_keys): Clear recent_keys
+	vector, too.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* frame.c (frames_bury_buffer): Don't add a buffer to the frame's
+	buffer list that wasn't selected in that frame.
+
+	* filelock.c (get_boot_time): To obtain an 8 char file name, use a
+	2 char prefix, and call make_temp_name with second arg non-zero.
+
+	* fileio.c (make_temp_name): New function, extracted from
+	Fmake_temp_name.
+	(Fmake_temp_name): Use it.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* unexelf.c, m/iris4d.h, m/iris5d.h: Use most current development 
+	versions.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32bdf.c (w32_BDF_TextOut): Change bytelen arg to char_len
+	as used by callers.
+
+	* w32term.c (dumpglyphs): Fill background if character goes
+        higher or lower than normal. W32_TEXTOUT outputs chars not
+        bytes. Handle bdf fonts when getting width of composite chars
+        component. Allow for multibyte first glyph in composite char.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32menu.c (w32_menu_show): Call ENCODE_SYSTEM for item_name
+	and descrip.
+
[phone]  Andrew Innes  <[e-mail]>
+
+	* w32.c (sys_socket): Check return value of DuplicateHandle,
+        try to use original socket if it fails.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* coding.c (code_convert_string): GCPRO str before calling
+	temp_output_buffer_setup.
+
[phone]  Gerd Moellmann  <[e-mail]>
+	
+	* insdel.c (insert_from_buffer_1): Adjust FROM position by number
+	of inserted characters when BUF equals the current buffer, and PT
+	is in front of or equal to FROM.
+	
[phone]  Andrew Innes  <[e-mail]>
+
+	* w32fns.c (w32_wnd_proc) <WM_GETMINMAXINFO>: Reduce the maximum
+	tracking limits to fit within the Windows 9x 16-bit limit.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* eval.c (Fsignal): If lisp_eval_depth or spepdl_size are near
+	to the limits, increase the limits.
+
+	* s/openbsd.h (LIBS_TERMCAP): Undefine.
+
+	* process.c (send_process): Remove local variable `procname' that
+	might become invalid when a GC happens.  Instead, access the
+	process name slot directly.
+	
+	* s/freebsd.h (LIBS_TERMCAP): Define only for __FreeBSD_version
+	<= 400000.
+
+	* sysdep.c (read_intput_waiting): Add prototype.
+	(read_input_waiting): Call read_socket_hook with 4 arguments.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* Version 20.6 released.
+	
[phone]  Miyashita Hisashi  <[e-mail]>
+
+	* ccl.c (ccl_driver) [CCL_MapMultiple]: When the mapped value is
+	`lambda', set reg[RRR] to the map index.
+	(ccl_driver) [CCL_MapSingle]: When the mapped value is found, set
+	reg[RRR] to 0.  Otherwise, set it to -1.
+
[phone]  Andrew Innes  <[e-mail]>
+
+	* w32fns.c (w32_wnd_proc) <WM_GETMINMAXINFO>: Allow resizing
+	the Emacs frame above the screen size.
+
[phone]  Andrew Innes  <[e-mail]>
+
+	* w32select.c (Fw32_get_clipboard_data): Force data to be decoded
+	even if it doesn't contain non-ascii characters, as if it were
+	compound text.
+
+	* w32menu.c: Include charset.h and coding.h.
+	(single_submenu, w32_menu_show) [!HAVE_MULTILINGUAL_MENU]: Encode
+	mulitbyte strings with w32-system-coding-system before using in
+	menus.
+
+	* w32fns.c (x_set_name): Encode multibyte name with
+	w32-system-coding-system before using as frame title.
+	(x_set_title): Ditto.
+
+	* coding.h (ENCODE_SYSTEM) [WINDOWSNT]: New macro.
+	(DECODE_SYSTEM) [WINDOWSNT]: New macro.
+	[WINDOWSNT]: Add extern for Vw32_system_coding_system.
+
+	* fileio.c (Ffile_writable_p) [WINDOWSNT]: If a file (or
+	directory) doesn't exist, assume it can be created regardless of
+	whether the parent directory is writable.  This is the correct
+	thing to do, if we are not going to check the ACLs.
+
+	* w32.c (init_environment): Provide default values for all
+	required environment variables, and always set emacs_dir based on
+	the location of emacs.exe if it appears to be in a standard
+	location.
+	(init_user_info): Abort if HOME or SHELL isn't set.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* msdos.c (IT_write_glyphs): Allocate a screen_buf buffer as
+	large as CODING_MODE_LAST_BLOCK requires.
+
[phone]  Dave Love  <[e-mail]>
+
+	* gmalloc.c: Don't define away `const'; config.h does that.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* xdisp.c (decode_mode_spec_coding): Delete superfluous code to
+	avoid infinite error signalling.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* .gdbinit (xbacktrace, xprintsym, xreload): New commands.
+
[phone]  Andrew Innes  <[e-mail]>
+
+	* w32proc.c (sys_kill): Fake Ctrl-C keystroke to simulate SIGINT,
+	and Ctrl-Break to simulate SIGQUIT (known as SIGBREAK in MSVC).
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* m/arm.h: New file.
+	
+	* s/freebsd.h (BROKEN_PTY_READ_AFTER_EAGAIN): Define.
+
+	* process.c (send_process) [BROKEN_PTY_READ_AFTER_EAGAIN]:
+	Workaround for FreeBSD bug.  Clear output queue after EAGAIN in
+	write(2).
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* s/hpux10.h (HAVE_XRMSETDATABASE): Define if not already defined.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* ccl.c (CCL_MAKE_CHAR): New macro.
+	(ccl_driver) <CCL_TranslateCharacter>: Check the validity of
+	registers by CCL_MAKE_CHAR before calling translate_char.
+	<CCL_TranslateCharacterConstTbl> Likewise.
+	
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* s/irix6-5.h: Undo previous change.
+
+	* s/irix5-0.h (LD_SWITCH_SYSTEM): Define only for GCC < 2.95.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* m/alpha.h: Revert to version from 20.5.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* ccl.c (ccl_driver) <CCL_WriteExprRegister>: Set jump_address
+	instead of incrementing ic directly.
+	<CCL_WriteExprConst> Likewise.
+	<ccl_set_expr>: Set ic to jump_address.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* s/irix6-5.h [__GNUC__ && __GNUC_MINOR__ >= 95]: Undef
+	LD_SWITCH_SYSTEM inherited from irix5-0.h.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* m/news-risc.h (LD_SWITCH_MACHINE): Define differently for GCC.
+	
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* s/hpux9.h (NO_EDITRES): Define even if HAVE_LIBXMU.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* s/usg5-4.h (LIBS_SYSTEM): Add -lgen because that's needed
+	for building with Motif.
+	
[phone]  Paul Eggert  <[e-mail]>
+
+	* m/alpha.h (malloc, realloc, calloc): Remove decls;
+	stdlib.h now does this.
+
[phone]  Dave Love  <[e-mail]>
+
+	* aix3-2-5.h (C_DEBUG_SWITCH): Use -g -O.
+	* aix4-1.h: Likewise.
+
+	* irix6-5.h (C_DEBUG_SWITCH): Set for debug and optimize.
+	
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* Version 20.5 released.
+	
[phone]  Kenichi Handa  <[e-mail]>
+
+	* coding.c (Ffind_operation_coding_system): Cancel previous change.
+
+	* fileio.c (decide_coding_unwind): Renamed from
+	set_auto_coding_unwind.
+	(Finsert_file_contents): Make single unwind protect to call both
+	Vset_auto_coding_function and Ffind_operation_coding_system.
+
+	* insdel.c (adjust_markers_for_delete): Make it non-static.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* unexelf.c (unexec): Put handling of .lit4 and .lit8 in
+	#ifdef __sgi.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* unexelf.c (unexec): Don't copy .got section.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* fileio.c (Fwrite_region): Don't call 
+	Vselect_safe_coding_sytem_function if noninteractive.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* m/iris4d.h, m/iris5d.h: Use unexsgi.o instead of unexelf.o.
+
[phone]  Dave Love  <[e-mail]>
+
+	* emacs.c (main): Set LANG=C iff AIX3_2 defined.
+
[phone]  Alexandre Oliva  <[e-mail]>
+
+	* unexelf.c: Auto-detect .sbss section.
+	(round_up): Make it static.
+	(unexec): Declare alignment as Elf Word.  Skip ``Program
+	segment above .bss'' test on MIPS without .sbss.
+	Copy sections .got and .sdata1 sections.  Adjust offsets in
+	sections .sdata, .lit4, .lit8, .got and .sdata1.
+
[phone]  Alexandre Oliva  <[e-mail]>
+
+	* unexelf.c: Merge IRIX debugging info patch from unexsgi.c
+	* m/iris4d.h: Use unexelf for IRIX 5.*.
+	* m/iris5d.h: Use unexelf for IRIX 6.*.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* coding.c (Ffind_operation_coding_system): Call functions after
+	changing the current buffer to a temporary buffer.
+
[phone]  Ken'ichi Handa  <[e-mail]>
+
+	* fileio.c (Finsert_file_contents): Set buffer-file-coding-system
+	of the current buffer via Fset.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* unexaix.c (unexec): Use unsigned instead of uintptr_t because
+	that fails on IBM PowerPC, AIX 4.2.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* buffer.c (syms_of_buffer): Add %z, %Z, %m and %& to the doc
+	string of mode-line-format.  Remove the obsolete %t.
+
[phone]  Jason Rumney <[e-mail]>
+
+	* w32fns.c (x_to_w32_font): Assign Y-resolution to resy
+        instead of pixel.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* unexelf.c (unexec): Put new code rounding up the bss section's
+	sh_offset in #if 0.  Add corresponding code from 20.4 in #else.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* keyboard.c (echo_char): Assure sufficient memory for
+	push_key_description.
+
[phone]  Jason Rumney  <[e-mail]>
+
+	* w32console.c: Include coding.c
+	(write_glyphs): Convert glyphs for display using
+	terminal_coding_system instead of GLYPH_FOLLOW_ALIASES.
+
[phone]  Dave Love  <[e-mail]>
+
+	* doc.c (Fdocumentation): Remove gcpro here too.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* doc.c (Fdocumentation_property): Don't GCPRO.
+
[phone]  Ken'ichi Handa  <[e-mail]>
+
+	* editfns.c (Ftranslate_region): Check the buffer multibyteness.
+
[phone]  Andrew Innes  <[e-mail]>
+
+	* w32fns.c (x_set_name): Coerce title string to unibyte.
+	(x_set_title): Ditto.
+
+	* w32menu.c: Undef HAVE_MULTILINGUAL_MENU.
+	(single_submenu):
+	(w32_menu_show) [!HAVE_MULTILINGUAL_MENU]: Coerce menu strings to
+	unibyte.
+
+	* w32.c (map_w32_filename): Force file functions to fail if the
+	name is too long, by returning an invalid name.
+	(open_unc_volume): Add cast.
+	(open_unc_volume): Make argument const.
+	(unc_volume_file_attributes): Ditto.
+
+	* makefile.nt (LINK_FLAGS): Include function-level (COFF format)
+	debug information in release builds, to get meaningful stack
+	traces on crashes.  Also remove spurious spaces in various places,
+	and all dependencies on lisp.h.
+
+	* w32term.c (my_set_focus): Return a value;
+	(my_set_foreground_window): Ditto.
+	(w32_initialize): Change return type to void, and add forward
+	declaration.
+
+	* w32fns.c (Fw32_shell_execute): Fix typo in docstring.
+	(Fw32_shell_execute): Allow OPERATION to be nil, to perform the
+	default action.
+	
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* doc.c (Fdocumentation_property): Fix bug bypassing UNGCPRO.
+
[phone]  Gerd Moellmann  <[e-mail]>
+
+	* doc.c (Fdocumentation_property): Remove register keyword
+	from local variable `tem'.
+
[phone]  Ken'ichi Handa  <[e-mail]>
+
+	* coding.c (code_convert_region): Update `dst' correctly.
+
[phone]  Dave Love  <[e-mail]>
+
+	* doc.c (Fdocumentation_property): Gcpro `tem`.
+
[phone]  Dave Love  <[e-mail]>
+
+	* filelock.c (lock_file): Move gcpro of `fn'.
+
[phone]  Ken'ichi Handa  <[e-mail]>
+
+	* fns.c (Fstring_as_multibyte): Call
+	register_composite_chars_string for a multibyte string.
+
[phone]  Ken'ichi Handa  <[e-mail]>
+
+	* lread.c (Fload): Calculate bytes of filename correctly.
+	(openp): Likewise.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* category.c (modify_lower_category_set): Set default value of
+	TABLE correctly.
+
+	* coding.c (DECODE_CHARACTER_ASCII): Decode ASCII invocated to GR
+	correctly.
+
+	* minibuf.c (Fminibuffer_complete_word): Calculate string byte
+	size correctly.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* keymap.c (Fsingle_key_description): Make tem big enough.
+	(describe_buffer_bindings): Make buf big enough.
+
[phone]  Miyashita Hisashi  <[e-mail]>
+
+	* charset.c (str_cmpchar_id):  Before xmalloc, copy data in STR to
+	a buffer that is safe from memory relocation.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* charset.h: (register_composite_chars_region): Extern it.
+	(register_composite_chars_string): Extern it.
+
+	* charset.c (str_cmpchar_id): New argument REGISTERP.  Caller
+	changed.
+	(register_composite_chars_region): New function.
+	(register_composite_chars_string): New function.
+
+	* alloc.c (make_string): Call register_composite_chars_string for
+	a multibyte string. 
+	(make_multibyte_string): Likewise.
+	(make_string_from_bytes): Likewise.
+	(make_specified_string): Likewise.
+
+	* buffer.c (Fset_buffer_multibyte): On setting the buffer
+	multibyte, call register_composite_chars_region.
+
+	* insdel.c (insert_1_both): Call register_composite_chars_region
+	after the insertion.
+	(adjust_after_replace): Likewise.
+
+	* indent.c (MULTIBYTE_BYTES_WIDTH): Adjusted for the change of
+	str_cmpchar_id.
+
[phone]  Richard Stallman  <[e-mail]>
+
+	* filelock.c (Vtemporary_file_directory): New variable.
+	(syms_of_filelock): Set up Lisp variable.
+
[phone]  Richard Stallman  <[e-mail]>
+
+	* filelock.c (get_boot_time): Make the temp name in the proper dir.
+
[phone]  Richard Stallman  <[e-mail]>
+
+	* keymap.c (fix_submap_inheritance): Do nothing if the proper
+	parent is an ancestor of SUBMAP; otherwise, add it as the
+	ultimate ancestor.
+
[phone]  Michael Sperber [Mr. Preprocessor]  <[e-mail]>
+
+	* s/aix4-2.h (ALIGN_DATA_RELOC): Undefined to support new
+	unexaix.c.
+
+	* s/aix3-1.h (ALIGN_DATA_RELOC): Defined to support new unexaix.c.
+
[phone]  Dave Love  <[e-mail]>
+
+	* unexaix.c: New version incorporating Michael Sperber's changes
+	from XEmacs.  Should solve problems on AIX 4.3.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* eval.c (run_hook_list_with_args): Gcpro `globals'.
+	(run_hook_with_args): Likewise.
+
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* window.h (struct window): New field too_small_ok.
+
+	* window.c (set_window_height, set_window_width): 
+	If window starts out "too small", set its too_small_ok flag.
+	If window's too_small_ok flag is set, don't delete it
+	unless it is so small it would cause a crash.
+
+	* charset.h (BCOPY_SHORT): Fix typo `unsigined'.
+
[phone]  Alexandre Oliva  <[e-mail]>
+
+	* unexelf.c [__linux__ && __alpha__] (HAS_SBSS_SECTION): Define.
+
[phone]  Andreas Schwab  <[e-mail]>
+
+	* insdel.c (insert_from_string_1): Check gap size against number
+	of outgoing bytes, not incoming bytes.
+
[phone]  Richard Stallman  <[e-mail]>
+
+	* fns.c (internal_equal): Correct overlay comparison.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* msdos.c (getdefdir): Don't return failure indication when
+	_fixpath sets errno to ENOSYS.
+
[phone]  Joe Ramey  <[e-mail]>
+
+	* filelock.c (lock_if_free): Return -1 if check_lock_owner
+	has returned -1 (lockfile exists but is not a symlink?)
+
 1999-07-14  Richard Stallman  <[e-mail]>
 
 	* Version 20.4 released.