Change release version from 21.4 to 22.1 throughout.

Change development version from 21.3.50 to 22.0.50.

7 files changed, 33 insertions, 30 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index 6ad29a23964..4c6a2cd914c 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -384,7 +384,7 @@
 2004-12-08  Luc Teirlinck  <teirllm@auburn.edu>
 
         * custom.texi (Saving Customizations): Emacs only loads the custom
-        file automatically after the init file in version 21.4 or later.
+        file automatically after the init file in version 22.1 or later.
         Adapt text and examples to this fact.
 
         * makefile.w32-in (INFO_TARGETS, DVI_TARGETS, $(infodir)/org)
@@ -937,7 +937,7 @@
 
         * reftex.texi (AUCTeX): Update links, section name.
 
-        * faq.texi (Calc): Update availability (included in 21.4).
+        * faq.texi (Calc): Update availability (included in 22.1).
         (AUCTeX): Update availability, information, versions, description.
 
 2004-08-21  Luc Teirlinck  <teirllm@auburn.edu>
diff --git a/man/cc-mode.texi b/man/cc-mode.texi
index 89e49d67442..a0016aab121 100644
--- a/man/cc-mode.texi
+++ b/man/cc-mode.texi
@@ -41,7 +41,7 @@
 
 
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-@comment 
+@comment
 @comment Texinfo manual for CC Mode
 @comment Generated from the original README file by Krishna Padmasola
 @comment <krishna@earth-gw.njit.edu>
@@ -51,7 +51,7 @@
 @comment Martin Stjernholm
 @comment
 @comment Maintained by Martin Stjernholm <bug-cc-mode@gnu.org>
-@comment 
+@comment
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 @comment Define an index for syntactic symbols.
@@ -1951,9 +1951,9 @@ for commands concerning those bits.
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 The following list of commands reindent C constructs.  Note that when
-you change your coding style, either interactively or through some other 
+you change your coding style, either interactively or through some other
 means, your file does @emph{not} automatically get reindented.  You
-will need to execute one of the following commands to see the effects of 
+will need to execute one of the following commands to see the effects of
 your changes.
 
 @cindex GNU indent program
@@ -2865,9 +2865,9 @@ looked up.  If it's found then the associated style is used.
 If @samp{other} is not found then the @samp{gnu} style is used.
 
 @item
-In all cases, the style described in @code{c-default-style} is installed 
+In all cases, the style described in @code{c-default-style} is installed
 @emph{before} the language hooks are run, so you can always override
-this setting by including an explicit call to @code{c-set-style} in your 
+this setting by including an explicit call to @code{c-set-style} in your
 language mode hook, or in @code{c-mode-common-hook}.
 @end enumerate
 @end defopt
@@ -3051,7 +3051,7 @@ are simply indented two spaces to the right of line 3.  But perhaps we'd
 like @ccmode{} to be a little more intelligent so that it aligns
 all the @samp{<<} symbols in lines 3 through 6.  To do this, we have
 to write a custom indentation function which finds the column of the first
-stream operator on the first line of the statement.  Here is sample 
+stream operator on the first line of the statement.  Here is sample
 lisp code implementing this:
 
 @example
@@ -3878,19 +3878,19 @@ calls.  This example illustrates these:
 @example
  1: void a_function( int line1,
  2:                  int line2 );
- 3: 
+ 3:
  4: void a_longer_function(
  5:     int line1,
  6:     int line2
  7:     );
- 8: 
+ 8:
  9: void call_them( int line1, int line2 )
 10: @{
 11:     a_function(
 12:         line1,
 13:         line2
 14:         );
-15: 
+15:
 16:     a_longer_function( line1,
 17:                        line2 );
 18: @}
@@ -3927,10 +3927,10 @@ covered are illustrated by this C++ example:
  3: @{
  4:     /* this line starts a multiline
  5:      * comment.  This line should get `c' syntax */
- 6: 
+ 6:
  7:     char* a_multiline_string = "This line starts a multiline \
  8: string.  This line should get `string' syntax.";
- 9: 
+ 9:
 10:   note:
 11:     @{
 12: #ifdef LOCK
@@ -4243,7 +4243,7 @@ Indent a multiline block @code{c-basic-offset} extra.  E.g:
 @example
 @group
 int *foo[] = @{
-    NULL,                 
+    NULL,
     @{17@},             @hereFn{c-indent-multi-line-block}
 @end group
 @end example
@@ -4474,7 +4474,7 @@ indentation is added.  E.g:
 @example
 @group
 main (int,
-      char **           
+      char **
      )                @hereFn{c-lineup-close-paren}
 @end group
 @end example
@@ -4684,7 +4684,7 @@ E.g:
 @example
 @group
 class Foo
-    extends           
+    extends
         Bar           @hereFn{c-lineup-java-inher}
     @sssTBasicOffset{}
 @end group
@@ -5548,7 +5548,7 @@ other top-level block constructs in the @ccmode{} languages).
 (@xref{Defuns,,, emacs, The Emacs Editor}, in the Emacs 20 manual).
 
 This heuristic is built into the core syntax analysis routines in
-(X)Emacs, so it's not really a @ccmode{} issue.  However, in Emacs 21.4
+(X)Emacs, so it's not really a @ccmode{} issue.  However, in Emacs 22.1
 it has become possible to turn it off@footnote{Using the variable
 @code{open-paren-in-column-0-is-defun-start}.} and @ccmode{} does so
 there since it got its own system to keep track of blocks.
diff --git a/man/custom.texi b/man/custom.texi
index 7dbd8af2458..a6a4490d467 100644
--- a/man/custom.texi
+++ b/man/custom.texi
@@ -506,9 +506,12 @@ customization files for different Emacs versions, like this:
       ((and (= emacs-major-version 21) (< emacs-minor-version 4))
        ;; @r{Emacs 21 customization, before version 21.4.}
        (setq custom-file "~/.custom-21.el"))
-      (t
+      ((< emacs-major-version 22)
        ;; @r{Emacs version 21.4 or later.}
-       (setq custom-file "~/.custom-21.4.el")))
+       (setq custom-file "~/.custom-21.4.el"))
+      (t
+       ;; @r{Emacs version 22.1 or later.}
+       (setq custom-file "~/.custom-22.el")))
 
 (load custom-file)
 @end example
