--- a/lisp/ChangeLog	Thu Feb 06 10:44:06 2003 +0000
+++ b/lisp/ChangeLog	Thu Feb 06 14:37:56 2003 +0000
@@ -1,3 +1,86 @@
+2002-12-27  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	Synch to GNU Emacs 21.3.50:
+
+	* wid-edit.el: Update Copyright notice and Commentary.
+	(other):
+	(float):
+	(plist):
+	(widget-plist-value-type):
+	(widget-plist-convert-widget):
+	(widget-plist-convert-option):
+	(alist):
+	(widget-alist-value-type):
+	(widget-alist-convert-widget):
+	(widget-alist-convert-option):
+	New widgets and ancillary objects.
+	(coding-system):
+	(widget-coding-system-prompt-value-history):
+	(widget-coding-system-prompt-value):
+	(widget-coding-system-prompt-action):
+	Reenabled widget.
+	(default): Use `ignore' instead of lambda form.
+	(editable-field): New help-echo, better error.
+	(text): Use conventional argument order.
+	(character): Specify :size property.
+	(widget-menu-max-shortcuts): New user variable.
+	(widget-remove-if):
+	(widgetp):
+	(widget-copy):
+	(widget-types-copy):
+	(widget-field-at):
+	New functions.
+	(widget-convert): Use keywordp.
+	(widget-insert): Auto-autoload.
+	(widget-types-convert-widget): Make defsubst.
+	(widget-convert):
+	(widget-get-sibling):
+	(widget-insert):
+	(widget-default-complete):
+	(widget-item-value-create):
+	(widget-field-prompt-value):
+	(widget-field-validate):
+	(widget-choice-validate):
+	(widget-radio-value-inline):
+	(widget-editable-list-value-create):
+	(widget-regexp-validate):
+	(widget-file-complete):
+	(widget-color-complete):
+	Eliminate pointless let-bindings.
+	(widget-field-find): Delete old version; comment XEmacs use of
+	map-extents.
+	(widget-default-create):
+	(widget-checklist-add-item):
+	(widget-radio-add-item):
+	(widget-radio-chosen):
+	(widget-editable-list-entry-create):
+	(widget-documentation-string-value-create):
+	Insert characters, not one-element strings.
+	(widget-default-create): Use stream argument of princ.
+	(widget-default-format-handler): Check functionp before funcalling.
+	(widget-url-link-action): Fix if-fboundp typo and too-long line.
+	(widget-sublist):
+	(cons :value-to-external):
+	Use Common Lisp functions.
+	(widget-echo-help):
+	(widget-default-value-set):
+	Use `if' rather than `and' and `when'.
+	(widget-princ-to-string):
+	(widget-specify-sample):
+	(widget-specify-doc):
+	(widget-glyph-directory):
+	(widget-glyph-enable):
+	(widget-after-change):
+	Docstrings from comments or improve docstrings.
+	(widget-image-conversion): New GNU Emacs-compatible alias.
+	(widget-field-face): Handle light-background TTYs.
+
+2003-02-06  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* update-elc.el (lisp-files-needing-early-byte-compilation):
+	Comment referred to wrong variable.
+	(do-autoload-commands ...): Remove duplicate comment.
+
 2003-02-05  Ben Wing  <ben@xemacs.org>
 
 	* mule/cyril-util.el:

--- a/lisp/update-elc.el	Thu Feb 06 10:44:06 2003 +0000
+++ b/lisp/update-elc.el	Thu Feb 06 14:37:56 2003 +0000
@@ -94,10 +94,9 @@
   '("bytecomp"
     "byte-optimize"))
 
-;; "Lisp files, other than those in
-;; `lisp-files-needing-early-byte-compilation',packages that need early
-;; byte compilation.  These are files loaded by update-elc.el in order to
-;; do the compilation of all the rest of the files.
+;; Lisp files not in `lisp-files-needed-for-byte-compilation' that need
+;; early byte compilation.  These are files loaded by update-elc.el in
+;; order to do the compilation of all the rest of the files.
 (defvar lisp-files-needing-early-byte-compilation
   '(;"easy-mmode"
     "autoload"
@@ -297,10 +296,6 @@
 	 (condition-case nil
 	     (delete-file "../src/BYTECOMPILE_CHANGE")
 	   (file-error nil)))
-	 ;; (1) Nothing to do at all.  BYTECOMPILE_CHANGE is used (only by
-	 ;;     the Unix makefile) to indicate whether some files needed
-	 ;;     for dump got recompiled, and hence the executable must be
-	 ;;     redumped.  We remove it if there were no files to compile.
 	((and (not update-elc-files-to-compile)
 	      (not dumped-exe-out-of-date-wrt-dump-files)
 	      (not dumped-exe-out-of-date-wrt-undumped-exe))

--- a/man/ChangeLog	Thu Feb 06 10:44:06 2003 +0000
+++ b/man/ChangeLog	Thu Feb 06 14:37:56 2003 +0000
@@ -1,3 +1,13 @@
+2003-02-06  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* internals/internals.texi (Top):
+	(Buffers and Textual Representation):
+	Fix up white space in menu.
+	(Character-Related Data Types):
+	(Conversion to and from External Data):
+	(Format of the Extent Info):
+	Pedantic grammatical nits.
+
 2003-02-05  Ben Wing  <ben@xemacs.org>
 
 	* lispref/mule.texi (Internationalization Terminology):

--- a/man/internals/internals.texi	Thu Feb 06 10:44:06 2003 +0000
+++ b/man/internals/internals.texi	Thu Feb 06 14:37:56 2003 +0000
@@ -267,7 +267,7 @@
 * The Text in a Buffer::        Representation of the text in a buffer.
 * Buffer Lists::                Keeping track of all buffers.
 * Markers and Extents::         Tagging locations within a buffer.
-* Ibytes and Ichars::        Representation of individual characters.
+* Ibytes and Ichars::           Representation of individual characters.
 * The Buffer Object::           The Lisp object corresponding to a buffer.
 
 MULE Character Sets and Encodings
@@ -2768,7 +2768,7 @@
 
 Obviously, the equality between characters and bytes is lost in the Mule
 world.  Characters can be represented by one or more bytes in the
-buffer, and @code{Ichar} is the C type large enough to hold any
+buffer, and @code{Ichar} is a C type large enough to hold any
 character.
 
 Without Mule support, an @code{Ichar} is equivalent to an
@@ -2783,7 +2783,7 @@
 reading characters from the outside, it decodes them to an internal
 format, and likewise encodes them when writing.  @code{Ibyte} (in fact
 @code{unsigned char}) is the basic unit of XEmacs internal buffers and
-strings format.  A @code{Ibyte *} is the type that points at text
+strings format.  An @code{Ibyte *} is the type that points at text
 encoded in the variable-width internal encoding.
 
 One character can correspond to one or more @code{Ibyte}s.  In the
@@ -2987,12 +2987,12 @@
 representations of text are the numerous conversion macros defined in
 @file{buffer.h}.  There used to be a fixed set of external formats
 supported by these macros, but now any coding system can be used with
-these macros.  The coding system alias mechanism is used to create the
+them.  The coding system alias mechanism is used to create the
 following logical coding systems, which replace the fixed external
 formats.  The (dontusethis-set-symbol-value-handler) mechanism was
 enhanced to make this possible (more work on that is needed).
 
-Example useful coding systems:
+Often useful coding systems:
 
 @table @code
 @item Qbinary
@@ -3041,6 +3041,8 @@
 XEmacs is being run under Windows 9X or Windows NT/2000/XP.
 @end table
 
+Many other coding systems are provided by default.
+
 There are two fundamental macros to convert between external and
 internal format, as well as various convenience macros to simplify the
 most common operations.
@@ -3196,7 +3198,7 @@
 buffers literally.
 
 This means that when a system function, such as @code{readdir}, returns
-a string, you may need to convert it using one of the conversion macros
+a string, you normally need to convert it using one of the conversion macros
 described in the previous chapter, before passing it further to Lisp.
 
 Actually, most of the basic system functions that accept '\0'-terminated
@@ -3216,7 +3218,8 @@
 
 @item Do all work in internal format
 External-formatted data is completely unpredictable in its format.  It
-may be Unicode (non-ASCII compatible); it may be a modal encoding, in
+may be fixed-width Unicode (not even ASCII compatible); it may be a
+modal encoding, in
 which case some occurrences of (e.g.) the slash character may be part of
 two-byte Asian-language characters, and a naive attempt to split apart a
 pathname by slashes will fail; etc.  Internal-format text should be
@@ -8113,7 +8116,7 @@
 * The Text in a Buffer::        Representation of the text in a buffer.
 * Buffer Lists::                Keeping track of all buffers.
 * Markers and Extents::         Tagging locations within a buffer.
-* Ibytes and Ichars::        Representation of individual characters.
+* Ibytes and Ichars::           Representation of individual characters.
 * The Buffer Object::           The Lisp object corresponding to a buffer.
 @end menu
 
@@ -8198,7 +8201,7 @@
 particular position, all characters after that position end up at new
 positions.  When we speak of the character @dfn{at} a position, we
 really mean the character after the position.  (This schizophrenia
-between a buffer position being ``between'' a character and ``on'' a
+between a buffer position being ``between'' two characters and ``on'' a
 character is rampant in Emacs.)
 
   Buffer positions are numbered starting at 1.  This means that
@@ -9796,7 +9799,7 @@
 string.) So use the @code{_force} version if you need the extent_info
 structure to be there.
 
-  A list of extents is maintained as a double gap array: One gap array
+  A list of extents is maintained as a double gap array.  One gap array
 is ordered by start index (the @dfn{display order}) and the other is
 ordered by end index (the @dfn{e-order}).  Note that positions in an
 extent list should logically be conceived of as referring @emph{to} a
@@ -9829,7 +9832,7 @@
 Code to manipulate them is relatively simple to write.
 @end enumerate
 
-An alternative would be a balanced binary trees, which have guaranteed
+An alternative would be balanced binary trees, which have guaranteed
 @math{O(log N)} time for all operations (although the constant factors
 are not as good, and repeated localized operations will be slower than
 for a gap array).  Such code is quite tricky to write, however.