Change release version from 21.4 to 22.1 throughout.

Change development version from 21.3.50 to 22.0.50.

4 files changed, 13 insertions, 13 deletions

diff --git a/etc/MACHINES b/etc/MACHINES
index e87510f6d0a..63f341aade7 100644
--- a/etc/MACHINES
+++ b/etc/MACHINES
@@ -651,7 +651,7 @@ Intel 386 (i386-*-isc, 		i386-*-esix,	 i386-*-bsdi2,
         i386-unknown-isc3.0 as your configuration name.
   Use i386-*-esix for Esix; Emacs runs as of version 19.6.
   Use i386-*-linux-gnu for GNU/Linux systems; Emacs runs as of version 19.26.
-  Use i386-*-cygwin for Cygwin; Emacs builds as of version 21.4, in both X11
+  Use i386-*-cygwin for Cygwin; Emacs builds as of version 22.1, in both X11
   and non-X11 modes.  (The Cygwin site has source and binaries for 21.2.)
   Use i386-intsys-sysv for Integrated Solutions 386 machines.
   It may also be correct for Microport systems.
diff --git a/etc/MH-E-NEWS b/etc/MH-E-NEWS
index f82bf4cb045..25f649b5434 100644
--- a/etc/MH-E-NEWS
+++ b/etc/MH-E-NEWS
@@ -1,7 +1,7 @@
 * COPYRIGHT
 
 Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-        
+
 Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
 notice and this notice are preserved.
@@ -392,7 +392,7 @@ has been fixed (closes SF #933954).
 * Changes in MH-E 7.4.4
 
 Version 7.4.4 addresses programmatic issues from the FSF and prepares
-MH-E for inclusion into an impending GNU Emacs release (21.4). There
+MH-E for inclusion into an impending GNU Emacs release (22.1). There
 are no user-visible changes (unless you are using XEmacs on DOS or
 don't have the cl package installed). Filenames are now unique in
 their first 8 characters (DOS 8.3 requirement). The runtime dependency
diff --git a/etc/NEWS b/etc/NEWS
index 40f5a643d9d..a8e26ae9f95 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -15,7 +15,7 @@ When you add a new item, please add it without either +++ or ---
 so we will look at it and add it to the manual.
 
 
-* Installation Changes in Emacs 21.4
+* Installation Changes in Emacs 22.1
 
 ** Emacs includes now support for loading image libraries on demand.
 (Currently this feature is only used on MS Windows.)  You can configure
@@ -97,7 +97,7 @@ See the files mac/README and mac/INSTALL for build instructions.
 types any more.  Add -DUSE_LISP_UNION_TYPE if you want union types.
 
 
-* Changes in Emacs 21.4
+* Changes in Emacs 22.1
 
 ** Emacs now responds to mouse-clicks on the mode-line, header-line and
 display margin, when run in an xterm.
@@ -139,7 +139,7 @@ Depending on the current mode, a Mouse-2 click in Emacs may do much
 more than just follow a link, so the new Mouse-1 behavior is only
 activated for modes which explicitly mark a clickable text as a "link"
 (see the new function `mouse-on-link-p' for details).  The Lisp
-packages that are included in release 21.4 have been adapted to do
+packages that are included in release 22.1 have been adapted to do
 this, but external packages may not yet support this.  However, there
 is no risk in using such packages, as the worst thing that could
 happen is that you get the original Mouse-1 behavior when you click
@@ -2232,7 +2232,7 @@ temporary overlay showing in the course of an isearch operation.
 coding system.
 
 
-* New modes and packages in Emacs 21.4
+* New modes and packages in Emacs 22.1
 
 ** The new package conf-mode.el handles thousands of configuration files, with
 varying syntaxes for comments (;, #, //, /* */ or !), assignment (var = value,
@@ -2476,7 +2476,7 @@ timing measurements of code (including the garbage collection component).
 ** `cfengine-mode' is a major mode for editing GNU Cfengine
 configuration files.
 
-* Incompatible Lisp Changes in Emacs 21.4
+* Incompatible Lisp Changes in Emacs 22.1
 
 +++
 ** `suppress-keymap' now works by remapping `self-insert-command' to
@@ -2489,7 +2489,7 @@ the command `undefined'.  (In earlier Emacs versions, it used
 :propertize and :eval forms in the value of a variable whose
 `risky-local-variable' property is nil.
 
-* Lisp Changes in Emacs 21.4
+* Lisp Changes in Emacs 22.1
 
 ** An element of buffer-undo-list can now have the form (FUNNAME .
 ARGS), where FUNNAME is a symbol other than t or nil.  That stands for
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index f514f217f98..f12f97878e8 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -731,7 +731,7 @@ introduced with Emacs 21.1, could significantly slow down scrolling
 through the buffer, especially scrolling backwards, and also jumping
 to the end of a very large buffer.
 
-Beginning with version 21.4, a parenthesis or a brace in column zero
+Beginning with version 22.1, a parenthesis or a brace in column zero
 is highlighted in bold-red face if it is inside a string or a comment,
 to indicate that it could interfere with Font Lock (and also with
 indentation) and should be moved or escaped with a backslash.
@@ -1549,7 +1549,7 @@ entry that supports color is `xterm-color', so setting TERM's value to
 `xterm-color' might activate the color support on an xterm-compatible
 emulator.
 
-Beginning with version 21.4, Emacs supports the --color command-line
+Beginning with version 22.1, Emacs supports the --color command-line
 option which may be used to force Emacs to use one of a few popular
 modes for getting colors on a tty.  For example, --color=ansi8 sets up
 for using the ANSI-standard escape sequences that support 8 colors.
@@ -2869,7 +2869,7 @@ libraries.
 
 *** HP/UX versions before 11.0
 
-HP/UX 9 was end-of-lifed in December 1998.  
+HP/UX 9 was end-of-lifed in December 1998.
 HP/UX 10 was end-of-lifed in May 1999.
 
 **** HP/UX 9: Emacs crashes with SIGBUS or SIGSEGV after you delete a frame.
@@ -2947,7 +2947,7 @@ the kernel bug.
 
 *** Irix 5 and earlier
 
-Exactly when Irix-5 end-of-lifed is obscure.  But since Irix 6.0 
+Exactly when Irix-5 end-of-lifed is obscure.  But since Irix 6.0
 shipped in 1994, it has been some years.
 
 **** Irix 5.2: unexelfsgi.c can't find cmplrs/stsupport.h.