diff --git a/man/emacs-xtra.texi b/man/emacs-xtra.texi
index 9dff3d9efd8..a1ccf101bd6 100644
--- a/man/emacs-xtra.texi
+++ b/man/emacs-xtra.texi
@@ -274,7 +274,7 @@ You can insert subdirectories with specified @code{ls} switches in
 Dired buffers, using @kbd{C-u i}.  You can change the @code{ls}
 switches of an already inserted subdirectory using @kbd{C-u l}.
 
-In Emacs versions 21.4 and later, Dired remembers the switches, so
+In Emacs versions 22.1 and later, Dired remembers the switches, so
 that reverting the buffer will not change them back to the main
 directory's switches.  Deleting a subdirectory forgets about its
 switches.
diff --git a/man/emacs.texi b/man/emacs.texi
index 340bcd76516..3bfc95aac5a 100644
--- a/man/emacs.texi
+++ b/man/emacs.texi
@@ -5,7 +5,7 @@
 
 @c The edition number appears in several places in this file
 @set EDITION   Fourteenth
-@set EMACSVER  21.3.50
+@set EMACSVER  22.0.50
 
 @copying
 This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},
diff --git a/man/faq.texi b/man/faq.texi
index 061441fe994..dc55c4b89b3 100644
--- a/man/faq.texi
+++ b/man/faq.texi
@@ -424,7 +424,7 @@ individual postings from, but pretty much everything is there.
 
 The archive is at @uref{ftp://ftp-mailing-list-archives.gnu.org}.
 
-The archive can be browsed over the web at 
+The archive can be browsed over the web at
 @uref{http://mail.gnu.org/archive/html/, the GNU mail archive}.
 
 Web-based Usenet search services, such as
@@ -2633,7 +2633,7 @@ on DOS and Windows, where the DOS end-of-line (EOL) format is the
 default, a backslash (@samp{\}) will appear in the mode line.
 
 If you are running a version of Emacs before 20.1, get @code{crypt++}
-(@pxref{Packages that do not come with Emacs}).  Among other things, 
+(@pxref{Packages that do not come with Emacs}).  Among other things,
 @code{crypt++} transparently modifies MS-DOS files as they are loaded
 and saved, allowing you to ignore the different conventions that Unix
 and MS-DOS have for delineating the end of a line.
@@ -3300,10 +3300,10 @@ distribution site, sources are available as
 @uref{ftp://ftp.gnu.org/pub/gnu/emacs/emacs-@value{VER}.tar.gz}
 
 The above will obviously change as new versions of Emacs come out.  For
-instance, when Emacs 21.42 is released, it will most probably be
+instance, when Emacs 22.42 is released, it will most probably be
 available as
 
-@uref{ftp://ftp.gnu.org/pub/gnu/emacs/emacs-21.42.tar.gz}
+@uref{ftp://ftp.gnu.org/pub/gnu/emacs/emacs-22.42.tar.gz}
 
 Again, you should use one of the GNU mirror sites (see @ref{Current GNU
 distributions}, and adjust the URL accordingly) so as to reduce load on
@@ -3543,7 +3543,7 @@ see @ref{Packages that do not come with Emacs}.
 List (ELL)}, maintained by @email{stephen@@anc.ed.ac.uk, Stephen Eglen},
 aims to provide one compact list with links to all of the current Emacs
 Lisp files on the internet.  The ELL can be browsed over the web, or
-from Emacs with @uref{http://www.anc.ed.ac.uk/~stephen/emacs/ell.el, 
+from Emacs with @uref{http://www.anc.ed.ac.uk/~stephen/emacs/ell.el,
 the @file{ell} package}.
 
 Many authors post their packages to the @uref{news:gnu.emacs.sources,
@@ -3805,7 +3805,7 @@ available at @uref{http://vms.gnu.org/}.
 
 Most of these modes are now available in standard Emacs distribution.
 To get additional modes, see @ref{Finding a package with particular
-functionality}.  
+functionality}.
 
 Barry Warsaw's @code{cc-mode} now works for C, C@t{++}, Objective-C, and
 Java code.  It is distributed with Emacs, but has
@@ -3932,7 +3932,7 @@ Superyank is an old version of Supercite.
 @email{daveg@@csvax.cs.caltech.edu, Dave Gillespie}
 
 @item Latest version
-2.02g (part of Emacs since version 21.4)
+2.02g (part of Emacs since version 22.1)
 
 @item Distribution
 No separate distribution outside of Emacs.  Older versions
diff --git a/man/tramp.texi b/man/tramp.texi
index ac6fb4d5436..afd5fd273e6 100644
--- a/man/tramp.texi
+++ b/man/tramp.texi
@@ -381,7 +381,7 @@ behind the scenes when you open a file with @value{tramp}.
 may be downloaded from
 @uref{http://savannah.nongnu.org/download/tramp/}. This
 release includes the full documentation and code for @value{tramp},
-suitable for installation.  But Emacs (21.4 or later) includes
+suitable for installation.  But Emacs (22.1 or later) includes
 @value{tramp} already, and there is a @value{tramp} package for XEmacs, as well.
 So maybe it is easier to just use those.  But if you want the bleeding
 edge, read on@dots{...}