Change release version from 21.4 to 22.1 throughout.

Change development version from 21.3.50 to 22.0.50.

132 files changed, 744 insertions, 744 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ba818d2b6e1..0f862963ca5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -6699,7 +6699,7 @@
         (tramp-multi-action-process-alive): New defun.
         (tramp-multi-actions): Use it.
         (tramp-handle-find-backup-file-name): `copy-tree' is available
-        since Emacs 21.4 only (XEmacs has it).  Implementation rewritten
+        since Emacs 22.1 only (XEmacs has it).  Implementation rewritten
         in order to avoid this function.
         (tramp-handle-write-region): Set current buffer.  If connection
         wasn't open, `file-modes' has changed it accidently.  Reported by
@@ -11330,7 +11330,7 @@
         (tramp-async-proc): New variable.
         (tramp-handle-shell-command): Adding asynchronous processes.
         They are far from being perfect, but it works at least for
-        `find-grep-dired' and `find-name-dired' in Emacs 21.4.
+        `find-grep-dired' and `find-name-dired' in Emacs 22.1.
         (top-level): Require password.el if visible.  Should be mandatory
         once No Gnus has found its way into (X)Emacs.
         (tramp-read-passwd): Invoke `password-read' if available,
@@ -12941,7 +12941,7 @@
         Apply `file-attributes' instead of `tramp-handle-file-attributes' in
         order to make the function more general.
         (tramp-handle-file-attributes): Replace proprietary optional
-        parameter NONNUMERIC by the recently (Emacs 21.4) introduced ID-FORMAT.
+        parameter NONNUMERIC by the recently (Emacs 22.1) introduced ID-FORMAT.
         (tramp-handle-file-attributes-with-perl): Handle parameter
         NONNUMERIC if set.  This wasn't done in the past.
         (tramp-post-connection): Apply second parameter "$2" if
@@ -12950,7 +12950,7 @@
         * net/tramp-smb.el (tramp-smb-handle-delete-file):
         Correct cut'n'waste error (`filename' instead of `directory').
         (tramp-smb-handle-directory-files-and-attributes)
-        (tramp-smb-handle-file-attributes): Add recently (Emacs 21.4)
+        (tramp-smb-handle-file-attributes): Add recently (Emacs 22.1)
         introduced parameter ID-FORMAT.
         (tramp-smb-handle-make-directory-internal): Correct cut'n'waste
         error (`directory' instead of `ldir').
diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10
index 70e149b51db..6467fef4e72 100644
--- a/lisp/ChangeLog.10
+++ b/lisp/ChangeLog.10
@@ -9439,7 +9439,7 @@
 
         * progmodes/ada-stmt.el (ada-stmt-add-to-ada-menu): Handle the
         menu pseudo-keys generated by easymenu which are lowercase in
-        Emacs 21.4.
+        Emacs 22.1.
 
         * progmodes/ada-xref.el
         (ada-xref-update-project-menu,ada-add-ada-menu): Ditto.
diff --git a/lisp/add-log.el b/lisp/add-log.el
index 50be95d265a..ce98760222d 100644
--- a/lisp/add-log.el
+++ b/lisp/add-log.el
@@ -126,7 +126,7 @@ this variable."
 
 (defcustom add-log-always-start-new-record nil
   "*If non-nil, `add-change-log-entry' will always start a new record."
-  :version "21.4"
+  :version "22.1"
   :type 'boolean
   :group 'change-log)
 
@@ -790,7 +790,7 @@ Has a preference of looking backwards."
                    ;; between that end and the desired position.
                    (when (save-excursion
                            (and (> location (point))
-                                (re-search-forward "^DEFUN" 
+                                (re-search-forward "^DEFUN"
                                                    (save-excursion
                                                      (goto-char location)
                                                      (line-end-position))
diff --git a/lisp/allout.el b/lisp/allout.el
index fa88588ec36..4b1c152b6b1 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -69,7 +69,7 @@
   "Extensive outline mode for use alone and with other modes."
   :prefix "allout-"
   :group 'editing
-  :version "21.4")
+  :version "22.1")
 
 ;;;_ + Layout, Mode, and Topic Header Configuration
 
diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index f1014a7260d..8f209d8c488 100644
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -174,7 +174,7 @@ When non-nil, a message is generated whenever a file is reverted."
 \(When the string is not empty, make sure that it has a leading space.)"
   :group 'auto-revert
   :type 'string
-  :version "21.4")
+  :version "22.1")
 
 (defcustom auto-revert-mode-hook nil
   "Functions to run when Auto-Revert Mode is activated."
@@ -243,7 +243,7 @@ machine, if it does not apply to too many version controlled
 buffers.  CPU usage depends on the version control system"
   :group 'auto-revert
   :type 'boolean
-  :version "21.4")
+  :version "22.1")
 
 (defvar global-auto-revert-ignore-buffer nil
   "*When non-nil, Global Auto-Revert Mode will not revert this buffer.
diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el
index 0c911ca8b7d..e6ff2868592 100644
--- a/lisp/calendar/appt.el
+++ b/lisp/calendar/appt.el
@@ -88,7 +88,7 @@ documentation of the function `appt-check'."
 
 (make-obsolete-variable 'appt-issue-message
                         "use the function `appt-activate', and the \
-variable `appt-display-format' instead." "21.4")
+variable `appt-display-format' instead." "22.1")
 
 ;;;###autoload
 (defcustom appt-message-warning-time 12
@@ -109,7 +109,7 @@ This variable is only relevant if `appt-msg-window' is nil."
   :type 'boolean
   :group 'appt)
 
-(make-obsolete-variable 'appt-visible 'appt-display-format "21.4")
+(make-obsolete-variable 'appt-visible 'appt-display-format "22.1")
 
 ;;;###autoload
 (defcustom appt-msg-window t
@@ -118,7 +118,7 @@ If non-nil, this variable overrides `appt-visible'."
   :type 'boolean
   :group 'appt)
 
-(make-obsolete-variable 'appt-msg-window 'appt-display-format "21.4")
+(make-obsolete-variable 'appt-msg-window 'appt-display-format "22.1")
 
 ;; TODO - add popup.
 (defcustom appt-display-format 'ignore
@@ -136,7 +136,7 @@ of the (obsolete) variables `appt-msg-window' and `appt-visible'."
           (const :tag "Echo-area" echo)
           (const :tag "No visible display" nil))
   :group 'appt
-  :version "21.4")
+  :version "22.1")
 
 ;;;###autoload
 (defcustom appt-display-mode-line t
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index 511f82f8f2f..ecbafd24430 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -282,7 +282,7 @@ search."
 The format of the header is specified by `diary-header-line-format'."
   :group   'diary
   :type    'boolean
-  :version "21.4")
+  :version "22.1")
 
 (defcustom diary-header-line-format
   '(:eval (calendar-string-spread
@@ -295,7 +295,7 @@ before edit/copy"
 Only used if `diary-header-line-flag' is non-nil."
   :group   'diary
   :type    'sexp
-  :version "21.4")
+  :version "22.1")
 
 (defvar diary-saved-point)              ; internal
 
@@ -546,7 +546,7 @@ changing the variable `diary-include-string'."
 (defface diary-button-face '((((type pc) (class color))
                    (:foreground "lightblue")))
   "Default face used for buttons."
-  :version "21.4"
+  :version "22.1"
   :group 'diary)
 
 (define-button-type 'diary-entry
@@ -1938,7 +1938,7 @@ template following the rules above."
                 :value-type (choice
                              (string :tag "Template for entry")
                              (function :tag "Unary function providing template")))
-  :version "21.4"
+  :version "22.1"
   :group 'diary)
 
 
diff --git a/lisp/comint.el b/lisp/comint.el
index f96da7fa0fd..ccd02db39cf 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -194,7 +194,7 @@ If you sometimes use comint-mode on text-only terminals or with `emacs-nw',
 you might wish to use another binding for `comint-kill-whole-line'."
   :type 'boolean
   :group 'comint
-  :version "21.4")
+  :version "22.1")
 
 (defvar comint-delimiter-argument-list ()
   "List of characters to recognise as separate arguments in input.
@@ -809,7 +809,7 @@ buffer.  The hook `comint-exec-hook' is run after each exec."
       ;; Insert the input at point
       (insert (buffer-substring-no-properties
                (previous-single-char-property-change (1+ pos) 'field)
-               (next-single-char-property-change pos 'field)))))) 
+               (next-single-char-property-change pos 'field))))))
 
 
 ;; Input history processing in a buffer
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 30d831ff039..1a20c54f0d1 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -1183,7 +1183,7 @@ links: groups have links to subgroups."
 (defcustom custom-buffer-done-kill nil
   "*Non-nil means exiting a Custom buffer should kill it."
   :type 'boolean
-  :version "21.4"
+  :version "22.1"
   :group 'custom-buffer)
 
 (defcustom custom-buffer-indent 3
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index fc293734495..ccee43822ee 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -51,7 +51,7 @@ the undo info for the current command never gets discarded.
 This should only be chosen under exceptional circumstances,
 since it could result in memory overflow and make Emacs crash."
                                               nil))
-                               "21.4")
+                               "22.1")
              (garbage-collection-messages alloc boolean)
              ;; buffer.c
              (mode-line-format modeline sexp) ;Hard to do right.
@@ -132,10 +132,10 @@ since it could result in memory overflow and make Emacs crash."
                                     (const :tag "always" t)))
              ;; fileio.c
              (insert-default-directory minibuffer boolean)
-             (read-file-name-completion-ignore-case minibuffer boolean "21.4")
+             (read-file-name-completion-ignore-case minibuffer boolean "22.1")
              ;; fns.c
              (use-dialog-box menu boolean "21.1")
-             (use-file-dialog menu boolean "21.4")
+             (use-file-dialog menu boolean "22.1")
              ;; frame.c
              (default-frame-alist frames
                (repeat (cons :format "%v"
@@ -277,13 +277,13 @@ since it could result in memory overflow and make Emacs crash."
                                                      :format "%v")
                                             (other :tag "Unlimited" t)))
              (unibyte-display-via-language-environment mule boolean)
-             (blink-cursor-alist cursor alist "21.4")
+             (blink-cursor-alist cursor alist "22.1")
              ;; xfaces.c
              (scalable-fonts-allowed display boolean)
              ;; xfns.c
              (x-bitmap-file-path installation
                                  (repeat (directory :format "%v")))
-             (x-use-old-gtk-file-dialog menu boolean "21.4")
+             (x-use-old-gtk-file-dialog menu boolean "22.1")
              ;; xterm.c
              (mouse-autoselect-window display boolean "21.3")
              (x-use-underline-position-properties display boolean "21.3")
diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el
index af310593124..22e81db9210 100644
--- a/lisp/dabbrev.el
+++ b/lisp/dabbrev.el
@@ -168,7 +168,7 @@ This variable has an effect only when the value of
                  (const :tag "based on `case-replace'" case-replace)
                  (other :tag "on" t))
   :group 'dabbrev
-  :version "21.4")
+  :version "22.1")
 
 (defcustom dabbrev-case-replace 'case-replace
   "*Whether dabbrev applies the abbreviations's case pattern to the expansion.
diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index 5ab2fec4fad..f1e1e9b9cdd 100644
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -225,7 +225,7 @@ This is a fairly large file, not typically present on GNU systems.  At
 the time of writing it is at
 <URL:http://www.unicode.org/Public/UNIDATA/UnicodeData.txt>."
   :group 'mule
-  :version "21.4"
+  :version "22.1"
   :type '(choice (const :tag "None" nil)
                  file))
 
diff --git a/lisp/desktop.el b/lisp/desktop.el
index aaa24874579..6ec81fcac70 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -130,7 +130,7 @@ determine where the desktop is saved."
     (const :tag "Save if desktop file exists, else don't" if-exists)
     (const :tag "Never save" nil))
   :group 'desktop
-  :version "21.4")
+  :version "22.1")
 
 (defcustom desktop-base-file-name
   (convert-standard-filename ".emacs.desktop")
@@ -144,7 +144,7 @@ determine where the desktop is saved."
 The base name of the file is specified in `desktop-base-file-name'."
   :type '(repeat directory)
   :group 'desktop
-  :version "21.4")
+  :version "22.1")
 
 (defcustom desktop-missing-file-warning nil
   "*If non-nil then `desktop-read' asks if a non-existent file should be recreated.
@@ -154,21 +154,21 @@ Also pause for a moment to display message about errors signaled in
 If nil, just print error messages in the message buffer."
   :type 'boolean
   :group 'desktop
-  :version "21.4")
+  :version "22.1")
 
 (defcustom desktop-no-desktop-file-hook nil
   "Normal hook run when `desktop-read' can't find a desktop file.
 May e.g. be used to show a dired buffer."
   :type 'hook
   :group 'desktop
-  :version "21.4")
+  :version "22.1")
 
 (defcustom desktop-after-read-hook nil
   "Normal hook run after a successful `desktop-read'.
 May e.g. be used to show a buffer list."
   :type 'hook
   :group 'desktop
-  :version "21.4")
+  :version "22.1")
 
 (defcustom desktop-save-hook nil
   "Normal hook run before the desktop is saved in a desktop file.
@@ -204,7 +204,7 @@ An element may be variable name (a symbol) or a cons cell of the form
 to the value obtained by evaluateing FORM."
   :type '(repeat (restricted-sexp :match-alternatives (symbolp consp)))
   :group 'desktop
-  :version "21.4")
+  :version "22.1")
 
 (defcustom desktop-clear-preserve-buffers-regexp
   "^\\(\\*scratch\\*\\|\\*Messages\\*\\|\\*tramp/.+\\*\\)$"
@@ -212,7 +212,7 @@ to the value obtained by evaluateing FORM."
 See also `desktop-clear-preserve-buffers'."
   :type 'regexp
   :group 'desktop
-  :version "21.4")
+  :version "22.1")
 
 (defcustom desktop-clear-preserve-buffers nil
   "*List of buffer names that `desktop-clear' should not delete.
@@ -265,7 +265,7 @@ Possible values are:
    local    -- Relative to directory of desktop file."
   :type '(choice (const absolute) (const tilde) (const local))
   :group 'desktop
-  :version "21.4")
+  :version "22.1")
 
 (defcustom desktop-restore-eager t
   "Number of buffers to restore immediately.
@@ -273,20 +273,20 @@ Remaining buffers are restored lazily (when Emacs is idle).
 If value is t, all buffers are restored immediately."
   :type '(choice (const t) integer)
   :group 'desktop
-  :version "21.4")
+  :version "22.1")
 
 (defcustom desktop-lazy-verbose t
   "Verbose reporting of lazily created buffers."
   :type 'boolean
   :group 'desktop
-  :version "21.4")
+  :version "22.1")
 
 (defcustom desktop-lazy-idle-delay 5
   "Idle delay before starting to create buffers.
 See `desktop-restore-eager'."
   :type 'integer
   :group 'desktop
-  :version "21.4")
+  :version "22.1")
 
 ;;;###autoload
 (defvar desktop-save-buffer nil
@@ -795,7 +795,7 @@ directory DIRNAME."
   (desktop-kill)
   (desktop-clear)
   (desktop-read dirname))
-  
+
 ;; ----------------------------------------------------------------------------
 ;;;###autoload
 (defun desktop-save-in-desktop-dir ()
diff --git a/lisp/dired.el b/lisp/dired.el
index 461546ddac5..f64c2472067 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -291,7 +291,7 @@ Subexpression 2 must end right before the \\n or \\r.")
   '((t (:inherit font-lock-type-face)))
   "Face used for directory headers."
   :group 'dired-faces
-  :version "21.4")
+  :version "22.1")
 (defvar dired-header-face 'dired-header
   "Face name used for directory headers.")
 
@@ -299,7 +299,7 @@ Subexpression 2 must end right before the \\n or \\r.")
   '((t (:inherit font-lock-constant-face)))
   "Face used for dired marks."
   :group 'dired-faces
-  :version "21.4")
+  :version "22.1")
 (defvar dired-mark-face 'dired-mark
   "Face name used for dired marks.")
 
@@ -307,7 +307,7 @@ Subexpression 2 must end right before the \\n or \\r.")
   '((t (:inherit font-lock-warning-face)))
   "Face used for marked files."
   :group 'dired-faces
-  :version "21.4")
+  :version "22.1")
 (defvar dired-marked-face 'dired-marked
   "Face name used for marked files.")
 
@@ -315,7 +315,7 @@ Subexpression 2 must end right before the \\n or \\r.")
   '((t (:inherit font-lock-warning-face)))
   "Face used for flagged files."
   :group 'dired-faces
-  :version "21.4")
+  :version "22.1")
 (defvar dired-flagged-face 'dired-flagged
   "Face name used for flagged files.")
 
@@ -323,7 +323,7 @@ Subexpression 2 must end right before the \\n or \\r.")
   '((t (:inherit font-lock-comment-face)))
   "Face used to highlight a part of a buffer that needs user attention."
   :group 'dired-faces
-  :version "21.4")
+  :version "22.1")
 (defvar dired-warning-face 'dired-warning
   "Face name used for a part of a buffer that needs user attention.")
 
@@ -331,7 +331,7 @@ Subexpression 2 must end right before the \\n or \\r.")
   '((t (:inherit font-lock-function-name-face)))
   "Face used for subdirectories."
   :group 'dired-faces
-  :version "21.4")
+  :version "22.1")
 (defvar dired-directory-face 'dired-directory
   "Face name used for subdirectories.")
 
@@ -339,7 +339,7 @@ Subexpression 2 must end right before the \\n or \\r.")
   '((t (:inherit font-lock-keyword-face)))
   "Face used for symbolic links."
   :group 'dired-faces
-  :version "21.4")
+  :version "22.1")
 (defvar dired-symlink-face 'dired-symlink
   "Face name used for symbolic links.")
 
@@ -347,7 +347,7 @@ Subexpression 2 must end right before the \\n or \\r.")
   '((t (:inherit font-lock-string-face)))
   "Face used for files suffixed with `completion-ignored-extensions'."
   :group 'dired-faces
-  :version "21.4")
+  :version "22.1")
 (defvar dired-ignored-face 'dired-ignored
   "Face name used for files suffixed with `completion-ignored-extensions'.")
 
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index a11831f944e..25a1ba080d1 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1765,7 +1765,7 @@ With argument, insert value in current buffer after the form."
         (byte-compile-maxdepth 0)
         (byte-compile-output nil)
         ;; This allows us to get the positions of symbols read; it's
-        ;; new in Emacs 21.4.
+        ;; new in Emacs 22.1.
         (read-with-symbol-positions inbuffer)
         (read-symbol-positions-list nil)
         ;;        #### This is bound in b-c-close-variables.
diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el
index 811511a1f00..a10b8546d03 100644
--- a/lisp/emacs-lisp/derived.el
+++ b/lisp/emacs-lisp/derived.el
@@ -249,7 +249,7 @@ is not very useful."
   (while (get mode 'derived-mode-parent)
     (setq mode (get mode 'derived-mode-parent)))
   mode)
-(make-obsolete 'derived-mode-class 'derived-mode-p "21.4")
+(make-obsolete 'derived-mode-class 'derived-mode-p "22.1")
 
 
 ;;; PRIVATE
diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el
index 7e2ac5aa883..18e5706dc3d 100644
--- a/lisp/emacs-lisp/find-func.el
+++ b/lisp/emacs-lisp/find-func.el
@@ -96,7 +96,7 @@ should insert the face name.
 Please send improvements and fixes to the maintainer."
   :type 'regexp
   :group 'find-function
-  :version "21.4")
+  :version "22.1")
 
 (defvar find-function-regexp-alist
   '((nil . find-function-regexp)
diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el
index 336a1ff82d0..79aad8bd121 100644
--- a/lisp/emacs-lisp/timer.el
+++ b/lisp/emacs-lisp/timer.el
@@ -151,7 +151,7 @@ fire repeatedly that many seconds apart."
   timer)
 (make-obsolete 'timer-set-time-with-usecs
                "use `timer-set-time' and `timer-inc-time' instead."
-               "21.4")
+               "22.1")
 
 (defun timer-set-function (timer function &optional args)
   "Make TIMER call FUNCTION with optional ARGS when triggering."
diff --git a/lisp/emacs-lisp/warnings.el b/lisp/emacs-lisp/warnings.el
index e2bf813f9ce..343eda970ce 100644
--- a/lisp/emacs-lisp/warnings.el
+++ b/lisp/emacs-lisp/warnings.el
@@ -31,7 +31,7 @@
 
 (defgroup warnings nil
   "Log and display warnings."
-  :version "21.4"
+  :version "22.1"
   :group 'lisp)
 
 (defvar warning-levels
@@ -77,7 +77,7 @@ the warning is logged in the warnings buffer, but the buffer
 is not immediately displayed.  See also `warning-minimum-log-level'."
   :group 'warnings
   :type '(choice (const :emergency) (const :error) (const :warning))
-  :version "21.4")
+  :version "22.1")
 (defvaralias 'display-warning-minimum-level 'warning-minimum-level)
 
 (defcustom warning-minimum-log-level :warning
@@ -86,7 +86,7 @@ If a warning severity level is lower than this,
 the warning is completely ignored."
   :group 'warnings
   :type '(choice (const :emergency) (const :error) (const :warning))
-  :version "21.4")
+  :version "22.1")
 (defvaralias 'log-warning-minimum-level 'warning-minimum-log-level)
 
 (defcustom warning-suppress-log-types nil
@@ -100,7 +100,7 @@ If TYPE is a symbol FOO, that is equivalent to the list (FOO),
 so only the element (FOO) will match it."
   :group 'warnings
   :type '(repeat (repeat symbol))
-  :version "21.4")
+  :version "22.1")
 
 (defcustom warning-suppress-types nil
   "List of warning types not to display immediately.
@@ -115,7 +115,7 @@ so only the element (FOO) will match it.
 See also `warning-suppress-log-types'."
   :group 'warnings
   :type '(repeat (repeat symbol))
-  :version "21.4")
+  :version "22.1")
 
 ;;; The autoload cookie is so that programs can bind this variable
 ;;; safely, testing the existing value, before they call one of the
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index fd550eb3c0b..76c0f860a00 100644
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -267,7 +267,7 @@
   :group 'editing-basics
   :group 'convenience
   :group 'emulations
-  :version "21.4"
+  :version "22.1"
   :link '(emacs-commentary-link :tag "Commentary" "cua-base.el")
   :link '(emacs-library-link :tag "Lisp File" "cua-base.el"))
 
@@ -1371,7 +1371,7 @@ paste (in addition to the normal emacs bindings)."
   (setq cua--debug (not cua--debug)))
 
 ;; Install run-time check for older versions of CUA-mode which does not
-;; work with GNU Emacs version 21.4 and newer.
+;; work with GNU Emacs version 22.1 and newer.
 ;;
 ;; Except for version 1.2, all of the 1.x and 2.x version of cua-mode
 ;; provided the `CUA-mode' feature.  Since this is no longer true,
diff --git a/lisp/emulation/keypad.el b/lisp/emulation/keypad.el
index 3fb7cd753bc..95d59d5c8f5 100644
--- a/lisp/emulation/keypad.el
+++ b/lisp/emulation/keypad.el
@@ -108,7 +108,7 @@ decimal key must be specified."
              (keypad-setup value nil nil value)))
   :initialize 'custom-initialize-default
   :link '(emacs-commentary-link "keypad.el")
-  :version "21.4"
+  :version "22.1"
   :type '(choice (const :tag "Plain numeric keypad" numeric)
                  (character :tag "Numeric Keypad with Decimal Key"
                             :match (lambda (widget value) (integerp value))
@@ -131,7 +131,7 @@ decimal key must be specified."
              (keypad-setup value t nil value)))
   :initialize 'custom-initialize-default
   :link '(emacs-commentary-link "keypad.el")
-  :version "21.4"
+  :version "22.1"
   :type '(choice (const :tag "Plain numeric keypad" numeric)
                  (character :tag "Numeric Keypad with Decimal Key"
                             :match (lambda (widget value) (integerp value))
@@ -154,7 +154,7 @@ decimal key must be specified."
              (keypad-setup value nil t value)))
   :initialize 'custom-initialize-default
   :link '(emacs-commentary-link "keypad.el")
-  :version "21.4"
+  :version "22.1"
   :type '(choice (const :tag "Plain numeric keypad" numeric)
                  (character :tag "Numeric Keypad with Decimal Key"
                             :match (lambda (widget value) (integerp value))
@@ -177,7 +177,7 @@ decimal key must be specified."
              (keypad-setup value t t value)))
   :initialize 'custom-initialize-default
   :link '(emacs-commentary-link "keypad.el")
-  :version "21.4"
+  :version "22.1"
   :type '(choice (const :tag "Plain numeric keypad" numeric)
                  (character :tag "Numeric Keypad with Decimal Key"
                             :match (lambda (widget value) (integerp value))
diff --git a/lisp/faces.el b/lisp/faces.el
index 4bfa94b062f..1a868b4537c 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1822,7 +1822,7 @@ created."
      :box (:line-width -1 :color "grey40" :style nil)
      :foreground "grey80" :background "grey30"))
   "Basic mode line face for non-selected windows."
-  :version "21.4"
+  :version "22.1"
   :group 'modeline
   :group 'basic-faces)
 
@@ -1883,7 +1883,7 @@ created."
                              (((type pc)) :foreground "magenta")
                              (t :foreground "dark blue"))
   "Face for minibuffer prompts."
-  :version "21.4"
+  :version "22.1"
   :group 'basic-faces)
 
 (setq minibuffer-prompt-properties
diff --git a/lisp/files.el b/lisp/files.el
index 045958bf9c5..a4bb4f86d4e 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -305,7 +305,7 @@ Any other non-nil value means ask user whether to add a newline, when saving."
                  (const :tag "When visiting or saving" visit-save)
                  (other :tag "Ask" ask))
   :group 'editing-basics
-  :version "21.4")
+  :version "22.1")
 
 (defcustom auto-save-default t
   "*Non-nil says by default do auto-saving of every file-visiting buffer."
@@ -377,7 +377,7 @@ Variable `buffer-file-name' is already set up.
 The functions are called in the order given until one of them returns non-nil.")
 (defvaralias 'find-file-not-found-hooks 'find-file-not-found-functions)
 (make-obsolete-variable
- 'find-file-not-found-hooks 'find-file-not-found-functions "21.4")
+ 'find-file-not-found-hooks 'find-file-not-found-functions "22.1")
 
 ;;;It is not useful to make this a local variable.
 ;;;(put 'find-file-hooks 'permanent-local t)
@@ -388,9 +388,9 @@ functions are called."
   :group 'find-file
   :type 'hook
   :options '(auto-insert)
-  :version "21.4")
+  :version "22.1")
 (defvaralias 'find-file-hooks 'find-file-hook)
-(make-obsolete-variable 'find-file-hooks 'find-file-hook "21.4")
+(make-obsolete-variable 'find-file-hooks 'find-file-hook "22.1")
 
 (defvar write-file-functions nil
   "List of functions to be called before writing out a buffer to a file.
@@ -409,12 +409,12 @@ node `(elisp)Saving Buffers'.)  To perform various checks or
 updates before the buffer is saved, use `before-save-hook' .")
 (put 'write-file-functions 'permanent-local t)
 (defvaralias 'write-file-hooks 'write-file-functions)
-(make-obsolete-variable 'write-file-hooks 'write-file-functions "21.4")
+(make-obsolete-variable 'write-file-hooks 'write-file-functions "22.1")
 
 (defvar local-write-file-hooks nil)
 (make-variable-buffer-local 'local-write-file-hooks)
 (put 'local-write-file-hooks 'permanent-local t)
-(make-obsolete-variable 'local-write-file-hooks 'write-file-functions "21.4")
+(make-obsolete-variable 'local-write-file-hooks 'write-file-functions "22.1")
 
 (defvar write-contents-functions nil
   "List of functions to be called before writing out a buffer to a file.
@@ -434,7 +434,7 @@ To perform various checks or updates before the buffer is saved,
 use `before-save-hook'.")
 (make-variable-buffer-local 'write-contents-functions)
 (defvaralias 'write-contents-hooks 'write-contents-functions)
-(make-obsolete-variable 'write-contents-hooks 'write-contents-functions "21.4")
+(make-obsolete-variable 'write-contents-hooks 'write-contents-functions "22.1")
 
 (defcustom enable-local-variables t
   "*Control use of local variables in files you visit.
@@ -1284,7 +1284,7 @@ suppresses this warning."
 When nil, never request confirmation."
   :group 'files
   :group 'find-file
-  :version "21.4"
+  :version "22.1"
   :type '(choice integer (const :tag "Never request confirmation" nil)))
 
 (defun find-file-noselect (filename &optional nowarn rawfile wildcards)
@@ -2378,7 +2378,7 @@ Add expressions to this list if you want Emacs to evaluate them, when
 they appear in an `eval' local variable specification, without first
 asking you for confirmation."
   :group 'find-file
-  :version "21.4"
+  :version "22.1"
   :type '(repeat sexp))
 
 (put 'c-set-style 'safe-local-eval-function t)
@@ -3470,7 +3470,7 @@ change the additional actions you can take on files."
              (buffer-list)
              '("buffer" "buffers" "save")
              save-some-buffers-action-alist))
-      ;; Maybe to save abbrevs, and record whether 
+      ;; Maybe to save abbrevs, and record whether
       ;; we either saved them or asked to.
       (and save-abbrevs abbrevs-changed
            (progn
diff --git a/lisp/filesets.el b/lisp/filesets.el
index 8599cb01d93..dee662ee87d 100644
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -296,7 +296,7 @@ key is supported."
   "The fileset swapper."
   :prefix "filesets-"
   :group 'convenience
-  :version "21.4")
+  :version "22.1")
 
 (defcustom filesets-menu-name "Filesets"
   "*Filesets' menu name."
diff --git a/lisp/find-dired.el b/lisp/find-dired.el
index 2f499f243d7..d52305a500a 100644
--- a/lisp/find-dired.el
+++ b/lisp/find-dired.el
@@ -62,7 +62,7 @@ Use the \"-F\" or \"-b\" switches if and only if you also use
 them for `find-ls-option'."
   :type 'string
   :group 'find-dired
-  :version "21.4")
+  :version "22.1")
 
 ;;;###autoload
 (defcustom find-grep-options
diff --git a/lisp/frame.el b/lisp/frame.el
index 76049faddee..30ea94cde0f 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -135,7 +135,7 @@ Pass it BUFFER as first arg, and (cdr ARGS) gives the rest of the args."
            ;; (set-window-dedicated-p window t)
            window))
        ;; If no window yet, make one in a new frame.
-       (let ((frame 
+       (let ((frame
               (with-current-buffer buffer
                 (make-frame (append args special-display-frame-alist)))))
          (set-window-buffer (frame-selected-window frame) buffer)
@@ -593,7 +593,7 @@ The functions are run with one arg, the newly created frame.")
 
 ;; Alias, kept temporarily.
 (defalias 'new-frame 'make-frame)
-(make-obsolete 'new-frame 'make-frame "21.4")
+(make-obsolete 'new-frame 'make-frame "22.1")
 
 (defun make-frame (&optional parameters)
   "Return a newly created frame displaying the current buffer.
@@ -1195,7 +1195,7 @@ left untouched.  FRAME nil or omitted means use the selected frame."
 
 ;; miscellaneous obsolescence declarations
 (defvaralias 'delete-frame-hook 'delete-frame-functions)
-(make-obsolete-variable 'delete-frame-hook 'delete-frame-functions "21.4")
+(make-obsolete-variable 'delete-frame-hook 'delete-frame-functions "22.1")
 
 
 ;; Highlighting trailing whitespace.
diff --git a/lisp/fringe.el b/lisp/fringe.el
index 3f1e9393136..3c554f1ca55 100644
--- a/lisp/fringe.el
+++ b/lisp/fringe.el
@@ -37,7 +37,7 @@
 
 (defgroup fringe nil
   "Window fringes."
-  :version "21.4"
+  :version "22.1"
   :group 'frames)
 
 ;; Standard fringe bitmaps
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index e0db7c194a7..7a4b1e68e58 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1174,7 +1174,7 @@
         * pgg-gpg.el (pgg-gpg-lookup-all-secret-keys)
         (pgg-gpg-lookup-key): Use regexp match instead of
         split-string (split-string is different between emacs 21.2 and
-        21.4).  Reported by ultrasoul@ultrasoul.com (David D. Smith).
+        22.1).  Reported by ultrasoul@ultrasoul.com (David D. Smith).
 
 2004-07-28  Simon Josefsson  <jas@extundo.com>
 
diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2
index 2dbd6d306dd..57055426ce9 100644
--- a/lisp/gnus/ChangeLog.2
+++ b/lisp/gnus/ChangeLog.2
@@ -50,7 +50,7 @@
         * gnus-sum.el (gnus-select-newsgroup): Use cat.
 
         * gnus-agent.el (gnus-agent-cat-enable-undownloaded-faces): New
-        cat. 
+        cat.
 
         * gnus.el (gnus-user-agent): Moved here.
 
@@ -108,7 +108,7 @@
 2003-12-31  Jeremy Maitin-Shepard  <jbms@attbi.com>
 
         * mml.el (mml-generate-mime-1): Use mml-compute-boundary (tiny
-        change). 
+        change).
 
 2003-12-30  Reiner Steib  <Reiner.Steib@gmx.de>
 
@@ -391,7 +391,7 @@
 
         * gnus-cus.el (gnus-agent-customize-category): Added missing
         agent-disable-undownloaded-faces parameter.
-        
+
         * gnus-start.el (gnus-activate-group): Backed out my 2003-11-29
         patch as it was too late at adjusting the active range.
         (gnus-get-unread-articles-in-group): Added call to new
@@ -401,7 +401,7 @@
 
         * message.el (message-get-reply-headers): Narrow to headers.
 
-2003-12-10  Teodor Zlatanov  <tzz@lifelogs.com> 
+2003-12-10  Teodor Zlatanov  <tzz@lifelogs.com>
 
         * spam.el (spam-disable-spam-split-during-ham-respool): new
         variable.  From lorentey@elte.hu (L,Bu(Brentey K,Ba(Broly)
@@ -557,7 +557,7 @@
 
 2003-11-30  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
-        * gnus-agent.el (gnus-agent-covered-methods): Remove nil methods. 
+        * gnus-agent.el (gnus-agent-covered-methods): Remove nil methods.
 
 2003-11-29  Kevin Greiner <kgreiner@xpediantsolutions.com>
         * gnus-start.el (gnus-activate-group): The active range of the
@@ -813,16 +813,16 @@
         nnmail-cache-insert
 
         * nnmh.el (nnmh-request-accept-article): pass sender to
-        nnmail-cache-insert 
+        nnmail-cache-insert
 
         * nnmbox.el (nnmbox-request-accept-article): pass sender to
-        nnmail-cache-insert 
+        nnmail-cache-insert
 
         * nnfolder.el (nnfolder-request-accept-article): pass sender to
-        nnmail-cache-insert 
+        nnmail-cache-insert
 
         * nnbabyl.el (nnbabyl-request-accept-article): pass sender to
-        nnmail-cache-insert 
+        nnmail-cache-insert
 
         * nnmail.el (nnmail-cache-insert): accept sender parameter and
         pass it to the nnmail-spool-hook
@@ -887,7 +887,7 @@
         * gnus.el (gnus-group-guess-full-name-from-command-method): new function
 
         * gnus-registry.el (gnus-registry-fetch-group): use long names if
-        requested 
+        requested
         (gnus-registry-split-fancy-with-parent): when long names are in
         use, strip the name if we're in the native server, or else return nothing
         (gnus-registry-spool-action, gnus-registry-action): use
@@ -990,7 +990,7 @@
 
 2003-10-27  Romain FRANCOISE  <romain@orebokech.com>
 
-        * gnus-art.el (gnus-article-goto-prev-page): Doc fix. 
+        * gnus-art.el (gnus-article-goto-prev-page): Doc fix.
 
 2003-10-27  Simon Josefsson  <jas@extundo.com>
 
@@ -1069,7 +1069,7 @@
         building with XEmacs so byte-compile it.
         (dgnushack-make-load): When building with XEmacs do nothing except
         byte-compile the autoload file and create a dummy gnus-load.el
-        file. 
+        file.
 
 2003-10-23  Katsumi Yamaoka  <yamaoka@jpl.org>
 
@@ -1128,7 +1128,7 @@
 2003-10-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * gnus-picon.el (gnus-picon-transform-address): Protect against
-        errors. 
+        errors.
 
 2003-10-20  Katsumi Yamaoka  <yamaoka@jpl.org>
 
@@ -1140,12 +1140,12 @@
 2003-10-20  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * spam-report.el (spam-report-url-ping-plain): Include a
-        User-Agent. 
+        User-Agent.
 
         * gnus-msg.el (gnus-extended-version): Use it.
 
         * gnus-util.el (gnus-emacs-version): Separated out into own
-        function. 
+        function.
 
 2003-10-19  Reiner Steib  <Reiner.Steib@gmx.de>
 
@@ -1181,15 +1181,15 @@
 2003-10-18  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * pop3.el (pop3-read-response): Check whether the process is
-        alive. 
+        alive.
 
         * gnus-sum.el (gnus-summary-refer-article): Strip spaces.
 
         * rfc2047.el (rfc2047-encode-region): Do error out on invalid
-        strings. 
+        strings.
 
         * nntp.el (nntp-retrieve-headers-with-xover): Get error messages
-        right. 
+        right.
 
         * gnus-agent.el (gnus-agent-read-servers): Remove sit-for.
 
@@ -1198,14 +1198,14 @@
         * message.el (message-field-value): New function.
         (message-insert-disposition-notification-to): Use Reply-To, too.
 
-        * imap.el (imap-mailbox-status): Upcase STATUS commands. 
+        * imap.el (imap-mailbox-status): Upcase STATUS commands.
 
         * gnus-sum.el (gnus-remove-odd-characters): New function.
         (gnus-nov-parse-line): Use it.
 
 2003-10-18  Matt Swift  <swift@alum.mit.edu>
 
-        * mm-decode.el (mm-inline-media-tests): Recognize pjpeg as jpeg. 
+        * mm-decode.el (mm-inline-media-tests): Recognize pjpeg as jpeg.
 
 2003-10-18  Romain FRANCOISE  <romain@orebokech.com>
 
@@ -1269,14 +1269,14 @@
 2003-10-17  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * gnus-sum.el (gnus-summary-enter-digest-group): ogroup, nor
-        group. 
+        group.
 
         * gnus-msg.el (gnus-inews-insert-archive-gcc): Use the parent
         name for gcc-self.
         (gnus-inews-insert-archive-gcc): Paren mistake.
 
         * gnus-sum.el (gnus-summary-enter-digest-group): Add
-        parent-group. 
+        parent-group.
 
         * gnus-art.el (gnus-ignored-headers): Add more headers.
 
@@ -1297,7 +1297,7 @@
         (mail-source-fetch-imap): Use them.
 
         * nndraft.el (nndraft-request-move-article): Fix infinite
-        recursion. 
+        recursion.
 
         * gnus-group.el (gnus-group-mark-regexp): Jump to groups.
 
@@ -1310,7 +1310,7 @@
 
         * message.el (message-inserted-headers): New variable.
         (message-mode): Make local.
-        (message-mode): Set all the local action variables to nil.      
+        (message-mode): Set all the local action variables to nil.
 
 2003-10-16  Katsumi Yamaoka  <yamaoka@jpl.org>
 
@@ -1368,7 +1368,7 @@
         found (idea from Adrian Lanz <lanz@fowi.ethz.ch>)
         (spam-check-bogofilter-headers, spam-check-blackholes, spam-check-BBDB)
         (spam-from-listed-p): use nnmail-fetch-field instead of message-fetch-field
-        
+
 
 2003-10-03  Katsumi Yamaoka  <yamaoka@jpl.org>
 
@@ -1439,7 +1439,7 @@
         to MML.  MIME -> MML -> MIME does not work for PGP/MIME.
 
         * message.el (message-bounce, message-forward-show-mml): do.
-        
+
 2003-09-13  Jesper Harder  <harder@ifa.au.dk>
 
         * rfc2047.el (rfc2047-charset-encoding-alist): Add viscii.
@@ -1760,7 +1760,7 @@
 
 2003-07-25  Teodor Zlatanov  <tzz@lifelogs.com>
 
-        * spam.el (spam-use-regex-body, spam-regex-body-spam) 
+        * spam.el (spam-use-regex-body, spam-regex-body-spam)
         (spam-regex-body-ham): new variables, default to nil/empty/empty
         (spam-install-hooks): added spam-use-regex-body to list or
         pre-install conditions
@@ -1947,7 +1947,7 @@
 2003-06-24  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * gnus-ems.el (gnus-put-image): Mark the right text segment with
-        gnus-image-category. 
+        gnus-image-category.
 
         * gnus-srvr.el (gnus-browse-unsubscribe-group): Strip prefix from
         native groups.
@@ -4809,7 +4809,7 @@
 2003-02-20  Jesper Harder  <harder@ifa.au.dk>
 
         * gnus-spec.el (gnus-xmas-format): Use insert instead of
-        insert-string which is obsolete in Emacs 21.4.
+        insert-string which is obsolete in Emacs 22.1.
 
         * message.el (message-cross-post-followup-to-header): do.
 
diff --git a/lisp/gnus/binhex.el b/lisp/gnus/binhex.el
index 17103c1b4f3..fe8d99dcc02 100644
--- a/lisp/gnus/binhex.el
+++ b/lisp/gnus/binhex.el
@@ -50,7 +50,7 @@ input and write the converted data to its standard output."
 (defcustom binhex-use-external
   (executable-find binhex-decoder-program)
   "*Use external binhex program."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-extract
   :type 'boolean)
 
diff --git a/lisp/gnus/deuglify.el b/lisp/gnus/deuglify.el
index a00151063de..0dc6e6d002a 100644
--- a/lisp/gnus/deuglify.el
+++ b/lisp/gnus/deuglify.el
@@ -146,7 +146,7 @@
 ;; Hey, John.  There's no in all your sentences!
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; 
+;;
 ;; Usage
 ;; -----
 ;;
@@ -231,59 +231,59 @@
 
 (defgroup gnus-outlook-deuglify nil
   "Deuglify articles generated by broken user agents like MS Outlook (Express)."
-  :version "21.4")
+  :version "22.1")
 
 ;;;###autoload
 (defcustom gnus-outlook-deuglify-unwrap-min 45
   "Minimum length of the cited line above the (possibly) wrapped line."
-  :version "21.4"
+  :version "22.1"
   :type 'integer
   :group 'gnus-outlook-deuglify)
 
 ;;;###autoload
 (defcustom gnus-outlook-deuglify-unwrap-max 95
   "Maximum length of the cited line after unwrapping."
-  :version "21.4"
+  :version "22.1"
   :type 'integer
   :group 'gnus-outlook-deuglify)
 
 (defcustom gnus-outlook-deuglify-cite-marks ">|#%"
   "Characters that indicate cited lines."
-  :version "21.4"
+  :version "22.1"
   :type 'string
   :group 'gnus-outlook-deuglify)
 
 (defcustom gnus-outlook-deuglify-unwrap-stop-chars nil ;; ".?!" or nil
   "Characters that inhibit unwrapping if they are the last one on the cited line above the possible wrapped line."
-  :version "21.4"
+  :version "22.1"
   :type '(radio (const :format "None  " nil)
                 (string :value ".?!"))
   :group 'gnus-outlook-deuglify)
 
 (defcustom gnus-outlook-deuglify-no-wrap-chars "`"
   "Characters that inhibit unwrapping if they are the first one in the possibly wrapped line."
-  :version "21.4"
+  :version "22.1"
   :type 'string
   :group 'gnus-outlook-deuglify)
 
 (defcustom  gnus-outlook-deuglify-attrib-cut-regexp
   "\\(On \\|Am \\)?\\(Mon\\|Tue\\|Wed\\|Thu\\|Fri\\|Sat\\|Sun\\),[^,]+, "
   "Regular expression matching the beginning of an attribution line that should be cut off."
-  :version "21.4"
+  :version "22.1"
   :type 'string
   :group 'gnus-outlook-deuglify)
 
 (defcustom gnus-outlook-deuglify-attrib-verb-regexp
   "wrote\\|writes\\|says\\|schrieb\\|schreibt\\|meinte\\|skrev\\|a écrit\\|schreef\\|escribió"
   "Regular expression matching the verb used in an attribution line."
-  :version "21.4"
+  :version "22.1"
   :type 'string
   :group 'gnus-outlook-deuglify)
 
 (defcustom  gnus-outlook-deuglify-attrib-end-regexp
   ": *\\|\\.\\.\\."
   "Regular expression matching the end of an attribution line."
-  :version "21.4"
+  :version "22.1"
   :type 'string
   :group 'gnus-outlook-deuglify)
 
@@ -291,7 +291,7 @@
 (defcustom gnus-outlook-display-hook nil
   "A hook called after an deuglified article has been prepared.
 It is run after `gnus-article-prepare-hook'."
-  :version "21.4"
+  :version "22.1"
   :type 'hook
   :group 'gnus-outlook-deuglify)
 
diff --git a/lisp/gnus/flow-fill.el b/lisp/gnus/flow-fill.el
index 8a8098727fe..f39ba9edbbe 100644
--- a/lisp/gnus/flow-fill.el
+++ b/lisp/gnus/flow-fill.el
@@ -56,7 +56,7 @@
 (defcustom fill-flowed-display-column 'fill-column
   "Column beyond which format=flowed lines are wrapped, when displayed.
 This can be a Lisp expression or an integer."
-  :version "21.4"
+  :version "22.1"
   :group 'mime-display
   :type '(choice (const :tag "Standard `fill-column'" fill-column)
                  (const :tag "Fit Window" (- (window-width) 5))
@@ -67,7 +67,7 @@ This can be a Lisp expression or an integer."
   "Column beyond which format=flowed lines are wrapped, in outgoing messages.
 This can be a Lisp expression or an integer.
 RFC 2646 suggests 66 characters for readability."
-  :version "21.4"
+  :version "22.1"
   :group 'mime-display
   :type '(choice (const :tag "Standard fill-column" fill-column)
                  (const :tag "RFC 2646 default (66)" 66)
@@ -163,19 +163,19 @@ RFC 2646 suggests 66 characters for readability."
   '(
     ;; The syntax of each list element is:
     ;; (INPUT . EXPECTED-OUTPUT)
-    ("> Thou villainous ill-breeding spongy dizzy-eyed 
-> reeky elf-skinned pigeon-egg! 
->> Thou artless swag-bellied milk-livered 
+    ("> Thou villainous ill-breeding spongy dizzy-eyed
+> reeky elf-skinned pigeon-egg!
+>> Thou artless swag-bellied milk-livered
 >> dismal-dreaming idle-headed scut!
->>> Thou errant folly-fallen spleeny reeling-ripe 
+>>> Thou errant folly-fallen spleeny reeling-ripe
 >>> unmuzzled ratsbane!
->>>> Henceforth, the coding style is to be strictly 
+>>>> Henceforth, the coding style is to be strictly
 >>>> enforced, including the use of only upper case.
->>>>> I've noticed a lack of adherence to the coding 
+>>>>> I've noticed a lack of adherence to the coding
 >>>>> styles, of late.
 >>>>>> Any complaints?
 " . "> Thou villainous ill-breeding spongy dizzy-eyed reeky elf-skinned
-> pigeon-egg! 
+> pigeon-egg!
 >> Thou artless swag-bellied milk-livered dismal-dreaming idle-headed
 >> scut!
 >>> Thou errant folly-fallen spleeny reeling-ripe unmuzzled ratsbane!
@@ -186,8 +186,8 @@ RFC 2646 suggests 66 characters for readability."
 ")
 ;    ("
 ;> foo
-;> 
-;> 
+;>
+;>
 ;> bar
 ;" . "
 ;> foo bar
diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el
index aca9e4ec218..9a02f5b38aa 100644
--- a/lisp/gnus/gnus-agent.el
+++ b/lisp/gnus/gnus-agent.el
@@ -60,7 +60,7 @@
 
 (defcustom gnus-agent-fetched-hook nil
   "Hook run when finished fetching articles."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-agent
   :type 'hook)
 
@@ -152,7 +152,7 @@ whether unread articles are downloaded or not.  If you enable this,
 groups with large active ranges may open slower and you may also want
 to look into the agent expiry settings to block the expiration of
 read articles as they would just be downloaded again."
-  :version "21.4"
+  :version "22.1"
   :type 'boolean
   :group 'gnus-agent)
 
@@ -160,7 +160,7 @@ read articles as they would just be downloaded again."
   "Chunk size for `gnus-agent-fetch-session'.
 The function will split its article fetches into chunks smaller than
 this limit."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-agent
   :type 'integer)
 
@@ -171,7 +171,7 @@ contents from a group's local storage.  This value may be overridden
 to disable expiration in specific categories, topics, and groups.  Of
 course, you could change gnus-agent-enable-expiration to DISABLE then
 enable expiration per categories, topics, and groups."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-agent
   :type '(radio (const :format "Enable " ENABLE)
                 (const :format "Disable " DISABLE)))
@@ -181,7 +181,7 @@ enable expiration per categories, topics, and groups."
 Have gnus-agent-expire scan the directories under
 \(gnus-agent-directory) for groups that are no longer agentized.
 When found, offer to remove them."
-  :version "21.4"
+  :version "22.1"
   :type 'boolean
   :group 'gnus-agent)
 
@@ -189,7 +189,7 @@ When found, offer to remove them."
   "Initially, all servers from these methods are agentized.
 The user may remove or add servers using the Server buffer.
 See Info node `(gnus)Server Buffer'."
-  :version "21.4"
+  :version "22.1"
   :type '(repeat symbol)
   :group 'gnus-agent)
 
@@ -197,7 +197,7 @@ See Info node `(gnus)Server Buffer'."
   "Whether and when outgoing mail should be queued by the agent.
 When `always', always queue outgoing mail.  When nil, never
 queue.  Otherwise, queue if and only if unplugged."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-agent
   :type '(radio (const :format "Always" always)
                 (const :format "Never" nil)
@@ -206,7 +206,7 @@ queue.  Otherwise, queue if and only if unplugged."
 (defcustom gnus-agent-prompt-send-queue nil
   "If non-nil, `gnus-group-send-queue' will prompt if called when
 unplugged."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-agent
   :type 'boolean)
 
@@ -215,13 +215,13 @@ unplugged."
 (defvar gnus-agent-history-buffers nil)
 (defvar gnus-agent-buffer-alist nil)
 (defvar gnus-agent-article-alist nil
-  "An assoc list identifying the articles whose headers have been fetched.  
+  "An assoc list identifying the articles whose headers have been fetched.
 If successfully fetched, these headers will be stored in the group's overview
 file.  The key of each assoc pair is the article ID, the value of each assoc
 pair is a flag indicating whether the identified article has been downloaded
 \(gnus-agent-fetch-articles sets the value to the day of the download).
 NOTES:
-1) The last element of this list can not be expired as some 
+1) The last element of this list can not be expired as some
    routines (for example, get-agent-fetch-headers) use the last
    value to track which articles have had their headers retrieved.
 2) The function `gnus-agent-regenerate' may destructively modify the value.")
@@ -821,11 +821,11 @@ be a select method."
       (erase-buffer)
       (nnheader-insert-file-contents (gnus-agent-lib-file "flags"))
       (cond ((null gnus-plugged)
-             (gnus-message 
-              1 "You must be plugged to synchronize flags with server %s" 
+             (gnus-message
+              1 "You must be plugged to synchronize flags with server %s"
               (nth 1 gnus-command-method)))
             ((null (gnus-check-server gnus-command-method))
-             (gnus-message 
+             (gnus-message
               1 "Couldn't open server %s" (nth 1 gnus-command-method)))
             (t
              (condition-case err
@@ -873,7 +873,7 @@ next enabled. Depends upon the caller to determine whether group renaming is sup
       (gnus-agent-save-group-info old-command-method old-real-group nil)
       (gnus-agent-save-group-info new-command-method new-real-group old-active)
 
-      (let ((old-local (gnus-agent-get-local old-group 
+      (let ((old-local (gnus-agent-get-local old-group
                                              old-real-group old-command-method)))
         (gnus-agent-set-local old-group
                               nil nil
@@ -896,7 +896,7 @@ next enabled. Depends upon the caller to determine whether group deletion is sup
     (let* ((real-group (gnus-group-real-name group)))
       (gnus-agent-save-group-info command-method real-group nil)
 
-      (let ((local (gnus-agent-get-local group 
+      (let ((local (gnus-agent-get-local group
                                          real-group command-method)))
         (gnus-agent-set-local group
                               nil nil
@@ -937,7 +937,7 @@ next enabled. Depends upon the caller to determine whether group deletion is sup
     (unless (member named-server gnus-agent-covered-methods)
       (error "Server not in the agent program"))
 
-    (setq gnus-agent-covered-methods 
+    (setq gnus-agent-covered-methods
           (delete named-server gnus-agent-covered-methods)
           gnus-agent-method-p-cache nil)
 
@@ -947,7 +947,7 @@ next enabled. Depends upon the caller to determine whether group deletion is sup
 
 (defun gnus-agent-read-servers ()
   "Read the alist of covered servers."
-  (setq gnus-agent-covered-methods 
+  (setq gnus-agent-covered-methods
         (gnus-agent-read-file
          (nnheader-concat gnus-agent-directory "lib/servers"))
         gnus-agent-method-p-cache nil)
@@ -1079,7 +1079,7 @@ article's mark is toggled."
                    ;; imply that this article isn't in the agent.
                    (gnus-agent-append-to-list tail-undownloaded h)
                    (gnus-agent-append-to-list tail-unfetched    h)
-                   (setq headers (cdr headers))) 
+                   (setq headers (cdr headers)))
                   ((cdar alist)
                    (setq alist (cdr alist))
                    (setq headers (cdr headers))
@@ -1088,7 +1088,7 @@ article's mark is toggled."
                   (t
                    (setq alist (cdr alist))
                    (setq headers (cdr headers))
-                   
+
                    ;; This article isn't in the agent.  Check to see
                    ;; if it is in the cache.  If it is, it's been
                    ;; downloaded.
@@ -1166,7 +1166,7 @@ Optional arg ALL, if non-nil, means to fetch all articles."
                       gnus-newsgroup-name articles)))))
       (save-excursion
         (dolist (article articles)
-          (let ((was-marked-downloadable 
+          (let ((was-marked-downloadable
                  (memq article gnus-newsgroup-downloadable)))
             (cond (gnus-agent-mark-unread-after-downloaded
                    (setq gnus-newsgroup-downloadable
@@ -1206,8 +1206,8 @@ This can be added to `gnus-select-article-hook' or
           ;; trying to call gnus-request-set-mark, I have to
           ;; reconstruct the original group name.
           (or (gnus-get-info group)
-              (gnus-get-info 
-               (setq group (gnus-group-full-name 
+              (gnus-get-info
+               (setq group (gnus-group-full-name
                             group gnus-command-method))))))
     (gnus-request-set-mark group actions)
 
@@ -1218,14 +1218,14 @@ This can be added to `gnus-select-article-hook' or
               (marks (nth 2 action)))
           (dolist (mark marks)
             (cond ((eq mark 'read)
-                   (gnus-info-set-read 
+                   (gnus-info-set-read
                     info
                     (funcall (if (eq what 'add)
                                  'gnus-range-add
                                'gnus-remove-from-range)
                              (gnus-info-read info)
                              range))
-                   (gnus-get-unread-articles-in-group 
+                   (gnus-get-unread-articles-in-group
                     info
                     (gnus-active (gnus-info-group info))))
                   ((memq mark '(tick))
@@ -1293,11 +1293,11 @@ downloaded into the agent."
           ;; file.
 
           (let ((read (gnus-info-read info)))
-            (gnus-info-set-read 
-             info 
-             (gnus-range-add 
-              read 
-              (list (cons (1+ agent-max) 
+            (gnus-info-set-read
+             info
+             (gnus-range-add
+              read
+              (list (cons (1+ agent-max)
                           (1- active-min))))))
 
           ;; Lie about the agent's local range for this group to
@@ -1370,7 +1370,7 @@ downloaded into the agent."
   (setq group
         (nnheader-translate-file-chars
          (nnheader-replace-duplicate-chars-in-string
-          (nnheader-replace-chars-in-string 
+          (nnheader-replace-chars-in-string
            (gnus-group-real-name group)
            ?/ ?_)
           ?. ?_)))
@@ -1451,7 +1451,7 @@ downloaded into the agent."
         (unless (and (eq article (caar alist))
                      (cdar alist))
           ;; Skip headers preceeding this article
-          (while (> article 
+          (while (> article
                     (setq header-number
                           (let* ((header (car headers)))
                             (if header
@@ -2017,8 +2017,8 @@ doesn't exist, to valid the overview buffer."
       (setq prev (cdr prev)))
     (setq gnus-agent-article-alist (cdr all))
 
-    (gnus-agent-set-local group 
-                          (caar gnus-agent-article-alist) 
+    (gnus-agent-set-local group
+                          (caar gnus-agent-article-alist)
                           (caar (last gnus-agent-article-alist)))
 
     (gnus-make-directory (gnus-agent-article-name "" group))
@@ -2073,7 +2073,7 @@ modified) original contents, they are first saved to their own file."
 
 (defun gnus-agent-read-local (file)
   "Load FILE and do a `read' there."
-  (let ((my-obarray (gnus-make-hashtable (count-lines (point-min) 
+  (let ((my-obarray (gnus-make-hashtable (count-lines (point-min)
                                                       (point-max))))
         (line 1))
     (with-temp-buffer
@@ -2090,7 +2090,7 @@ modified) original contents, they are first saved to their own file."
 
       (while (not (eobp))
         (condition-case err
-            (let (group 
+            (let (group
                   min
                   max
                   (cur (current-buffer)))
@@ -2108,7 +2108,7 @@ modified) original contents, they are first saved to their own file."
                          file line (error-message-string err))))
         (forward-line 1)
         (setq line (1+ line))))
-      
+
     (set (intern "+dirty" my-obarray) nil)
     (set (intern "+method" my-obarray) gnus-command-method)
     my-obarray))
@@ -2141,7 +2141,7 @@ modified) original contents, they are first saved to their own file."
                                    (princ (car range))
                                    (princ " ")
                                    (princ (cdr range))
-                                   (princ "\n"))))) 
+                                   (princ "\n")))))
                         my-obarray))))))))
 
 (defun gnus-agent-get-local (group &optional gmane method)
@@ -2160,7 +2160,7 @@ modified) original contents, they are first saved to their own file."
           (setq minmax
                 (cons (caar alist)
                       (caar (last alist))))
-          (gnus-agent-set-local group (car minmax) (cdr minmax) 
+          (gnus-agent-set-local group (car minmax) (cdr minmax)
                                 gmane gnus-command-method local))))
     minmax))
 
@@ -2170,7 +2170,7 @@ modified) original contents, they are first saved to their own file."
          (local (or local (gnus-agent-load-local)))
          (symb (intern gmane local))
          (minmax (and (boundp symb) (symbol-value symb))))
-    
+
     (if (cond ((and minmax
                     (or (not (eq min (car minmax)))
                         (not (eq max (cdr minmax)))))
@@ -2836,7 +2836,7 @@ The following commands are available:
 It is okay to miss some cases, but there must be no false positives.
 That is, if this predicate returns true, then indeed the predicate must
 return only unread articles."
-  (eq t (gnus-function-implies-unread-1 
+  (eq t (gnus-function-implies-unread-1
          (gnus-category-make-function-1 predicate))))
 
 (defun gnus-function-implies-unread-1 (function)
@@ -2957,12 +2957,12 @@ FORCE is equivalent to setting the expiration predicates to true."
 
   (let ((dir (gnus-agent-group-pathname group)))
     (when (boundp 'gnus-agent-expire-current-dirs)
-      (set 'gnus-agent-expire-current-dirs 
-           (cons dir 
+      (set 'gnus-agent-expire-current-dirs
+           (cons dir
                  (symbol-value 'gnus-agent-expire-current-dirs))))
 
     (if (and (not force)
-             (eq 'DISABLE (gnus-agent-find-parameter group 
+             (eq 'DISABLE (gnus-agent-find-parameter group
                                                      'agent-enable-expiration)))
         (gnus-message 5 "Expiry skipping over %s" group)
       (gnus-message 5 "Expiring articles in %s" group)
@@ -3299,7 +3299,7 @@ The articles on which the expiration process runs are selected as follows:
 Setting GROUP will limit expiration to that group.
 FORCE is equivalent to setting the expiration predicates to true."
   (interactive)
-  
+
   (if group
       (gnus-agent-expire-group group articles force)
     (if (or (not (eq articles t))
@@ -3328,7 +3328,7 @@ articles in every agentized group."))
                                              gnus-command-method))
                       (let* ((active
                               (gnus-gethash-safe expiring-group orig)))
-                                        
+
                         (when active
                           (save-excursion
                             (gnus-agent-expire-group-1
@@ -3349,9 +3349,9 @@ articles in every agentized group."))
                 units (cdr units)))
 
         (format "Expiry recovered %d NOV entries, deleted %d files,\
- and freed %f %s." 
-                (nth 0 stats) 
-                (nth 1 stats) 
+ and freed %f %s."
+                (nth 0 stats)
+                (nth 1 stats)
                 size (car units)))
     "Expiry...done"))
 
@@ -3379,9 +3379,9 @@ articles in every agentized group."))
              (checker
               (function
                (lambda (d)
-                 "Given a directory, check it and its subdirectories for 
-              membership in the keep hash.  If it isn't found, add 
-              it to to-remove." 
+                 "Given a directory, check it and its subdirectories for
+              membership in the keep hash.  If it isn't found, add
+              it to to-remove."
                  (let ((files (directory-files d))
                        file)
                    (while (setq file (pop files))
@@ -3389,7 +3389,7 @@ articles in every agentized group."))
                             nil)
                            ((equal file "..") ; Ignore parent
                             nil)
-                           ((equal file ".overview") 
+                           ((equal file ".overview")
                             ;; Directory must contain .overview to be
                             ;; agent's cache of a group.
                             (let ((d (file-name-as-directory d))
@@ -3402,7 +3402,7 @@ articles in every agentized group."))
                                       d (directory-file-name d)))
                               ;; if ANY ancestor was NOT in keep hash and
                               ;; it it's already in to-remove, add it to
-                              ;; to-remove.                          
+                              ;; to-remove.
                               (if (and r
                                        (not (member r to-remove)))
                                   (push r to-remove))))
@@ -3854,7 +3854,7 @@ If REREAD is not nil, downloaded articles are marked as unread."
 
             (when regenerated
               (gnus-agent-save-alist group)
-       
+
               ;; I have to alter the group's active range NOW as
               ;; gnus-make-ascending-articles-unread will use it to
               ;; recalculate the number of unread articles in the group
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 22d48c3eff0..0d0da23ea58 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -213,7 +213,7 @@ By default, if you set this t, then Gnus will display citations and
 signatures, but will never scroll down to show you a page consisting
 only of boring text.  Boring text is controlled by
 `gnus-article-boring-faces'."
-  :version "21.4"
+  :version "22.1"
   :type 'boolean
   :group 'gnus-article-hiding)
 
@@ -318,7 +318,7 @@ advertisements.  For example:
                    (symbol :tag "Item in `gnus-article-banner-alist'" none)
                    regexp
                    (const :tag "None" nil))))
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-article-washing)
 
 (defmacro gnus-emphasis-custom-with-format (&rest body)
@@ -806,7 +806,7 @@ If set, this variable overrides `gnus-unbuttonized-mime-types'.
 To see e.g. security buttons you could set this to
 `(\"multipart/signed\")'.
 This variable is only used when `gnus-inhibit-mime-unbuttonizing' is nil."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-article-mime
   :type '(repeat regexp))
 
@@ -815,14 +815,14 @@ This variable is only used when `gnus-inhibit-mime-unbuttonizing' is nil."
 When nil (the default value), then some MIME parts do not get buttons,
 as described by the variables `gnus-buttonized-mime-types' and
 `gnus-unbuttonized-mime-types'."
-  :version "21.4"
+  :version "22.1"
   :type 'boolean)
 
 (defcustom gnus-body-boundary-delimiter "_"
   "String used to delimit header and body.
 This variable is used by `gnus-article-treat-body-boundary' which can
 be controlled by `gnus-treat-body-boundary'."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-article-various
   :type '(choice (item :tag "None" :value nil)
                  string))
@@ -831,7 +831,7 @@ be controlled by `gnus-treat-body-boundary'."
   "Defines the location of the faces database.
 For information on obtaining this database of pretty pictures, please
 see http://www.cs.indiana.edu/picons/ftp/index.html"
-  :version "21.4"
+  :version "22.1"
   :type '(repeat directory)
   :link '(url-link :tag "download"
                    "http://www.cs.indiana.edu/picons/ftp/index.html")
@@ -972,7 +972,7 @@ See Info node `(gnus)Customizing Articles' for details."
   "Remove carriage returns.
 Valid values are nil, t, `head', `last', an integer or a predicate.
 See Info node `(gnus)Customizing Articles' for details."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-article-treat
   :link '(custom-manual "(gnus)Customizing Articles")
   :type gnus-article-treat-custom)
@@ -981,7 +981,7 @@ See Info node `(gnus)Customizing Articles' for details."
   "Remove newlines from within URLs.
 Valid values are nil, t, `head', `last', an integer or a predicate.
 See Info node `(gnus)Customizing Articles' for details."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-article-treat
   :link '(custom-manual "(gnus)Customizing Articles")
   :type gnus-article-treat-custom)
@@ -990,7 +990,7 @@ See Info node `(gnus)Customizing Articles' for details."
   "Remove leading whitespace in headers.
 Valid values are nil, t, `head', `last', an integer or a predicate.
 See Info node `(gnus)Customizing Articles' for details."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-article-treat
   :link '(custom-manual "(gnus)Customizing Articles")
   :type gnus-article-treat-custom)
@@ -1110,7 +1110,7 @@ See Info node `(gnus)Customizing Articles' for details."
   "Display the Date in a format that can be read aloud in English.
 Valid values are nil, t, `head', `last', an integer or a predicate.
 See Info node `(gnus)Customizing Articles' for details."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-article-treat
   :link '(custom-manual "(gnus)Customizing Articles")
   :type gnus-article-treat-head-custom)
@@ -1186,7 +1186,7 @@ See Info node `(gnus)Customizing Articles' for details."
   "Unfold folded header lines.
 Valid values are nil, t, `head', `last', an integer or a predicate.
 See Info node `(gnus)Customizing Articles' for details."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-article-treat
   :link '(custom-manual "(gnus)Customizing Articles")
   :type gnus-article-treat-custom)
@@ -1195,7 +1195,7 @@ See Info node `(gnus)Customizing Articles' for details."
   "Fold headers.
 Valid values are nil, t, `head', `last', an integer or a predicate.
 See Info node `(gnus)Customizing Articles' for details."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-article-treat
   :link '(custom-manual "(gnus)Customizing Articles")
   :type gnus-article-treat-custom)
@@ -1204,7 +1204,7 @@ See Info node `(gnus)Customizing Articles' for details."
   "Fold the Newsgroups and Followup-To headers.
 Valid values are nil, t, `head', `last', an integer or a predicate.
 See Info node `(gnus)Customizing Articles' for details."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-article-treat
   :link '(custom-manual "(gnus)Customizing Articles")
   :type gnus-article-treat-custom)
@@ -1270,7 +1270,7 @@ Valid values are nil, t, `head', `last', an integer or a predicate.
 See Info node `(gnus)Customizing Articles' and Info node
 `(gnus)X-Face' for details."
   :group 'gnus-article-treat
-  :version "21.4"
+  :version "22.1"
   :link '(custom-manual "(gnus)Customizing Articles")
   :link '(custom-manual "(gnus)X-Face")
   :type gnus-article-treat-head-custom)
@@ -1301,7 +1301,7 @@ See Info node `(gnus)Customizing Articles' and Info node
 Valid values are nil, t, `head', `last', an integer or a predicate.
 See Info node `(gnus)Customizing Articles' and Info node
 `(gnus)Picons' for details."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-article-treat
   :group 'gnus-picon
   :link '(custom-manual "(gnus)Customizing Articles")
@@ -1317,7 +1317,7 @@ See Info node `(gnus)Customizing Articles' and Info node
 Valid values are nil, t, `head', `last', an integer or a predicate.
 See Info node `(gnus)Customizing Articles' and Info node
 `(gnus)Picons' for details."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-article-treat
   :group 'gnus-picon
   :link '(custom-manual "(gnus)Customizing Articles")
@@ -1333,7 +1333,7 @@ See Info node `(gnus)Customizing Articles' and Info node
 Valid values are nil, t, `head', `last', an integer or a predicate.
 See Info node `(gnus)Customizing Articles' and Info node
 `(gnus)Picons' for details."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-article-treat
   :group 'gnus-picon
   :link '(custom-manual "(gnus)Customizing Articles")
@@ -1349,7 +1349,7 @@ See Info node `(gnus)Customizing Articles' and Info node
   "Draw a boundary at the end of the headers.
 Valid values are nil and `head'.
 See Info node `(gnus)Customizing Articles' for details."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-article-treat
   :link '(custom-manual "(gnus)Customizing Articles")
   :type gnus-article-treat-head-custom)
@@ -1367,7 +1367,7 @@ See Info node `(gnus)Customizing Articles' for details."
   "Format as HTML.
 Valid values are nil, t, `head', `last', an integer or a predicate.
 See Info node `(gnus)Customizing Articles' for details."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-article-treat
   :link '(custom-manual "(gnus)Customizing Articles")
   :type gnus-article-treat-custom)
@@ -1403,7 +1403,7 @@ See Info node `(gnus)Customizing Articles' for details."
 To automatically treat X-PGP-Sig, set it to head.
 Valid values are nil, t, `head', `last', an integer or a predicate.
 See Info node `(gnus)Customizing Articles' for details."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-article-treat
   :group 'mime-security
   :link '(custom-manual "(gnus)Customizing Articles")
@@ -1417,7 +1417,7 @@ See Info node `(gnus)Customizing Articles' for details."
 (defcustom gnus-article-encrypt-protocol "PGP"
   "The protocol used for encrypt articles.
 It is a string, such as \"PGP\". If nil, ask user."
-  :version "21.4"
+  :version "22.1"
   :type 'string
   :group 'mime-security)
 
@@ -1429,13 +1429,13 @@ It is a string, such as \"PGP\". If nil, ask user."
                               (executable-find idna-program))
   "Whether IDNA decoding of headers is used when viewing messages.
 This requires GNU Libidn, and by default only enabled if it is found."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-article-headers
   :type 'boolean)
 
 (defcustom gnus-article-over-scroll nil
   "If non-nil, allow scrolling the article buffer even when there no more text."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-article
   :type 'boolean)
 
@@ -4703,7 +4703,7 @@ If t, it overrides nil values of
 
 (defcustom gnus-mime-display-multipart-alternative-as-mixed nil
   "Display \"multipart/alternative\" parts as  \"multipart/mixed\"."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-article-mime
   :type 'boolean)
 
@@ -4713,7 +4713,7 @@ If t, it overrides nil values of
 If displaying \"text/html\" is discouraged \(see
 `mm-discouraged-alternatives'\) images or other material inside a
 \"multipart/related\" part might be overlooked when this variable is nil."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-article-mime
   :type 'boolean)
 
@@ -5821,7 +5821,7 @@ groups."
 (defcustom gnus-button-valid-fqdn-regexp
   message-valid-fqdn-regexp
   "Regular expression that matches a valid FQDN."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-article-buttons
   :type 'regexp)
 
@@ -5829,7 +5829,7 @@ groups."
   "Function to use for displaying man pages.
 The function must take at least one argument with a string naming the
 man page."
-  :version "21.4"
+  :version "22.1"
   :type '(choice (function-item :tag "Man" manual-entry)
                  (function-item :tag "Woman" woman)
                  (function :tag "Other"))
@@ -5840,7 +5840,7 @@ man page."
 If the default site is too slow, try to find a CTAN mirror, see
 <URL:http://tug.ctan.org/tex-archive/CTAN.sites?action=/index.html>.  See also
 the variable `gnus-button-handle-ctan'."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-article-buttons
   :link '(custom-manual "(gnus)Group Parameters")
   :type '(choice (const "http://www.tex.ac.uk/tex-archive/")
@@ -5851,14 +5851,14 @@ the variable `gnus-button-handle-ctan'."
 (defcustom gnus-button-ctan-handler 'browse-url
   "Function to use for displaying CTAN links.
 The function must take one argument, the string naming the URL."
-  :version "21.4"
+  :version "22.1"
   :type '(choice (function-item :tag "Browse Url" browse-url)
                  (function :tag "Other"))
   :group 'gnus-article-buttons)
 
 (defcustom gnus-button-handle-ctan-bogus-regexp "^/?tex-archive/\\|^/"
   "Bogus strings removed from CTAN URLs."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-article-buttons
   :type '(choice (const "^/?tex-archive/\\|/")
                  (regexp :tag "Other")))
@@ -5872,7 +5872,7 @@ The function must take one argument, the string naming the URL."
    "\\)")
   "Regular expression for ctan directories.
 It should match all directories in the top level of `gnus-ctan-url'."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-article-buttons
   :type 'regexp)
 
@@ -5882,7 +5882,7 @@ It should match all directories in the top level of `gnus-ctan-url'."
           gnus-button-valid-fqdn-regexp
           ">?\\)\\b")
   "Regular expression that matches a message ID or a mail address."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-article-buttons
   :type 'regexp)
 
@@ -5894,7 +5894,7 @@ message ID or a mail address, respectively.  If this variable is set to the
 symbol `ask', always query the user what do do.  If it is a function, this
 function will be called with the string as it's only argument.  The function
 must return `mid', `mail', `invalid' or `ask'."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-article-buttons
   :type '(choice (function-item :tag "Heuristic function"
                                 gnus-button-mid-or-mail-heuristic)
@@ -5958,7 +5958,7 @@ must return `mid', `mail', `invalid' or `ask'."
 
 A negative RATE indicates a message IDs, whereas a positive indicates a mail
 address.  The REGEXP is processed with `case-fold-search' set to nil."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-article-buttons
   :type '(repeat (cons (number :tag "Rate")
                        (regexp :tag "Regexp"))))
@@ -6143,7 +6143,7 @@ positives are possible.  Note that you can set this variable local to
 specific groups.  Setting it higher in TeX groups is probably a good idea.
 See Info node `(gnus)Group Parameters' and the variable `gnus-parameters' on
 how to set variables in specific groups."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-article-buttons
   :link '(custom-manual "(gnus)Group Parameters")
   :type 'integer)
@@ -6155,7 +6155,7 @@ positives are possible.  Note that you can set this variable local to
 specific groups.  Setting it higher in Unix groups is probably a good idea.
 See Info node `(gnus)Group Parameters' and the variable `gnus-parameters' on
 how to set variables in specific groups."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-article-buttons
   :link '(custom-manual "(gnus)Group Parameters")
   :type 'integer)
@@ -6167,7 +6167,7 @@ positives are possible.  Note that you can set this variable local to
 specific groups.  Setting it higher in Emacs or Gnus related groups is
 probably a good idea.  See Info node `(gnus)Group Parameters' and the variable
 `gnus-parameters' on how to set variables in specific groups."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-article-buttons
   :link '(custom-manual "(gnus)Group Parameters")
   :type 'integer)
@@ -6177,7 +6177,7 @@ probably a good idea.  See Info node `(gnus)Group Parameters' and the variable
 The higher the number, the more buttons will appear and the more false
 positives are possible."
   ;; mail addresses, MIDs, URLs for news, ...
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-article-buttons
   :type 'integer)
 
@@ -6186,7 +6186,7 @@ positives are possible."
 The higher the number, the more buttons will appear and the more false
 positives are possible."
   ;; stuff handled by `browse-url' or `gnus-button-embedded-url'
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-article-buttons
   :type 'integer)
 
@@ -6716,10 +6716,10 @@ specified by `gnus-button-alist'."
   (if (string-match "\\([^#]+\\)#?\\(.*\\)" url)
       (gnus-info-find-node
        (concat "("
-               (gnus-url-unhex-string 
+               (gnus-url-unhex-string
                  (match-string 1 url))
                ")"
-               (or (gnus-url-unhex-string 
+               (or (gnus-url-unhex-string
                     (match-string 2 url))
                    "Top")))
     (error "Can't parse %s" url)))
diff --git a/lisp/gnus/gnus-cite.el b/lisp/gnus/gnus-cite.el
index 5306f3b17bf..e60ea32e126 100644
--- a/lisp/gnus/gnus-cite.el
+++ b/lisp/gnus/gnus-cite.el
@@ -124,7 +124,7 @@ The text matching the first grouping will be used as a button."
 (defcustom gnus-cite-unsightly-citation-regexp
   "^-----Original Message-----\nFrom: \\(.+\n\\)+\n"
   "Regexp matching Microsoft-type rest-of-message citations."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-cite
   :type 'regexp)
 
@@ -132,7 +132,7 @@ The text matching the first grouping will be used as a button."
   "Non-nil means don't regard lines beginning with \">From \" as cited text.
 Those lines may have been quoted by MTAs in order not to mix up with
 the envelope From line."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-cite
   :type 'boolean)
 
@@ -143,7 +143,7 @@ the envelope From line."
 (defcustom gnus-cite-attribution-face 'gnus-cite-attribution-face
   "Face used for attribution lines.
 It is merged with the face for the cited text belonging to the attribution."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-cite
   :type 'face)
 
diff --git a/lisp/gnus/gnus-delay.el b/lisp/gnus/gnus-delay.el
index 8a566e3e5d8..acf7670b0ed 100644
--- a/lisp/gnus/gnus-delay.el
+++ b/lisp/gnus/gnus-delay.el
@@ -41,7 +41,7 @@
 ;;;###autoload
 (defgroup gnus-delay nil
   "Arrange for sending postings later."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus)
 
 (defcustom gnus-delay-group "delayed"
@@ -61,7 +61,7 @@
 
 (defcustom gnus-delay-default-hour 8
   "*If deadline is given as date, then assume this time of day."
-  :version "21.4"
+  :version "22.1"
   :type 'integer
   :group 'gnus-delay)
 
diff --git a/lisp/gnus/gnus-diary.el b/lisp/gnus/gnus-diary.el
index 7d2df362bbc..093f4bd7806 100644
--- a/lisp/gnus/gnus-diary.el
+++ b/lisp/gnus/gnus-diary.el
@@ -103,7 +103,7 @@
 
 (defgroup gnus-diary nil
   "Utilities on top of the nndiary backend for Gnus."
-  :version "21.4")
+  :version "22.1")
 
 (defcustom gnus-diary-summary-line-format "%U%R%z %uD: %(%s%) (%ud)\n"
   "*Summary line format for nndiary groups."
diff --git a/lisp/gnus/gnus-fun.el b/lisp/gnus/gnus-fun.el
index 82282e084f7..6ece8f1911c 100644
--- a/lisp/gnus/gnus-fun.el
+++ b/lisp/gnus/gnus-fun.el
@@ -34,13 +34,13 @@
 
 (defcustom gnus-x-face-directory (expand-file-name "x-faces" gnus-directory)
   "*Directory where X-Face PBM files are stored."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-fun
   :type 'directory)
 
 (defcustom gnus-convert-pbm-to-x-face-command "pbmtoxbm %s | compface"
   "Command for converting a PBM to an X-Face."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-fun
   :type 'string)
 
@@ -48,7 +48,7 @@
   "Command for converting an image to an X-Face.
 By default it takes a GIF filename and output the X-Face header data
 on stdout."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-fun
   :type 'string)
 
@@ -56,7 +56,7 @@ on stdout."
   "Command for converting an image to an Face.
 By default it takes a JPEG filename and output the Face header data
 on stdout."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-fun
   :type 'string)
 
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 336b635a6a0..2d6137c0bb5 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -435,7 +435,7 @@ For example:
 If non-nil, the value should be a string, e.g. \"nnml:\",
 in which case `gnus-group-jump-to-group' offers \"Group: nnml:\"
 in the minibuffer prompt."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-group-various
   :type '(choice (string :tag "Prompt string")
                  (const :tag "Empty" nil)))
@@ -1965,14 +1965,14 @@ Same as `gnus-large-newsgroup', but only used for ephemeral newsgroups.
 If the number of articles in a newsgroup is greater than this value,
 confirmation is required for selecting the newsgroup.  If it is nil, no
 confirmation is required."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-group-select
   :type '(choice (const :tag "No limit" nil)
                  integer))
 
 (defcustom gnus-fetch-old-ephemeral-headers nil
   "Same as `gnus-fetch-old-headers', but only used for ephemeral newsgroups."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-thread
   :type '(choice (const :tag "off" nil)
                  (const some)
diff --git a/lisp/gnus/gnus-int.el b/lisp/gnus/gnus-int.el
index 7382fa7a090..32ea9919e86 100644
--- a/lisp/gnus/gnus-int.el
+++ b/lisp/gnus/gnus-int.el
@@ -47,7 +47,7 @@ If the server is covered by Gnus agent, the possible values are
 `denied', set the server denied; `offline', set the server offline;
 nil, ask user.  If the server is not covered by Gnus agent, set the
 server denied."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-start
   :type '(choice (const :tag "Ask" nil)
                  (const :tag "Deny server" denied)
@@ -573,7 +573,7 @@ If GROUP is nil, all groups on GNUS-COMMAND-METHOD are scanned."
                (gnus-agent-method-p gnus-command-method))
       (gnus-agent-unfetch-articles group (list article)))
     result))
-    
+
 (defun gnus-request-accept-article (group &optional gnus-command-method last
                                           no-encode)
   ;; Make sure there's a newline at the end of the article.
@@ -596,8 +596,8 @@ If GROUP is nil, all groups on GNUS-COMMAND-METHOD are scanned."
       (message-encode-message-body)))
 (let ((gnus-command-method (or gnus-command-method
                                  (gnus-find-method-for-group group)))
-        (result 
-         (funcall 
+        (result
+         (funcall
           (gnus-get-function gnus-command-method 'request-accept-article)
           (if (stringp group) (gnus-group-real-name group) group)
           (cadr gnus-command-method)
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index 7948efc2572..65b3d78aca3 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -142,7 +142,7 @@ See Info node `(gnus)Posting Styles'."
 
 (defcustom gnus-gcc-mark-as-read nil
   "If non-nil, automatically mark Gcc articles as read."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-message
   :type 'boolean)
 
@@ -154,7 +154,7 @@ See Info node `(gnus)Posting Styles'."
 If it is `all', attach files as external parts;
 if a regexp and matches the Gcc group name, attach files as external parts;
 if nil, attach files as normal parts."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-message
   :type '(choice (const nil :tag "None")
                  (const all :tag "Any")
@@ -212,7 +212,7 @@ List of charsets that are permitted to be unencoded.")
     "gnus-agent.el" "gnus-cache.el" "gnus-srvr.el"
     "mm-util.el" "mm-decode.el" "nnmail.el" "message.el")
   "Files whose variables will be reported in `gnus-bug'."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-message
   :type '(repeat (string :tag "File")))
 
@@ -220,7 +220,7 @@ List of charsets that are permitted to be unencoded.")
   '(mm-mime-mule-charset-alist
     nnmail-split-fancy message-minibuffer-local-map)
   "Variables that should not be reported in `gnus-bug'."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-message
   :type '(repeat (symbol :tag "Variable")))
 
@@ -228,7 +228,7 @@ List of charsets that are permitted to be unencoded.")
   '(nndraft nnml nnimap nnmaildir nnmh nnfolder nndir)
   "A list of back ends that are not used in \"real\" newsgroups.
 This variable is used only when `gnus-post-method' is `current'."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-group-foreign
   :type '(repeat (symbol :tag "Back end")))
 
@@ -260,7 +260,7 @@ This can also be a function receiving the group name as the only
 parameter which should return non-nil iff a confirmation is needed, or
 a regexp, in which case a confirmation is asked for iff the group name
 matches the regexp."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-message
   :type '(choice (const :tag "No" nil)
                  (const :tag "Yes" t)
@@ -273,7 +273,7 @@ matches the regexp."
 when replying by mail.  See the `gnus-confirm-mail-reply-to-news' variable
 for fine-tuning this.
 If nil, Gnus will never ask for confirmation if replying to mail."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-message
   :type 'boolean)
 
@@ -281,7 +281,7 @@ If nil, Gnus will never ask for confirmation if replying to mail."
   "If non-nil, Gnus tries to suggest a default address to resend to.
 If nil, the address field will always be empty after invoking
 `gnus-summary-resend-message'."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-message
   :type 'boolean)
 
diff --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el
index 71e98a236bd..0971fea5485 100644
--- a/lisp/gnus/gnus-registry.el
+++ b/lisp/gnus/gnus-registry.el
@@ -66,7 +66,7 @@
 
 (defgroup gnus-registry nil
   "The Gnus registry."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus)
 
 (defvar gnus-registry-hashtb nil
@@ -99,7 +99,7 @@ Registry entries are considered empty when they have no groups."
 The Subject and Sender (From:) headers are currently tracked this
 way."
   :group 'gnus-registry
-  :type      
+  :type
   '(set :tag "Tracking choices"
     (const :tag "Track by subject (Subject: header)" subject)
     (const :tag "Track by sender (From: header)"  sender)))
@@ -188,12 +188,12 @@ way."
                                  "%s#tmp#%d"))
                              working-dir (setq i (1+ i))))
                       (file-exists-p working-file)))
-        
+
         (unwind-protect
             (progn
               (gnus-with-output-to-file working-file
                 (gnus-gnus-to-quick-newsrc-format t "gnus registry startup file" 'gnus-registry-alist))
-              
+
               ;; These bindings will mislead the current buffer
               ;; into thinking that it is visiting the startup
               ;; file.
@@ -203,14 +203,14 @@ way."
                     (setmodes (file-modes startup-file)))
                 ;; Backup the current version of the startup file.
                 (backup-buffer)
-                
+
                 ;; Replace the existing startup file with the temp file.
                 (rename-file working-file startup-file t)
                 (set-file-modes startup-file setmodes)))
           (condition-case nil
               (delete-file working-file)
             (file-error nil)))))
-    
+
     (gnus-kill-buffer (current-buffer))
     (gnus-message 5 "Saving %s...done" file))))
 
@@ -238,10 +238,10 @@ way."
              (remhash key gnus-registry-hashtb)))
        gnus-registry-hashtb)
       ;; remove empty entries
-      (when gnus-registry-clean-empty 
+      (when gnus-registry-clean-empty
         (gnus-registry-clean-empty-function))
       ;; now trim the registry appropriately
-      (setq gnus-registry-alist (gnus-registry-trim 
+      (setq gnus-registry-alist (gnus-registry-trim
                                  (hashtable-to-alist gnus-registry-hashtb)))
       ;; really save
       (gnus-registry-cache-save)
@@ -283,15 +283,15 @@ way."
       (setq alist
             (nthcdr
              trim-length
-             (sort alist 
+             (sort alist
                    (lambda (a b)
-                     (time-less-p 
+                     (time-less-p
                       (cdr (gethash (car a) timehash))
                       (cdr (gethash (car b) timehash))))))))))
 
 (defun alist-to-hashtable (alist)
   "Build a hashtable from the values in ALIST."
-  (let ((ht (make-hash-table                        
+  (let ((ht (make-hash-table
              :size 4096
              :test 'equal)))
     (mapc
@@ -311,7 +311,7 @@ way."
 
 (defun gnus-registry-action (action data-header from &optional to method)
   (let* ((id (mail-header-id data-header))
-         (subject (gnus-registry-simplify-subject 
+         (subject (gnus-registry-simplify-subject
                    (mail-header-subject data-header)))
          (sender (mail-header-from data-header))
          (from (gnus-group-guess-full-name-from-command-method from))
@@ -327,7 +327,7 @@ way."
     ;; All except copy will need a delete
     (gnus-registry-delete-group id from)
 
-    (when (equal 'copy action) 
+    (when (equal 'copy action)
       (gnus-registry-add-group id from subject sender)) ; undo the delete
 
     (gnus-registry-add-group id to subject sender)))
@@ -347,7 +347,7 @@ way."
   "Split this message into the same group as its parent.  The parent
 is obtained from the registry.  This function can be used as an entry
 in `nnmail-split-fancy' or `nnimap-split-fancy', for example like
-this: (: gnus-registry-split-fancy-with-parent) 
+this: (: gnus-registry-split-fancy-with-parent)
 
 For a message to be split, it looks for the parent message in the
 References or In-Reply-To header and then looks in the registry to
@@ -369,7 +369,7 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
                     (when (or (gnus-registry-grep-in-list
                                res
                                gnus-registry-unfollowed-groups)
-                              (gnus-registry-grep-in-list 
+                              (gnus-registry-grep-in-list
                                res
                                nnmail-split-fancy-with-parent-ignore-groups))
                       (setq res nil)))
@@ -385,7 +385,7 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
                    sender)
           (maphash
            (lambda (key value)
-             (let ((this-sender (cdr 
+             (let ((this-sender (cdr
                                  (gnus-registry-fetch-extra key 'sender))))
                (when (and single-match
                           this-sender
@@ -408,7 +408,7 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
                    (< gnus-registry-minimum-subject-length (length subject)))
           (maphash
            (lambda (key value)
-             (let ((this-subject (cdr 
+             (let ((this-subject (cdr
                                   (gnus-registry-fetch-extra key 'subject))))
                (when (and single-match
                           this-subject
@@ -432,26 +432,26 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
            refstr)
           (setq res nil))))
     (gnus-message
-     5 
+     5
      "gnus-registry-split-fancy-with-parent traced %s to group %s"
      refstr (if res res "nil"))
 
     (when (and res gnus-registry-use-long-group-names)
       (let ((m1 (gnus-find-method-for-group res))
-            (m2 (or gnus-command-method 
+            (m2 (or gnus-command-method
                     (gnus-find-method-for-group gnus-newsgroup-name)))
             (short-res (gnus-group-short-name res)))
       (if (gnus-methods-equal-p m1 m2)
           (progn
             (gnus-message
-             9 
+             9
              "gnus-registry-split-fancy-with-parent stripped group %s to %s"
              res
              short-res)
             (setq res short-res))
         ;; else...
         (gnus-message
-         5 
+         5
          "gnus-registry-split-fancy-with-parent ignored foreign group %s"
          res)
         (setq res nil))))
@@ -463,9 +463,9 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
     (dolist (article gnus-newsgroup-articles)
       (let ((id (gnus-registry-fetch-message-id-fast article)))
         (unless (gnus-registry-fetch-group id)
-          (gnus-message 9 "Registry: Registering article %d with group %s" 
+          (gnus-message 9 "Registry: Registering article %d with group %s"
                         article gnus-newsgroup-name)
-          (gnus-registry-add-group 
+          (gnus-registry-add-group
            (gnus-registry-fetch-message-id-fast article)
            gnus-newsgroup-name
            (gnus-registry-fetch-simplified-message-subject-fast article)
@@ -504,7 +504,7 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
   (when word
     (memq nil
           (mapcar 'not
-                  (mapcar 
+                  (mapcar
                    (lambda (x)
                      (string-match x word))
                    list)))))
@@ -540,7 +540,7 @@ Update the entry cache if needed."
 
           ;; get the entree from the hash table or from the alist
           (setq entree (gethash id entry-cache)))
-        
+
         (unless entree
           (setq entree (assq entry alist))
           (when gnus-registry-entry-caching
@@ -581,8 +581,8 @@ Returns the first place where the trail finds a group name."
     (let ((trail (gethash id gnus-registry-hashtb)))
       (dolist (crumb trail)
         (when (stringp crumb)
-          (return (if gnus-registry-use-long-group-names 
-                       crumb 
+          (return (if gnus-registry-use-long-group-names
+                       crumb
                      (gnus-group-short-name crumb))))))))
 
 (defun gnus-registry-group-count (id)
@@ -624,8 +624,8 @@ Returns the first place where the trail finds a group name."
     (when (and id
                (not (string-match "totally-fudged-out-message-id" id)))
       (let ((full-group group)
-            (group (if gnus-registry-use-long-group-names 
-                       group 
+            (group (if gnus-registry-use-long-group-names
+                       group
                      (gnus-group-short-name group))))
         (gnus-registry-delete-group id group)
 
@@ -641,16 +641,16 @@ Returns the first place where the trail finds a group name."
           (when (and (gnus-registry-track-subject-p)
                      subject)
             (gnus-registry-store-extra-entry
-             id 
-             'subject 
+             id
+             'subject
              (gnus-registry-simplify-subject subject)))
           (when (and (gnus-registry-track-sender-p)
                      sender)
             (gnus-registry-store-extra-entry
-             id 
+             id
              'sender
              sender))
-          
+
           (gnus-registry-store-extra-entry id 'mtime (current-time)))))))
 
 (defun gnus-registry-clear ()
@@ -671,11 +671,11 @@ Returns the first place where the trail finds a group name."
 (defun gnus-registry-install-hooks ()
   "Install the registry hooks."
   (interactive)
-  (add-hook 'gnus-summary-article-move-hook 'gnus-registry-action) 
+  (add-hook 'gnus-summary-article-move-hook 'gnus-registry-action)
   (add-hook 'gnus-summary-article-delete-hook 'gnus-registry-action)
   (add-hook 'gnus-summary-article-expire-hook 'gnus-registry-action)
   (add-hook 'nnmail-spool-hook 'gnus-registry-spool-action)
-  
+
   (add-hook 'gnus-save-newsrc-hook 'gnus-registry-save)
   (add-hook 'gnus-read-newsrc-el-hook 'gnus-registry-read)
 
@@ -684,11 +684,11 @@ Returns the first place where the trail finds a group name."
 (defun gnus-registry-unload-hook ()
   "Uninstall the registry hooks."
   (interactive)
-  (remove-hook 'gnus-summary-article-move-hook 'gnus-registry-action) 
+  (remove-hook 'gnus-summary-article-move-hook 'gnus-registry-action)
   (remove-hook 'gnus-summary-article-delete-hook 'gnus-registry-action)
   (remove-hook 'gnus-summary-article-expire-hook 'gnus-registry-action)
   (remove-hook 'nnmail-spool-hook 'gnus-registry-spool-action)
-  
+
   (remove-hook 'gnus-save-newsrc-hook 'gnus-registry-save)
   (remove-hook 'gnus-read-newsrc-el-hook 'gnus-registry-read)
 
diff --git a/lisp/gnus/gnus-score.el b/lisp/gnus/gnus-score.el
index 21e59e4dbf3..3a22f9030e5 100644
--- a/lisp/gnus/gnus-score.el
+++ b/lisp/gnus/gnus-score.el
@@ -237,7 +237,7 @@ This variable allows the same syntax as `gnus-home-score-file'."
 
 (defcustom gnus-adaptive-word-length-limit nil
   "*Words of a length lesser than this limit will be ignored when doing adaptive scoring."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-score-adapt
   :type '(radio (const :format "Unlimited " nil)
                 (integer :format "Maximum length: %v")))
diff --git a/lisp/gnus/gnus-spec.el b/lisp/gnus/gnus-spec.el
index 9eeedf40cae..ff924139672 100644
--- a/lisp/gnus/gnus-spec.el
+++ b/lisp/gnus/gnus-spec.el
@@ -32,14 +32,14 @@
 
 (defcustom gnus-use-correct-string-widths (featurep 'xemacs)
   "*If non-nil, use correct functions for dealing with wide characters."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-format
   :type 'boolean)
 
 (defcustom gnus-make-format-preserve-properties (featurep 'xemacs)
   "*If non-nil, use a replacement `format' function which preserves
 text properties. This is only needed on XEmacs, as FSF Emacs does this anyway."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-format
   :type 'boolean)
 
diff --git a/lisp/gnus/gnus-srvr.el b/lisp/gnus/gnus-srvr.el
index d42c5d71cfd..e8c7d354145 100644
--- a/lisp/gnus/gnus-srvr.el
+++ b/lisp/gnus/gnus-srvr.el
@@ -71,7 +71,7 @@ See Info node `(gnus)Formatting Variables'."
 (defcustom gnus-server-browse-in-group-buffer nil
   "Whether server browsing should take place in the group buffer.
 If nil, a faster, but more primitive, buffer is used instead."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-server-visual
   :type 'boolean)
 
@@ -205,31 +205,31 @@ If nil, a faster, but more primitive, buffer is used instead."
 
 (defcustom gnus-server-agent-face 'gnus-server-agent-face
   "Face name to use on AGENTIZED servers."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-server-visual
   :type 'face)
 
 (defcustom gnus-server-opened-face 'gnus-server-opened-face
   "Face name to use on OPENED servers."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-server-visual
   :type 'face)
 
 (defcustom gnus-server-closed-face 'gnus-server-closed-face
   "Face name to use on CLOSED servers."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-server-visual
   :type 'face)
 
 (defcustom gnus-server-denied-face 'gnus-server-denied-face
   "Face name to use on DENIED servers."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-server-visual
   :type 'face)
 
 (defcustom gnus-server-offline-face 'gnus-server-offline-face
   "Face name to use on OFFLINE servers."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-server-visual
   :type 'face)
 
@@ -736,10 +736,10 @@ gnus-method-to-server."
           (if (eq (car method) 'nntp)
               (while (not (eobp))
                 (ignore-errors
-                  (push (cons 
-                         (buffer-substring 
+                  (push (cons
+                         (buffer-substring
                           (point)
-                          (progn 
+                          (progn
                             (skip-chars-forward "^ \t")
                             (point)))
                          (let ((last (read cur)))
@@ -903,7 +903,7 @@ buffer.
     (beginning-of-line)
     (let ((name (get-text-property (point) 'gnus-group)))
       (when (re-search-forward ": \\(.*\\)$" (gnus-point-at-eol) t)
-        (concat (gnus-method-to-server-name gnus-browse-current-method) ":" 
+        (concat (gnus-method-to-server-name gnus-browse-current-method) ":"
                 (or name
                     (match-string-no-properties 1)))))))
 
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index e1985c5db5d..f0113416513 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -37,7 +37,7 @@
 (autoload 'gnus-agent-save-local "gnus-agent")
 (autoload 'gnus-agent-possibly-alter-active "gnus-agent")
 
-(eval-when-compile 
+(eval-when-compile
   (require 'cl)
 
   (defvar gnus-agent-covered-methods nil)
@@ -54,7 +54,7 @@
   "Whether to create backup files.
 This variable takes the same values as the `version-control'
 variable."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-start
   :type '(choice (const :tag "Never" never)
                  (const :tag "If existing" nil)
@@ -65,7 +65,7 @@ variable."
 the buffer or write directly to the file.  The buffer is faster
 because all of the contents are written at once.  The direct write
 uses considerably less memory."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-start
   :type '(choice (const :tag "Write via buffer" t)
                  (const :tag "Write directly to file" nil)))
@@ -299,7 +299,7 @@ claim them."
 (defcustom gnus-subscribe-newsgroup-hooks nil
   "*Hooks run after you subscribe to a new group.
 The hooks will be called with new group's name as argument."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-group-new
   :type 'hook)
 
@@ -406,7 +406,7 @@ This hook is called as the first thing when Gnus is started."
 
 (defcustom gnus-get-top-new-news-hook nil
   "A hook run just before Gnus checks for new news globally."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-group-new
   :type 'hook)
 
@@ -1906,7 +1906,7 @@ If SCAN, request a scan of that group as well."
                             (setcdr range (1- article))
                             (setq modified t)
                             ranges))))))))
-                  
+
     (when modified
       (when (eq modified 'remove-null)
         (setq r (delq nil r)))
@@ -2307,7 +2307,7 @@ If FORCE is non-nil, the .newsrc file is read."
                                   t)))))
 
               (funcall func convert-to)))
-          (gnus-dribble-enter 
+          (gnus-dribble-enter
            (format ";Converted gnus from version '%s' to '%s'."
                    gnus-newsrc-file-version gnus-version)))))))
 
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index c4f320e888b..1af9e0ca1a7 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -119,7 +119,7 @@ given by the `gnus-summary-same-subject' variable.)"
 
 (defcustom gnus-summary-make-false-root-always nil
   "Always make a false dummy root."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-thread
   :type 'boolean)
 
@@ -220,7 +220,7 @@ If this variable is nil, scoring will be disabled."
   "*Default threshold for a high scored article.
 An article will be highlighted as high scored if its score is greater
 than this score."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-score-default
   :type 'integer)
 
@@ -228,7 +228,7 @@ than this score."
   "*Default threshold for a low scored article.
 An article will be highlighted as low scored if its score is smaller
 than this score."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-score-default
   :type 'integer)
 
@@ -324,7 +324,7 @@ the first unseen article), 'unseen-or-unread' (place point on the subject
 line of the first unseen article or, if all article have been seen, on the
 subject line of the first unread article), or a function to be called to
 place point on some subject line."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-group-select
   :type '(choice (const best)
                  (const unread)
@@ -368,7 +368,7 @@ ignores articles whose headers have not been fetched).
 
 NOTE: The list of unfetched articles will always be nil when plugged
 and, when unplugged, a subset of the undownloaded article list."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-summary-maneuvering
   :type '(choice (const :tag "None" nil)
                  (const :tag "Undownloaded when unplugged" undownloaded)
@@ -469,7 +469,7 @@ this variable specifies group names."
 
 (defcustom gnus-spam-mark ?$
   "*Mark used for spam articles."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-summary-marks
   :type 'character)
 
@@ -500,13 +500,13 @@ this variable specifies group names."
 
 (defcustom gnus-forwarded-mark ?F
   "*Mark used for articles that have been forwarded."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-summary-marks
   :type 'character)
 
 (defcustom gnus-recent-mark ?N
   "*Mark used for articles that are recent."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-summary-marks
   :type 'character)
 
@@ -522,13 +522,13 @@ this variable specifies group names."
 
 (defcustom gnus-unseen-mark ?.
   "*Mark used for articles that haven't been seen."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-summary-marks
   :type 'character)
 
 (defcustom gnus-no-mark ?               ;Whitespace
   "*Mark used for articles that have no other secondary mark."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-summary-marks
   :type 'character)
 
@@ -554,7 +554,7 @@ this variable specifies group names."
 
 (defcustom gnus-undownloaded-mark ?-
   "*Mark used for articles that weren't downloaded."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-summary-marks
   :type 'character)
 
@@ -893,19 +893,19 @@ automatically when it is selected."
 
 (defcustom gnus-summary-article-move-hook nil
   "*A hook called after an article is moved, copied, respooled, or crossposted."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-summary
   :type 'hook)
 
 (defcustom gnus-summary-article-delete-hook nil
   "*A hook called after an article is deleted."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-summary
   :type 'hook)
 
 (defcustom gnus-summary-article-expire-hook nil
   "*A hook called after an article is expired."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-summary
   :type 'hook)
 
@@ -913,7 +913,7 @@ automatically when it is selected."
   (and (fboundp 'display-graphic-p)
        (display-graphic-p))
   "*If non-nil, display an arrow highlighting the current article."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-summary
   :type 'boolean)
 
@@ -1091,13 +1091,13 @@ type of files to save."
 This is mostly relevant for slow back ends where the user may
 wish to widen the summary buffer to include all headers
 that were fetched.  Say, for nnultimate groups."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-summary
   :type '(choice boolean regexp))
 
 (defcustom gnus-summary-muttprint-program "muttprint"
   "Command (and optional arguments) used to run Muttprint."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-summary
   :type 'string)
 
@@ -1107,7 +1107,7 @@ Some brain-damaged MUA/MTA, e.g. Lotus Domino 5.0.6 clients, does not
 supply the MIME-Version header or deliberately strip it from the mail.
 Set it to non-nil, Gnus will treat some articles as MIME even if
 the MIME-Version header is missed."
-  :version "21.4"
+  :version "22.1"
   :type 'boolean
   :group 'gnus-article-mime)
 
@@ -1116,7 +1116,7 @@ the MIME-Version header is missed."
 This means that Gnus will search message bodies for text that look
 like uuencoded bits, yEncoded bits, and so on, and present that using
 the normal Gnus MIME machinery."
-  :version "21.4"
+  :version "22.1"
   :type 'boolean
   :group 'gnus-article-mime)
 
@@ -4639,39 +4639,39 @@ Unscored articles will be counted as having a score of zero."
 (defcustom gnus-sum-thread-tree-root "> "
   "With %B spec, used for the root of a thread.
 If nil, use subject instead."
-  :version "21.4"
+  :version "22.1"
   :type '(radio (const :format "%v  " nil) string)
   :group 'gnus-thread)
 (defcustom gnus-sum-thread-tree-false-root "> "
   "With %B spec, used for a false root of a thread.
 If nil, use subject instead."
-  :version "21.4"
+  :version "22.1"
   :type '(radio (const :format "%v  " nil) string)
   :group 'gnus-thread)
 (defcustom gnus-sum-thread-tree-single-indent ""
   "With %B spec, used for a thread with just one message.
 If nil, use subject instead."
-  :version "21.4"
+  :version "22.1"
   :type '(radio (const :format "%v  " nil) string)
   :group 'gnus-thread)
 (defcustom gnus-sum-thread-tree-vertical "| "
   "With %B spec, used for drawing a vertical line."
-  :version "21.4"
+  :version "22.1"
   :type 'string
   :group 'gnus-thread)
 (defcustom gnus-sum-thread-tree-indent "  "
   "With %B spec, used for indenting."
-  :version "21.4"
+  :version "22.1"
   :type 'string
   :group 'gnus-thread)
 (defcustom gnus-sum-thread-tree-leaf-with-other "+-> "
   "With %B spec, used for a leaf with brothers."
-  :version "21.4"
+  :version "22.1"
   :type 'string
   :group 'gnus-thread)
 (defcustom gnus-sum-thread-tree-single-leaf "\\-> "
   "With %B spec, used for a leaf without brothers."
-  :version "21.4"
+  :version "22.1"
   :type 'string
   :group 'gnus-thread)
 
@@ -9182,7 +9182,7 @@ If nil, use to the current newsgroup method."
   "If non-nil, show and update the summary buffer as it's being built.
 If the value is t, update the buffer after every line is inserted.  If
 the value is an integer (N), update the display every N lines."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-thread
   :type '(choice (const :tag "off" nil)
                  number
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index 91e087f05d5..237e0507775 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -1125,7 +1125,7 @@ Return the modified alist."
             (standard-output
              (lambda (c)
                (aset ,buffer ,leng c)
-                   
+
                (if (= ,size (setq ,leng (1+ ,leng)))
                    (progn (write-region ,buffer nil ,file ,append 'no-msg)
                           (setq ,leng 0
@@ -1194,7 +1194,7 @@ Return the modified alist."
 Setting it to nil has no effect after the first time `gnus-byte-compile'
 is run."
   :type 'boolean
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-various)
 
 (defun gnus-byte-compile (form)
@@ -1560,8 +1560,8 @@ empty directories from OLD-PATH."
                         (setq temp (cdr temp)))
                       (= (length temp) 0))
           (delete-directory old-dir)
-          (setq old-dir (file-name-as-directory 
-                         (file-truename 
+          (setq old-dir (file-name-as-directory
+                         (file-truename
                           (concat old-dir "..")))))))))
 
 
diff --git a/lisp/gnus/gnus-win.el b/lisp/gnus/gnus-win.el
index 554c9dc3437..43fe77267c2 100644
--- a/lisp/gnus/gnus-win.el
+++ b/lisp/gnus/gnus-win.el
@@ -62,7 +62,7 @@
   "*If non-nil, frames on all displays will be considered useable by Gnus.
 When nil, only frames on the same display as the selected frame will be
 used to display Gnus windows."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-windows
   :type 'boolean)
 
@@ -199,7 +199,7 @@ See the Gnus manual for an explanation of the syntax used.")
 
 (defcustom gnus-configure-windows-hook nil
   "*A hook called when configuring windows."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-windows
   :type 'hook)
 
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index c8dc878eacd..674c8d2c0ad 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -964,7 +964,7 @@ For example:
      (\"mail\\\\.me\" (gnus-use-scoring  t))
      (\"list\\\\..*\" (total-expire . t)
                   (broken-reply-to . t)))"
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-group-various
   :type '(repeat (cons regexp
                        (repeat sexp))))
@@ -1314,7 +1314,7 @@ If the default site is too slow, try one of these:
                         (gnus-replace-in-string name "\\." "-") "-charter.html")))
   "*An alist of (HIERARCHY . FORM) pairs used to construct the URL of a charter.
 When FORM is evaluated `name' is bound to the name of the group."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-group-various
   :type '(repeat (cons (string :tag "Hierarchy") (sexp :tag "Form"))))
 
@@ -1322,7 +1322,7 @@ When FORM is evaluated `name' is bound to the name of the group."
   "*Non-nil means that control messages are displayed using `browse-url'.
 Otherwise they are fetched with ange-ftp and displayed in an ephemeral
 group."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-group-various
   :type 'boolean)
 
@@ -1781,7 +1781,7 @@ total number of articles in the group.")
                   (list
                    (regexp :tag "Group Name Regular Expression")
                    (boolean :tag "Ignored")))
- 
+
  :parameter-type '(boolean :tag "Group Ignored by the Registry")
  :parameter-document
  "Whether the Gnus Registry should ignore this group.")
@@ -1790,7 +1790,7 @@ total number of articles in the group.")
 (defcustom gnus-install-group-spam-parameters t
   "*Disable the group parameters for spam detection.
 Enable if `G c' in XEmacs is giving you trouble, and make sure to submit a bug report."
-  :version "21.4"
+  :version "22.1"
   :type 'boolean
   :group 'gnus-start)
 
@@ -1891,8 +1891,8 @@ Only applicable to non-spam (unclassified and ham) groups.")
   (gnus-define-group-parameter
    spam-process
    :type list
-   :parameter-type 
-   '(choice 
+   :parameter-type
+   '(choice
      :tag "Spam Summary Exit Processor"
      :value nil
      (list :tag "Spam Summary Exit Processor Choices"
@@ -1933,11 +1933,11 @@ a backend on summary exit.  If non-nil, this should be a list of group
 name regexps that should match all groups in which to do automatic
 spam processing, associated with the appropriate processor."
    :variable-group spam
-   :variable-type 
+   :variable-type
    '(repeat :tag "Spam/Ham Processors"
             (list :tag "Spam Summary Exit Processor Choices"
                   (regexp :tag "Group Regexp")
-                  (set 
+                  (set
                    :tag "Spam/Ham Summary Exit Processor"
                    (variable-item gnus-group-spam-exit-processor-ifile)
                    (variable-item gnus-group-spam-exit-processor-stat)
@@ -1972,7 +1972,7 @@ spam processing, associated with the appropriate processor."
   (gnus-define-group-parameter
    spam-autodetect
    :type list
-   :parameter-type 
+   :parameter-type
    '(boolean :tag "Spam autodetection")
    :function-document
    "Should spam be autodetected (with spam-split) in this group?"
@@ -1983,7 +1983,7 @@ spam processing, associated with the appropriate processor."
    Only unseen articles will be examined, unless
    spam-autodetect-recheck-messages is set."
    :variable-group spam
-   :variable-type 
+   :variable-type
    '(repeat
      :tag "Autodetection setting"
      (list
@@ -1997,7 +1997,7 @@ spam-autodetect-recheck-messages is set.")
   (gnus-define-group-parameter
    spam-autodetect-methods
    :type list
-   :parameter-type 
+   :parameter-type
    '(choice :tag "Spam autodetection-specific methods"
      (const none)
      (const default)
@@ -2024,7 +2024,7 @@ Requires the spam-autodetect parameter.  Only unseen articles
 will be examined, unless spam-autodetect-recheck-messages is
 set."
    :variable-group spam
-   :variable-type 
+   :variable-type
    '(repeat
      :tag "Autodetection methods"
      (list
@@ -2046,7 +2046,7 @@ set."
         (variable-item spam-use-bogofilter-headers)
         (variable-item spam-use-bogofilter)))))
      :parameter-document
-   "Spam autodetection methods.  
+   "Spam autodetection methods.
 Requires the spam-autodetect parameter.  Only unseen articles
 will be examined, unless spam-autodetect-recheck-messages is
 set.")
@@ -2054,7 +2054,7 @@ set.")
   (gnus-define-group-parameter
    spam-process-destination
    :type list
-   :parameter-type 
+   :parameter-type
    '(choice :tag "Destination for spam-processed articles at summary exit"
             (string :tag "Move to a group")
             (repeat :tag "Move to multiple groups"
@@ -2072,7 +2072,7 @@ to do spam-processed article moving, associated with the destination
 group or nil for explicit expiration.  This only makes sense for
 mail groups."
    :variable-group spam
-   :variable-type 
+   :variable-type
    '(repeat
      :tag "Spam-processed articles destination"
      (list
@@ -2085,11 +2085,11 @@ mail groups."
        (const :tag "Expire" nil))))
    :parameter-document
    "Where spam-processed articles will go at summary exit.")
-  
+
   (gnus-define-group-parameter
    ham-process-destination
    :type list
-   :parameter-type 
+   :parameter-type
    '(choice
      :tag "Destination for ham articles at summary exit from a spam group"
      (string :tag "Move to a group")
@@ -2109,7 +2109,7 @@ to do ham article moving, associated with the destination
 group or nil for explicit ignoring.  This only makes sense for
 mail groups, and only works in spam groups."
    :variable-group spam
-   :variable-type 
+   :variable-type
    '(repeat
      :tag "Ham articles destination"
      (list
@@ -2296,7 +2296,7 @@ face."
 When set, Gnus will prefer using the locally stored content rather
 than re-fetching it from the server.  You also need to enable
 `gnus-agent' for this to have any affect."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-agent
   :type 'boolean)
 
@@ -2315,7 +2315,7 @@ covered by that variable."
 You may customize gnus-agent to disable its use.  However, some
 back ends have started to use the agent as a client-side cache.
 Disabling the agent may result in noticeable loss of performance."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-agent
   :type 'boolean)
 
@@ -2347,7 +2347,7 @@ It can be one of the symbols `gnus' \(show only Gnus version\), `emacs-gnus'
 `emacs-gnus' plus system configuration\), `emacs-gnus-type' \(same as
 `emacs-gnus' plus system type\) or a custom string.  If you set it to a
 string, be sure to use a valid format, see RFC 2616."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-message
   :type '(choice
           (item :tag "Show Gnus and Emacs versions and system type"
@@ -3331,7 +3331,7 @@ that that variable is buffer-local to the summary buffers."
               ;; gnus-server-method-cache so this only happens once,
               ;; if at all.
               (let (match)
-                (mapcar 
+                (mapcar
                  (lambda (info)
                    (let ((info-method (gnus-info-method info)))
                      (unless (stringp info-method)
@@ -3992,10 +3992,10 @@ Allow completion over sensible values."
 (defun gnus-agent-method-p (method)
   "Say whether METHOD is covered by the agent."
   (or (eq (car gnus-agent-method-p-cache) method)
-      (setq gnus-agent-method-p-cache 
+      (setq gnus-agent-method-p-cache
             (cons method
-                  (member (if (stringp method) 
-                              method 
+                  (member (if (stringp method)
+                              method
                             (gnus-method-to-server method)) gnus-agent-covered-methods))))
   (cdr gnus-agent-method-p-cache))
 
diff --git a/lisp/gnus/imap.el b/lisp/gnus/imap.el
index d14c673e7b9..18a7cdd090d 100644
--- a/lisp/gnus/imap.el
+++ b/lisp/gnus/imap.el
@@ -228,7 +228,7 @@ pipe, or t or `pty' to use a pty.  The value has no effect if the
 system has no ptys or if all ptys are busy: then a pipe is used
 in any case.  The value takes effect when a IMAP server is
 opened, changing it after that has no effect."
-  :version "21.4"
+  :version "22.1"
   :group 'imap
   :type 'boolean)
 
diff --git a/lisp/gnus/mail-source.el b/lisp/gnus/mail-source.el
index 740f4c9c3a3..6ff642ac24b 100644
--- a/lisp/gnus/mail-source.el
+++ b/lisp/gnus/mail-source.el
@@ -236,7 +236,7 @@ See Info node `(gnus)Mail Source Specifiers'."
   "*Ignore errors when querying mail sources.
 If nil, the user will be prompted when an error occurs.  If non-nil,
 the error will be ignored."
-  :version "21.4"
+  :version "22.1"
   :group 'mail-source
   :type 'boolean)
 
@@ -284,7 +284,7 @@ files older than number of days."
   "*If non-nil, ask for for confirmation before deleting old incoming files.
 This variable only applies when `mail-source-delete-incoming' is a positive
 number."
-  :version "21.4"
+  :version "22.1"
   :group 'mail-source
   :type 'boolean)
 
@@ -305,7 +305,7 @@ number."
 
 (defcustom mail-source-movemail-program nil
   "If non-nil, name of program for fetching new mail."
-  :version "21.4"
+  :version "22.1"
   :group 'mail-source
   :type '(choice (const nil) string))
 
@@ -512,7 +512,7 @@ Return the number of files that were found."
                                (format "Mail source %s error (%s).  Continue? "
                                        (if (memq ':password source)
                                            (let ((s (copy-sequence source)))
-                                             (setcar (cdr (memq ':password s)) 
+                                             (setcar (cdr (memq ':password s))
                                                      "********")
                                              s)
                                          source)
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index d88fd54b144..e30e9a6b123 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -135,7 +135,7 @@ mailbox format."
 
 (defcustom message-fcc-externalize-attachments nil
   "If non-nil, attachments are included as external parts in Fcc copies."
-  :version "21.4"
+  :version "22.1"
   :type 'boolean
   :group 'message-sending)
 
@@ -175,7 +175,7 @@ Otherwise, most addresses look like `angles', but they look like
 
 (defcustom message-insert-canlock t
   "Whether to insert a Cancel-Lock header in news postings."
-  :version "21.4"
+  :version "22.1"
   :group 'message-headers
   :type 'boolean)
 
@@ -204,7 +204,7 @@ Checks include `subject-cmsg', `multiple-headers', `sendsys',
   "*Headers to be generated or prompted for when sending a message.
 Also see `message-required-news-headers' and
 `message-required-mail-headers'."
-  :version "21.4"
+  :version "22.1"
   :group 'message-news
   :group 'message-headers
   :link '(custom-manual "(message)Message Headers")
@@ -212,7 +212,7 @@ Also see `message-required-news-headers' and
 
 (defcustom message-draft-headers '(References From)
   "*Headers to be generated when saving a draft message."
-  :version "21.4"
+  :version "22.1"
   :group 'message-news
   :group 'message-headers
   :link '(custom-manual "(message)Message Headers")
@@ -300,7 +300,7 @@ the user what do do.  In this case, the subject is matched against
 `message-subject-trailing-was-query' is t, always strip the trailing
 old subject.  In this case, `message-subject-trailing-was-regexp' is
 used."
-  :version "21.4"
+  :version "22.1"
   :type '(choice (const :tag "never" nil)
                  (const :tag "always strip" t)
                  (const ask))
@@ -317,7 +317,7 @@ the variable is t instead of `ask', use
 `message-subject-trailing-was-regexp' instead.
 
 It is okay to create some false positives here, as the user is asked."
-  :version "21.4"
+  :version "22.1"
   :group 'message-various
   :link '(custom-manual "(message)Message Headers")
   :type 'regexp)
@@ -330,7 +330,7 @@ If `message-subject-trailing-was-query' is set to t, the subject is
 matched against `message-subject-trailing-was-regexp' in
 `message-strip-subject-trailing-was'.  You should use a regexp creating very
 few false positives here."
-  :version "21.4"
+  :version "22.1"
   :group 'message-various
   :link '(custom-manual "(message)Message Headers")
   :type 'regexp)
@@ -343,7 +343,7 @@ few false positives here."
 (defcustom message-mark-insert-begin
   "--8<---------------cut here---------------start------------->8---\n"
   "How to mark the beginning of some inserted text."
-  :version "21.4"
+  :version "22.1"
   :type 'string
   :link '(custom-manual "(message)Insertion Variables")
   :group 'message-various)
@@ -352,7 +352,7 @@ few false positives here."
 (defcustom message-mark-insert-end
   "--8<---------------cut here---------------end--------------->8---\n"
   "How to mark the end of some inserted text."
-  :version "21.4"
+  :version "22.1"
   :type 'string
   :link '(custom-manual "(message)Insertion Variables")
   :group 'message-various)
@@ -362,7 +362,7 @@ few false positives here."
   "X-No-Archive: Yes\n"
   "Header to insert when you don't want your article to be archived.
 Archives \(such as groups.google.com\) respect this header."
-  :version "21.4"
+  :version "22.1"
   :type 'string
   :link '(custom-manual "(message)Header Commands")
   :group 'message-various)
@@ -372,7 +372,7 @@ Archives \(such as groups.google.com\) respect this header."
   "X-No-Archive: Yes - save http://groups.google.com/"
   "Note to insert why you wouldn't want this posting archived.
 If nil, don't insert any text in the body."
-  :version "21.4"
+  :version "22.1"
   :type '(radio string (const nil))
   :link '(custom-manual "(message)Header Commands")
   :group 'message-various)
@@ -391,7 +391,7 @@ If nil, don't insert any text in the body."
 If nil, `message-cross-post-followup-to' will only do a followup.  Note that
 you can explicitly override this setting by calling
 `message-cross-post-followup-to' with a prefix."
-  :version "21.4"
+  :version "22.1"
   :type 'boolean
   :group 'message-various)
 
@@ -399,7 +399,7 @@ you can explicitly override this setting by calling
 (defcustom message-cross-post-note
   "Crosspost & Followup-To: "
   "Note to insert before signature to notify of cross-post and follow-up."
-  :version "21.4"
+  :version "22.1"
   :type 'string
   :group 'message-various)
 
@@ -407,7 +407,7 @@ you can explicitly override this setting by calling
 (defcustom message-followup-to-note
   "Followup-To: "
   "Note to insert before signature to notify of follow-up only."
-  :version "21.4"
+  :version "22.1"
   :type 'string
   :group 'message-various)
 
@@ -418,7 +418,7 @@ you can explicitly override this setting by calling
 The function will be called with four arguments.  The function should not only
 insert a note, but also ensure old notes are deleted.  See the documentation
 for `message-cross-post-insert-note'."
-  :version "21.4"
+  :version "22.1"
   :type 'function
   :group 'message-various)
 
@@ -586,7 +586,7 @@ Done before generating the new subject of a forward."
                 non-word-constituents
                 "]\\)+>+\\|[ \t]*[]>|}+]\\)+"))))
   "*Regexp matching the longest possible citation prefix on a line."
-  :version "21.4"
+  :version "22.1"
   :group 'message-insertion
   :link '(custom-manual "(message)Insertion Variables")
   :type 'regexp)
@@ -671,7 +671,7 @@ always query the user whether to use the value.  If it is the symbol
 If nil, always ignore the header.  If it is the symbol `ask', always
 query the user whether to use the value.  If it is the symbol `use',
 always use the value."
-  :version "21.4"
+  :version "22.1"
   :group 'message-interface
   :link '(custom-manual "(message)Mailing Lists")
   :type '(choice (const :tag "ignore" nil)
@@ -685,7 +685,7 @@ If non-nil, this variable contains a list of functions which return
 regular expressions to match lists.  These functions can be used in
 conjunction with `message-subscribed-regexps' and
 `message-subscribed-addresses'."
-  :version "21.4"
+  :version "22.1"
   :group 'message-interface
   :link '(custom-manual "(message)Mailing Lists")
   :type '(repeat sexp))
@@ -694,7 +694,7 @@ conjunction with `message-subscribed-regexps' and
   "*A file containing addresses the user is subscribed to.
 If nil, do not look at any files to determine list subscriptions.  If
 non-nil, each line of this file should be a mailing list address."
-  :version "21.4"
+  :version "22.1"
   :group 'message-interface
   :link '(custom-manual "(message)Mailing Lists")
   :type '(radio file (const nil)))
@@ -704,7 +704,7 @@ non-nil, each line of this file should be a mailing list address."
 If nil, do not use any predefined list subscriptions.  This list of
 addresses can be used in conjunction with
 `message-subscribed-address-functions' and `message-subscribed-regexps'."
-  :version "21.4"
+  :version "22.1"
   :group 'message-interface
   :link '(custom-manual "(message)Mailing Lists")
   :type '(repeat string))
@@ -714,7 +714,7 @@ addresses can be used in conjunction with
 If nil, do not use any predefined list subscriptions.  This list of
 regular expressions can be used in conjunction with
 `message-subscribed-address-functions' and `message-subscribed-addresses'."
-  :version "21.4"
+  :version "22.1"
   :group 'message-interface
   :link '(custom-manual "(message)Mailing Lists")
   :type '(repeat regexp))
@@ -724,7 +724,7 @@ regular expressions can be used in conjunction with
 If it is the symbol `always', the posting is allowed.  If it is the
 symbol `never', the posting is not allowed.  If it is the symbol
 `ask', you are prompted."
-  :version "21.4"
+  :version "22.1"
   :group 'message-interface
   :link '(custom-manual "(message)Message Headers")
   :type '(choice (const always)
@@ -742,7 +742,7 @@ Doing so would be even more evil than leaving it out."
   "*Envelope-from when sending mail with sendmail.
 If this is nil, use `user-mail-address'.  If it is the symbol
 `header', use the From: header of the message."
-  :version "21.4"
+  :version "22.1"
   :type '(choice (string :tag "From name")
                  (const :tag "Use From: header from message" header)
                  (const :tag "Use `user-mail-address'" nil))
@@ -856,7 +856,7 @@ the signature is inserted."
     (set-keymap-parent map minibuffer-local-map)
     map)
   "Keymap for `message-read-from-minibuffer'."
-  :version "21.4")
+  :version "22.1")
 
 ;;;###autoload
 (defcustom message-citation-line-function 'message-insert-citation-line
@@ -883,7 +883,7 @@ See also `message-yank-cited-prefix'."
   "*Prefix inserted on cited or empty lines of yanked messages.
 Fix `message-cite-prefix-regexp' if it is set to an abnormal value.
 See also `message-yank-prefix'."
-  :version "21.4"
+  :version "22.1"
   :type 'string
   :link '(custom-manual "(message)Insertion Variables")
   :group 'message-insertion)
@@ -940,7 +940,7 @@ If nil, don't insert a signature."
 ;;;###autoload
 (defcustom message-signature-insert-empty-line t
   "*If non-nil, insert an empty line before the signature separator."
-  :version "21.4"
+  :version "22.1"
   :type 'boolean
   :link '(custom-manual "(message)Insertion Variables")
   :group 'message-insertion)
@@ -1121,7 +1121,7 @@ candidates:
   "Regexp of headers to be hidden when composing new messages.
 This can also be a list of regexps to match headers.  Or a list
 starting with `not' and followed by regexps."
-  :version "21.4"
+  :version "22.1"
   :group 'message
   :link '(custom-manual "(message)Message Headers")
   :type '(repeat regexp))
@@ -1397,7 +1397,7 @@ subaddresses.  So if the first address appears in the recipient list
 for a message, the subaddresses will be removed (if present) before
 the mail is sent.  All addresses in this structure should be
 downcased."
-  :version "21.4"
+  :version "22.1"
   :group 'message-headers
   :type '(repeat (repeat string)))
 
@@ -1405,7 +1405,7 @@ downcased."
   "Like `mail-user-agent'.
 Except if it is nil, use Gnus native MUA; if it is t, use
 `mail-user-agent'."
-  :version "21.4"
+  :version "22.1"
   :type '(radio (const :tag "Gnus native"
                        :format "%t\n"
                        nil)
@@ -1429,14 +1429,14 @@ If this variable is non-nil, pose the question \"Reply to all
 recipients?\" before a wide reply to multiple recipients.  If the user
 answers yes, reply to all recipients as usual.  If the user answers
 no, only reply back to the author."
-  :version "21.4"
+  :version "22.1"
   :group 'message-headers
   :link '(custom-manual "(message)Wide Reply")
   :type 'boolean)
 
 (defcustom message-user-fqdn nil
   "*Domain part of Messsage-Ids."
-  :version "21.4"
+  :version "22.1"
   :group 'message-headers
   :link '(custom-manual "(message)News Headers")
   :type '(radio (const :format "%v  " nil)
@@ -1448,7 +1448,7 @@ no, only reply back to the author."
                                  (executable-find idna-program)
                                  'ask)
   "Whether to encode non-ASCII in domain names into ASCII according to IDNA."
-  :version "21.4"
+  :version "22.1"
   :group 'message-headers
   :link '(custom-manual "(message)IDNA")
   :type '(choice (const :tag "Ask" ask)
@@ -1574,7 +1574,7 @@ no, only reply back to the author."
           "\\)")
   "Regular expression that matches a valid FQDN."
   ;; see also: gnus-button-valid-fqdn-regexp
-  :version "21.4"
+  :version "22.1"
   :group 'message-headers
   :type 'regexp)
 
@@ -2384,7 +2384,7 @@ these properties from the message composition buffer.  However, some
 packages requires these properties to be present in order to work.
 If you use one of these packages, turn this option off, and hope the
 message composition doesn't break too bad."
-  :version "21.4"
+  :version "22.1"
   :group 'message-various
   :link '(custom-manual "(message)Various Message Variables")
   :type 'boolean)
@@ -2731,7 +2731,7 @@ prefix FORCE is given."
 E.g., if this list contains a member list with elements `Cc' and `To',
 then `message-carefully-insert-headers' will not insert a `To' header
 when the message is already `Cc'ed to the recipient."
-  :version "21.4"
+  :version "22.1"
   :group 'message-headers
   :link '(custom-manual "(message)Message Headers")
   :type '(repeat sexp))
@@ -5176,10 +5176,10 @@ Headers already prepared in the buffer are not modified."
 If the current line has `message-yank-prefix', insert it on the new line."
   (interactive "*")
   (condition-case nil
-      (split-line message-yank-prefix) ;; Emacs 21.3.50+ supports arg.
+      (split-line message-yank-prefix) ;; Emacs 22.1+ supports arg.
     (error
      (split-line))))
-     
+
 (defun message-fill-header (header value)
   (let ((begin (point))
         (fill-column 78)
@@ -5281,7 +5281,7 @@ than 988 characters long, and if they are not, trim them until they are."
 (defcustom message-beginning-of-line t
   "Whether \\<message-mode-map>\\[message-beginning-of-line]\
  goes to beginning of header values."
-  :version "21.4"
+  :version "22.1"
   :group 'message-buffers
   :link '(custom-manual "(message)Movement")
   :type 'boolean)
@@ -6593,14 +6593,14 @@ which specify the range to operate on."
         '("^\\(Disposition-Notification-To\\|Return-Receipt-To\\):"
           . message-expand-name))
   "Alist of (RE . FUN).  Use FUN for completion on header lines matching RE."
-  :version "21.4"
+  :version "22.1"
   :group 'message
   :type '(alist :key-type regexp :value-type function))
 
 (defcustom message-tab-body-function nil
   "*Function to execute when `message-tab' (TAB) is executed in the body.
 If nil, the function bound in `text-mode-map' or `global-map' is executed."
-  :version "21.4"
+  :version "22.1"
   :group 'message
   :link '(custom-manual "(message)Various Commands")
   :type 'function)
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index 569890b8097..579571e16aa 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -115,7 +115,7 @@ The defined renderer types are:
 `lynx' : use lynx;
 `html2text' : use html2text;
 nil    : use external viewer."
-  :version "21.4"
+  :version "22.1"
   :type '(choice (const w3)
                  (const w3m)
                  (const w3m-standalone)
@@ -134,7 +134,7 @@ It is suggested to customize `mm-text-html-renderer' instead.")
   "If non-nil, Gnus will allow retrieving images in HTML contents with
 the <img> tags.  It has no effect on Emacs/w3.  See also the
 documentation for the `mm-w3m-safe-url-regexp' variable."
-  :version "21.4"
+  :version "22.1"
   :type 'boolean
   :group 'mime-display)
 
@@ -150,14 +150,14 @@ when displaying the image.  The default value is \"\\\\`cid:\" which only
 matches parts embedded to the Multipart/Related type MIME contents and
 Gnus will never connect to the spammer's site arbitrarily.  You may
 set this variable to nil if you consider all urls to be safe."
-  :version "21.4"
+  :version "22.1"
   :type '(choice (regexp :tag "Regexp")
                  (const :tag "All URLs are safe" nil))
   :group 'mime-display)
 
 (defcustom mm-inline-text-html-with-w3m-keymap t
   "If non-nil, use emacs-w3m command keys in the article buffer."
-  :version "21.4"
+  :version "22.1"
   :type 'boolean
   :group 'mime-display)
 
@@ -167,7 +167,7 @@ set this variable to nil if you consider all urls to be safe."
 If t, all defined external MIME handlers are used.  If nil, files are saved by
 `mailcap-save-binary-file'.  If it is the symbol `ask', you are prompted
 before the external MIME handler is invoked."
-  :version "21.4"
+  :version "22.1"
   :type '(choice (const :tag "Always" t)
                  (const :tag "Never" nil)
                  (const :tag "Ask" ask))
@@ -283,7 +283,7 @@ type inline."
     "application/pdf" "application/x-dvi")
   "List of media types for which the external viewer will not be killed
 when selecting a different article."
-  :version "21.4"
+  :version "22.1"
   :type '(repeat string)
   :group 'mime-display)
 
@@ -380,13 +380,13 @@ If not set, `default-directory' will be used."
 
 (defcustom mm-attachment-file-modes 384
   "Set the mode bits of saved attachments to this integer."
-  :version "21.4"
+  :version "22.1"
   :type 'integer
   :group 'mime-display)
 
 (defcustom mm-external-terminal-program "xterm"
   "The program to start an external terminal."
-  :version "21.4"
+  :version "22.1"
   :type 'string
   :group 'mime-display)
 
@@ -419,7 +419,7 @@ If not set, `default-directory' will be used."
   "Option of verifying signed parts.
 `never', not verify; `always', always verify;
 `known', only verify known protocols.  Otherwise, ask user."
-  :version "21.4"
+  :version "22.1"
   :type '(choice (item always)
                  (item never)
                  (item :tag "only known protocols" known)
@@ -438,7 +438,7 @@ If not set, `default-directory' will be used."
   "Option of decrypting encrypted parts.
 `never', not decrypt; `always', always decrypt;
 `known', only decrypt known protocols.  Otherwise, ask user."
-  :version "21.4"
+  :version "22.1"
   :type '(choice (item always)
                  (item never)
                  (item :tag "only known protocols" known)
diff --git a/lisp/gnus/mm-url.el b/lisp/gnus/mm-url.el
index 1388371c981..29d956ba64f 100644
--- a/lisp/gnus/mm-url.el
+++ b/lisp/gnus/mm-url.el
@@ -49,7 +49,7 @@
                                     (require 'url)
                                   (error nil)))
   "*If non-nil, use external grab program `mm-url-program'."
-  :version "21.4"
+  :version "22.1"
   :type 'boolean
   :group 'mm-url)
 
@@ -68,7 +68,7 @@
    (t "GET"))
   "The url grab program.
 Likely values are `wget', `w3m', `lynx' and `curl'."
-  :version "21.4"
+  :version "22.1"
   :type '(choice
           (symbol :tag "wget" wget)
           (symbol :tag "w3m" w3m)
@@ -79,7 +79,7 @@ Likely values are `wget', `w3m', `lynx' and `curl'."
 
 (defcustom mm-url-arguments nil
   "The arguments for `mm-url-program'."
-  :version "21.4"
+  :version "22.1"
   :type '(repeat string)
   :group 'mm-url)
 
diff --git a/lisp/gnus/mm-uu.el b/lisp/gnus/mm-uu.el
index b140cb76df5..5152d7138fb 100644
--- a/lisp/gnus/mm-uu.el
+++ b/lisp/gnus/mm-uu.el
@@ -80,7 +80,7 @@ This can be either \"inline\" or \"attachment\".")
 
 (defcustom mm-uu-diff-groups-regexp "gnus\\.commits"
   "*Regexp matching diff groups."
-  :version "21.4"
+  :version "22.1"
   :type 'regexp
   :group 'gnus-article-mime)
 
diff --git a/lisp/gnus/mml-sec.el b/lisp/gnus/mml-sec.el
index 8bd2ed784ad..cdfc378bab3 100644
--- a/lisp/gnus/mml-sec.el
+++ b/lisp/gnus/mml-sec.el
@@ -43,7 +43,7 @@
 (defcustom mml-default-sign-method "pgpmime"
   "Default sign method.
 The string must have an entry in `mml-sign-alist'."
-  :version "21.4"
+  :version "22.1"
   :type '(choice (const "smime")
                  (const "pgp")
                  (const "pgpauto")
@@ -61,7 +61,7 @@ The string must have an entry in `mml-sign-alist'."
 (defcustom mml-default-encrypt-method "pgpmime"
   "Default encryption method.
 The string must have an entry in `mml-encrypt-alist'."
-  :version "21.4"
+  :version "22.1"
   :type '(choice (const "smime")
                  (const "pgp")
                  (const "pgpauto")
@@ -85,7 +85,7 @@ Note that the output generated by using a `combined' mode is NOT
 understood by all PGP implementations, in particular PGP version
 2 does not support it!  See Info node `(message)Security' for
 details."
-  :version "21.4"
+  :version "22.1"
   :group 'message
   :type '(repeat (list (choice (const :tag "S/MIME" "smime")
                                (const :tag "PGP" "pgp")
diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el
index f774e53499a..0e018c68903 100644
--- a/lisp/gnus/mml.el
+++ b/lisp/gnus/mml.el
@@ -44,7 +44,7 @@
   '(name access-type expiration size permission format)
   "*A list of acceptable parameters in MML tag.
 These parameters are generated in Content-Type header if exists."
-  :version "21.4"
+  :version "22.1"
   :type '(repeat (symbol :tag "Parameter"))
   :group 'message)
 
@@ -52,14 +52,14 @@ These parameters are generated in Content-Type header if exists."
   '(filename creation-date modification-date read-date)
   "*A list of acceptable parameters in MML tag.
 These parameters are generated in Content-Disposition header if exists."
-  :version "21.4"
+  :version "22.1"
   :type '(repeat (symbol :tag "Parameter"))
   :group 'message)
 
 (defcustom mml-insert-mime-headers-always nil
   "If non-nil, always put Content-Type: text/plain at top of empty parts.
 It is necessary to work against a bug in certain clients."
-  :version "21.4"
+  :version "22.1"
   :type 'boolean
   :group 'message)
 
diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el
index e083c2c9d9c..a0e47dd2f2c 100644
--- a/lisp/gnus/mml2015.el
+++ b/lisp/gnus/mml2015.el
@@ -83,7 +83,7 @@
     ("TRUST_FULLY"     . t)
     ("TRUST_ULTIMATE"  . t))
   "Map GnuPG trust output values to a boolean saying if you trust the key."
-  :version "21.4"
+  :version "22.1"
   :group 'mime-security
   :type '(repeat (cons (regexp :tag "GnuPG output regexp")
                        (boolean :tag "Trust key"))))
@@ -585,7 +585,7 @@
         ;; set up a function to call the correct gpg encrypt routine
         ;; with the right arguments. (FIXME: this should be done
         ;; differently.)
-        (flet ((gpg-encrypt-func 
+        (flet ((gpg-encrypt-func
                  (sign plaintext ciphertext result recipients &optional
                        passphrase sign-with-key armor textmode)
                  (if sign
@@ -656,7 +656,7 @@
         (if (condition-case err
                 (prog1
                     (pgg-decrypt-region (point-min) (point-max))
-                  (setq decrypt-status 
+                  (setq decrypt-status
                         (with-current-buffer mml2015-result-buffer
                           (buffer-string)))
                   (mm-set-handle-multipart-parameter
@@ -740,7 +740,7 @@
           (mm-insert-part signature))
         (if (condition-case err
                 (prog1
-                    (pgg-verify-region (point-min) (point-max) 
+                    (pgg-verify-region (point-min) (point-max)
                                        signature-file t)
                   (goto-char (point-min))
                   (while (search-forward "\r\n" nil t)
diff --git a/lisp/gnus/nndiary.el b/lisp/gnus/nndiary.el
index 13000a8ad19..de33cd156c6 100644
--- a/lisp/gnus/nndiary.el
+++ b/lisp/gnus/nndiary.el
@@ -223,7 +223,7 @@
 
 (defgroup nndiary nil
   "The Gnus Diary backend."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-diary)
 
 (defcustom nndiary-mail-sources
@@ -760,7 +760,7 @@ all.  This may very well take some time.")
   (when (nndiary-schedule)
     (let (result)
       (when nnmail-cache-accepted-message-ids
-        (nnmail-cache-insert (nnmail-fetch-field "message-id") 
+        (nnmail-cache-insert (nnmail-fetch-field "message-id")
                              group
                              (nnmail-fetch-field "subject")))
       (if (stringp group)
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 56272a1472b..c3afd6381ca 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -211,7 +211,7 @@ variable is the symbol `default' the default behaviour is
 used (which currently is nil, unless you use a statistical
 spam.el test); if this variable is another non-nil value bodies
 will be downloaded."
-  :version "21.4"
+  :version "22.1"
   :group 'nnimap
   :type '(choice (const :tag "Let system decide" deault)
                  boolean))
@@ -223,7 +223,7 @@ will be downloaded."
 This means that errors caught by nnimap when closing the mailbox will
 not prevent Gnus from updating the group status, which may be harmful.
 However, it increases speed."
-  :version "21.4"
+  :version "22.1"
   :type 'boolean
   :group 'nnimap)
 
@@ -232,7 +232,7 @@ However, it increases speed."
 This increases the speed of closing mailboxes (quiting group) but may
 decrease the speed of selecting another mailbox later.  Re-selecting
 the same mailbox will be faster though."
-  :version "21.4"
+  :version "22.1"
   :type 'boolean
   :group 'nnimap)
 
@@ -245,7 +245,7 @@ more carefully for new mail.
 
 In summary, the default is O((1-p)*k+p*n) and changing it to nil makes
 it O(n).  If p is small, then the default is probably faster."
-  :version "21.4"
+  :version "22.1"
   :type 'boolean
   :group 'nnimap)
 
@@ -826,7 +826,7 @@ function is generally only called when Gnus is shutting down."
 
 (defun nnimap-make-callback (article gnus-callback buffer)
   "Return a callback function."
-  `(lambda () 
+  `(lambda ()
      (nnimap-callback ,article ,gnus-callback ,buffer)))
 
 (defun nnimap-callback (article gnus-callback buffer)
@@ -876,8 +876,8 @@ function is generally only called when Gnus is shutting down."
                                    (imap-error-text nnimap-server-buffer))
                 (cons group article)))
           (add-hook 'imap-fetch-data-hook
-                    (nnimap-make-callback article 
-                                          nnheader-callback-function 
+                    (nnimap-make-callback article
+                                          nnheader-callback-function
                                           nntp-server-buffer))
           (imap-fetch-asynch article part nil nnimap-server-buffer)
           (cons group article))))))
@@ -930,7 +930,7 @@ function is generally only called when Gnus is shutting down."
   "Update the unseen count in `nnimap-mailbox-info'."
   (gnus-sethash
    (gnus-group-prefixed-name group server)
-   (let ((old (gnus-gethash-safe (gnus-group-prefixed-name group server) 
+   (let ((old (gnus-gethash-safe (gnus-group-prefixed-name group server)
                                  nnimap-mailbox-info)))
      (list (nth 0 old) (nth 1 old)
            (imap-mailbox-status group 'unseen nnimap-server-buffer)
@@ -1043,7 +1043,7 @@ function is generally only called when Gnus is shutting down."
                              'asyncgroups
                            'slowgroups)
                          (list group (imap-mailbox-status-asynch
-                                      group '(uidvalidity uidnext unseen) 
+                                      group '(uidvalidity uidnext unseen)
                                       nnimap-server-buffer))))
           (dolist (asyncgroup asyncgroups)
             (let ((group (nth 0 asyncgroup))
@@ -1054,7 +1054,7 @@ function is generally only called when Gnus is shutting down."
                               (nth 0 (gnus-gethash (gnus-group-prefixed-name
                                                     group server)
                                                    nnimap-mailbox-info))
-                              (imap-mailbox-get 'uidvalidity group 
+                              (imap-mailbox-get 'uidvalidity group
                                                 nnimap-server-buffer)))
                         (not (string=
                               (nth 1 (gnus-gethash (gnus-group-prefixed-name
@@ -1310,7 +1310,7 @@ function is generally only called when Gnus is shutting down."
                              (let (msgid)
                                (and (setq msgid
                                           (nnmail-fetch-field "message-id"))
-                                    (nnmail-cache-insert msgid 
+                                    (nnmail-cache-insert msgid
                                                          to-group
                                                          (nnmail-fetch-field "subject"))))))
                          ;; Add the group-art list to the history list.
@@ -1418,12 +1418,12 @@ function is generally only called when Gnus is shutting down."
                         nnmail-expiry-wait)))
           (cond ((or force (eq days 'immediate))
                  (let ((oldarts (imap-search
-                                 (concat "UID " 
+                                 (concat "UID "
                                          (imap-range-to-message-set artseq)))))
                    (when oldarts
                      (nnimap-expiry-target oldarts group server)
                      (when (imap-message-flags-add
-                            (imap-range-to-message-set 
+                            (imap-range-to-message-set
                              (gnus-compress-sequence oldarts)) "\\Deleted")
                        (setq articles (gnus-set-difference
                                        articles oldarts))))))
@@ -1437,9 +1437,9 @@ function is generally only called when Gnus is shutting down."
                    (when oldarts
                      (nnimap-expiry-target oldarts group server)
                      (when (imap-message-flags-add
-                            (imap-range-to-message-set 
+                            (imap-range-to-message-set
                              (gnus-compress-sequence oldarts)) "\\Deleted")
-                       (setq articles (gnus-set-difference 
+                       (setq articles (gnus-set-difference
                                        articles oldarts)))))))))))
   ;; return articles not deleted
   articles)
diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el
index 471a0f3aa21..c0689335f67 100644
--- a/lisp/gnus/nnmail.el
+++ b/lisp/gnus/nnmail.el
@@ -119,7 +119,7 @@ If nil, the first match found will be used."
 (defcustom nnmail-split-fancy-with-parent-ignore-groups nil
   "Regexp that matches group names to be ignored when applying `nnmail-split-fancy-with-parent'.
 This can also be a list of regexps."
-  :version "21.4"
+  :version "22.1"
   :group 'nnmail-split
   :type '(choice (const :tag "none" nil)
                  (regexp :value ".*")
@@ -128,7 +128,7 @@ This can also be a list of regexps."
 (defcustom nnmail-cache-ignore-groups nil
   "Regexp that matches group names to be ignored when inserting message ids into the cache (`nnmail-cache-insert').
 This can also be a list of regexps."
-  :version "21.4"
+  :version "22.1"
   :group 'nnmail-split
   :type '(choice (const :tag "none" nil)
                  (regexp :value ".*")
@@ -226,7 +226,7 @@ From header will be expired to the group \"nnfolder:Work\";
 articles containing the sting \"IMPORTANT\" in the Subject header will
 be expired to the group \"nnfolder:IMPORTANT.YYYY.MMM\"; and
 everything else will be expired to \"nnfolder:Archive-YYYY\"."
-  :version "21.4"
+  :version "22.1"
   :group 'nnmail-expire
   :type '(repeat (list (choice :tag "Match against"
                                (string :tag "Header")
@@ -355,7 +355,7 @@ discarded after running the split process."
 
 (defcustom nnmail-spool-hook nil
   "*A hook called when a new article is spooled."
-  :version "21.4"
+  :version "22.1"
   :group 'nnmail
   :type 'hook)
 
@@ -370,14 +370,14 @@ messages will be shown to indicate the current status."
 (define-widget 'nnmail-lazy 'default
   "Base widget for recursive datastructures.
 
-This is copy of the `lazy' widget in Emacs 21.4 provided for compatibility."
+This is copy of the `lazy' widget in Emacs 22.1 provided for compatibility."
   :format "%{%t%}: %v"
   :convert-widget 'widget-value-convert-widget
   :value-create (lambda (widget)
                   (let ((value (widget-get widget :value))
                         (type (widget-get widget :type)))
-                    (widget-put widget :children 
-                                (list (widget-create-child-value 
+                    (widget-put widget :children
+                                (list (widget-create-child-value
                                        widget (widget-convert type) value)))))
   :value-delete 'widget-children-value-delete
   :value-get (lambda (widget)
@@ -409,7 +409,7 @@ This is copy of the `lazy' widget in Emacs 21.4 provided for compatibility."
                       (list :tag "Function with fixed arguments (:)"
                             :value (: nil)
                             (const :format "" :value :)
-                            function 
+                            function
                             (editable-list :inline t (sexp :tag "Arg"))
                             )
                       (list :tag "Function with split arguments (!)"
@@ -417,11 +417,11 @@ This is copy of the `lazy' widget in Emacs 21.4 provided for compatibility."
                             (const :format "" !)
                             function
                             (editable-list :inline t nnmail-split-fancy))
-                      (list :tag "Field match" 
-                            (choice :tag "Field" 
+                      (list :tag "Field match"
+                            (choice :tag "Field"
                                     regexp symbol)
                             (choice :tag "Match"
-                                    regexp 
+                                    regexp
                                     (symbol :value mail))
                             (repeat :inline t
                                     :tag "Restrictions"
@@ -562,13 +562,13 @@ parameter.  It should return nil, `warn' or `delete'."
 
 (defcustom nnmail-mail-splitting-charset nil
   "Default charset to be used when splitting incoming mail."
-  :version "21.4"
+  :version "22.1"
   :group 'nnmail
   :type 'symbol)
 
 (defcustom nnmail-mail-splitting-decodes nil
   "Whether the nnmail splitting functionality should MIME decode headers."
-  :version "21.4"
+  :version "22.1"
   :group 'nnmail
   :type 'boolean)
 
@@ -578,7 +578,7 @@ Normally, regexes given in `nnmail-split-fancy' are implicitly surrounded
 by \"\\=\\<...\\>\".  If this variable is true, they are not implicitly\
  surrounded
 by anything."
-  :version "21.4"
+  :version "22.1"
   :group 'nnmail
   :type 'boolean)
 
@@ -586,7 +586,7 @@ by anything."
   "Whether to lowercase expanded entries (i.e. \\N) when splitting mails.
 This avoids the creation of multiple groups when users send to an address
 using different case (i.e. mailing-list@domain vs Mailing-List@Domain)."
-  :version "21.4"
+  :version "22.1"
   :group 'nnmail
   :type 'boolean)
 
@@ -1580,7 +1580,7 @@ See the documentation for the variable `nnmail-split-fancy' for details."
   (when (stringp id)
     ;; this will handle cases like `B r' where the group is nil
     (let ((grp (or grp gnus-newsgroup-name "UNKNOWN")))
-      (run-hook-with-args 'nnmail-spool-hook 
+      (run-hook-with-args 'nnmail-spool-hook
                           id grp subject sender))
     (when nnmail-treat-duplicates
       ;; Store some information about the group this message is written
@@ -1603,7 +1603,7 @@ See the documentation for the variable `nnmail-split-fancy' for details."
               (unless (and regexp (string-match regexp grp))
                 (insert id "\t" grp "\n")))
           (insert id "\n"))))))
-  
+
 (defun nnmail-cache-primary-mail-backend ()
   (let ((be-list (cons gnus-select-method gnus-secondary-select-methods))
         (be nil)
diff --git a/lisp/gnus/pgg-def.el b/lisp/gnus/pgg-def.el
index 046f57dbbfe..ab82126f32e 100644
--- a/lisp/gnus/pgg-def.el
+++ b/lisp/gnus/pgg-def.el
@@ -30,7 +30,7 @@
 (defgroup pgg ()
   "Glue for the various PGP implementations."
   :group 'mime
-  :version "21.4")
+  :version "22.1")
 
 (defcustom pgg-default-scheme 'gpg
   "Default PGP scheme."
@@ -51,7 +51,7 @@
 
 (defcustom pgg-query-keyserver nil
   "Whether PGG queries keyservers for missing keys when verifying messages."
-  :version "21.4"
+  :version "22.1"
   :group 'pgg
   :type 'boolean)
 
diff --git a/lisp/gnus/pop3.el b/lisp/gnus/pop3.el
index 4aa387f375f..b21b3dcd5ae 100644
--- a/lisp/gnus/pop3.el
+++ b/lisp/gnus/pop3.el
@@ -46,26 +46,26 @@
                              (getenv "LOGNAME")
                              (getenv "USER"))
   "*POP3 maildrop."
-  :version "21.4" ;; Oort Gnus
+  :version "22.1" ;; Oort Gnus
   :type 'string
   :group 'pop3)
 
 (defcustom pop3-mailhost (or (getenv "MAILHOST") ;; nil -> mismatch
                              "pop3")
   "*POP3 mailhost."
-  :version "21.4" ;; Oort Gnus
+  :version "22.1" ;; Oort Gnus
   :type 'string
   :group 'pop3)
 
 (defcustom pop3-port 110
   "*POP3 port."
-  :version "21.4" ;; Oort Gnus
+  :version "22.1" ;; Oort Gnus
   :type 'number
   :group 'pop3)
 
 (defcustom pop3-password-required t
   "*Non-nil if a password is required when connecting to POP server."
-  :version "21.4" ;; Oort Gnus
+  :version "22.1" ;; Oort Gnus
   :type 'boolean
   :group 'pop3)
 
@@ -77,7 +77,7 @@
   "*POP3 authentication scheme.
 Defaults to 'pass, for the standard USER/PASS authentication.  Other valid
 values are 'apop."
-  :version "21.4" ;; Oort Gnus
+  :version "22.1" ;; Oort Gnus
   :type '(choice (const :tag "USER/PASS" pass)
                  (const :tag "APOP" apop))
   :group 'pop3)
@@ -91,7 +91,7 @@ maintain no state information between sessions, so what the
 client believes is there and what is actually there may not match
 up.  If they do not, then the whole thing can fall apart and
 leave you with a corrupt mailbox."
-  :version "21.4" ;; Oort Gnus
+  :version "22.1" ;; Oort Gnus
   :type 'boolean
   :group 'pop3)
 
diff --git a/lisp/gnus/sha1.el b/lisp/gnus/sha1.el
index 51a826fe5fc..346bf9a268e 100644
--- a/lisp/gnus/sha1.el
+++ b/lisp/gnus/sha1.el
@@ -60,7 +60,7 @@
 
 (defgroup sha1 nil
   "Elisp interface for SHA1 hash computation."
-  :version "21.4"
+  :version "22.1"
   :group 'extensions)
 
 (defcustom sha1-maximum-internal-length 500
diff --git a/lisp/gnus/sieve.el b/lisp/gnus/sieve.el
index c37ffb616db..97acf4727ea 100644
--- a/lisp/gnus/sieve.el
+++ b/lisp/gnus/sieve.el
@@ -65,7 +65,7 @@
 
 (defgroup sieve nil
   "Manage sieve scripts."
-  :version "21.4"
+  :version "22.1"
   :group 'tools)
 
 (defcustom sieve-new-script "<new script>"
diff --git a/lisp/gnus/smiley.el b/lisp/gnus/smiley.el
index 4564db294f1..74a4d9cf596 100644
--- a/lisp/gnus/smiley.el
+++ b/lisp/gnus/smiley.el
@@ -78,7 +78,7 @@ regexp to replace with IMAGE.  IMAGE is the name of a PBM file in
       (push "xpm" types))
     types)
   "*List of suffixes on picon file names to try."
-  :version "21.4"
+  :version "22.1"
   :type '(repeat string)
   :group 'smiley)
 
diff --git a/lisp/gnus/smime.el b/lisp/gnus/smime.el
index 954447702bd..1d20a3f5c58 100644
--- a/lisp/gnus/smime.el
+++ b/lisp/gnus/smime.el
@@ -150,7 +150,7 @@ certificate."
 (defcustom smime-CA-file nil
   "*Files containing certificates for CAs you trust.
 File should contain certificates in PEM format."
-  :version "21.4"
+  :version "22.1"
   :type '(choice (const :tag "none" nil)
                  file)
   :group 'smime)
@@ -178,7 +178,7 @@ and the files themself should be in PEM format."
 
 (defcustom smime-encrypt-cipher "-des3"
   "*Cipher algorithm used for encryption."
-  :version "21.4"
+  :version "22.1"
   :type '(choice (const :tag "Triple DES" "-des3")
                  (const :tag "DES"  "-des")
                  (const :tag "RC2 40 bits" "-rc2-40")
@@ -210,7 +210,7 @@ At least OpenSSL version 0.9.7 is required for this to work."
 (defcustom smime-dns-server nil
   "*DNS server to query certificates from.
 If nil, use system defaults."
-  :version "21.4"
+  :version "22.1"
   :type '(choice (const :tag "System defaults")
                  string)
   :group 'smime)
diff --git a/lisp/gnus/spam-stat.el b/lisp/gnus/spam-stat.el
index eb33b7ad0b3..ca1cdc6ce60 100644
--- a/lisp/gnus/spam-stat.el
+++ b/lisp/gnus/spam-stat.el
@@ -128,7 +128,7 @@
 Use the functions to build a dictionary of words and their statistical
 distribution in spam and non-spam mails.  Then use a function to determine
 whether a buffer contains spam or not."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus)
 
 (defcustom spam-stat-file "~/.spam-stat.el"
diff --git a/lisp/gnus/spam.el b/lisp/gnus/spam.el
index 9a55ba9f318..e36bf8b26c8 100644
--- a/lisp/gnus/spam.el
+++ b/lisp/gnus/spam.el
@@ -77,7 +77,7 @@
 
 (defgroup spam nil
   "Spam configuration."
-  :version "21.4")
+  :version "22.1")
 
 (defcustom spam-directory (nnheader-concat gnus-directory "spam/")
   "Directory for spam whitelists and blacklists."
diff --git a/lisp/gnus/starttls.el b/lisp/gnus/starttls.el
index 7a2eef5e7d0..f2b72fbef1c 100644
--- a/lisp/gnus/starttls.el
+++ b/lisp/gnus/starttls.el
@@ -126,7 +126,7 @@
   "Name of GNUTLS command line tool.
 This program is used when GNUTLS is used, i.e. when
 `starttls-use-gnutls' is non-nil."
-  :version "21.4"
+  :version "22.1"
   :type 'string
   :group 'starttls)
 
@@ -139,7 +139,7 @@ i.e. when `starttls-use-gnutls' is nil."
 
 (defcustom starttls-use-gnutls (not (executable-find starttls-program))
   "*Whether to use GNUTLS instead of the `starttls' command."
-  :version "21.4"
+  :version "22.1"
   :type 'boolean
   :group 'starttls)
 
@@ -158,13 +158,13 @@ This program is used when GNUTLS is used, i.e. when
 For example, non-TLS compliant servers may require
 '(\"--protocols\" \"ssl3\").  Invoke \"gnutls-cli --help\" to
 find out which parameters are available."
-  :version "21.4"
+  :version "22.1"
   :type '(repeat string)
   :group 'starttls)
 
 (defcustom starttls-process-connection-type nil
   "*Value for `process-connection-type' to use when starting STARTTLS process."
-  :version "21.4"
+  :version "22.1"
   :type 'boolean
   :group 'starttls)
 
@@ -174,7 +174,7 @@ The default is what GNUTLS's \"gnutls-cli\" outputs."
   ;; GNUTLS cli.c:main() print this string when it is starting to run
   ;; in the application read/write phase.  If the logic, or the string
   ;; itself, is modified, this must be updated.
-  :version "21.4"
+  :version "22.1"
   :type 'regexp
   :group 'starttls)
 
@@ -183,7 +183,7 @@ The default is what GNUTLS's \"gnutls-cli\" outputs."
 The default is what GNUTLS's \"gnutls-cli\" outputs."
   ;; GNUTLS cli.c:do_handshake() print this string on failure.  If the
   ;; logic, or the string itself, is modified, this must be updated.
-  :version "21.4"
+  :version "22.1"
   :type 'regexp
   :group 'starttls)
 
@@ -194,7 +194,7 @@ The default is what GNUTLS's \"gnutls-cli\" outputs."
   ;; common.c:print_info(), that unconditionally print this string
   ;; last.  If that logic, or the string itself, is modified, this
   ;; must be updated.
-  :version "21.4"
+  :version "22.1"
   :type 'regexp
   :group 'starttls)
 
diff --git a/lisp/gnus/utf7.el b/lisp/gnus/utf7.el
index 18e7774a578..65f364acfbb 100644
--- a/lisp/gnus/utf7.el
+++ b/lisp/gnus/utf7.el
@@ -59,7 +59,7 @@
 ;; $ echo "a+£"|iconv -f iso-8859-1 -t utf-7
 ;; a+-+AKM
 ;;
-;;  -- fx 
+;;  -- fx
 
 
 ;;; Code:
@@ -78,7 +78,7 @@
 (defconst utf7-utf-16-coding-system
   (cond ((mm-coding-system-p 'utf-16-be-no-signature) ; Mule-UCS
          'utf-16-be-no-signature)
-        ((and (mm-coding-system-p 'utf-16-be) ; Emacs 21.4 (?), Emacs 22
+        ((and (mm-coding-system-p 'utf-16-be) ; Emacs 22.1
               ;; Avoid versions with BOM.
               (= 2 (length (encode-coding-string "a" 'utf-16-be))))
          'utf-16-be)
diff --git a/lisp/gnus/uudecode.el b/lisp/gnus/uudecode.el
index c969dfa17a1..7f269132775 100644
--- a/lisp/gnus/uudecode.el
+++ b/lisp/gnus/uudecode.el
@@ -51,7 +51,7 @@ input and write the converted data to its standard output."
 (defcustom uudecode-use-external
   (executable-find uudecode-decoder-program)
   "*Use external uudecode program."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-extract
   :type 'boolean)
 
diff --git a/lisp/help-at-pt.el b/lisp/help-at-pt.el
index 53af1bdd579..00c62abe9ca 100644
--- a/lisp/help-at-pt.el
+++ b/lisp/help-at-pt.el
@@ -53,7 +53,7 @@
 (defgroup help-at-pt nil
   "Features for displaying local help."
   :group 'help
-  :version "21.4")
+  :version "22.1")
 
 ;;;###autoload
 (defun help-at-pt-string (&optional kbd)
diff --git a/lisp/hl-line.el b/lisp/hl-line.el
index 5ed334f4049..a3e786dd801 100644
--- a/lisp/hl-line.el
+++ b/lisp/hl-line.el
@@ -58,7 +58,7 @@
 ;; mode is used.
 
 ;; In default whole the line is highlighted. The range of highlighting
-;; can be changed by defining an appropriate function as the 
+;; can be changed by defining an appropriate function as the
 ;; buffer-local value of `hl-line-range-function'.
 
 ;;; Code:
@@ -79,13 +79,13 @@ Otherwise Hl-Line mode will highlight only in the selected
 window.  Setting this variable takes effect the next time you use
 the command `hl-line-mode' to turn Hl-Line mode on."
   :type 'boolean
-  :version "21.4"
+  :version "22.1"
   :group 'hl-line)
 
 (defvar hl-line-range-function nil
   "If non-nil, function to call to return highlight range.
 The function of no args should return a cons cell; its car value
-is the beginning position of highlight and its cdr value is the 
+is the beginning position of highlight and its cdr value is the
 end position of highlight in the buffer.
 It should return nil if there's no region to be highlighted.
 
diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index 6dce953df0f..f2ebb5db324 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -45,7 +45,7 @@
 Ibuffer allows you to operate on buffers in a manner much like Dired.
 Operations include sorting, marking by regular expression, and
 the ability to filter the displayed buffers by various criteria."
-  :version "21.4"
+  :version "22.1"
   :group 'convenience)
 
 (defcustom ibuffer-formats '((mark modified read-only " " (name 18 18 :left :elide)
@@ -215,7 +215,7 @@ If a function, it will be called with the buffer as an argument, and
 should return non-nil if this buffer should be shown.
 
 Viewing of buffers hidden because of these predicates may be customized
-via `ibuffer-default-display-maybe-show-predicates' and is toggled by 
+via `ibuffer-default-display-maybe-show-predicates' and is toggled by
 giving a non-nil prefix argument to `ibuffer-update'.
 Note that this specialized filtering occurs before real filtering."
   :type '(repeat (choice regexp function))
diff --git a/lisp/ido.el b/lisp/ido.el
index 996eb2c47bc..389ddb0b9a1 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -338,7 +338,7 @@
   "Switch between files using substrings."
   :group 'extensions
   :group 'convenience
-  :version "21.4"
+  :version "22.1"
   :link '(emacs-commentary-link :tag "Commentary" "ido.el")
   :link '(emacs-library-link :tag "Lisp File" "ido.el"))
 
diff --git a/lisp/ielm.el b/lisp/ielm.el
index 96969bfc878..cbfbf57e36f 100644
--- a/lisp/ielm.el
+++ b/lisp/ielm.el
@@ -77,7 +77,7 @@ text-only terminals or with `emacs -nw', you might wish to use
 another binding for `comint-kill-whole-line'."
   :type 'boolean
   :group 'ielm
-  :version "21.4")
+  :version "22.1")
 
 (defcustom ielm-prompt "ELISP> "
   "Prompt used in IELM.
diff --git a/lisp/imenu.el b/lisp/imenu.el
index 6ee72a88bc4..85430bbdbfc 100644
--- a/lisp/imenu.el
+++ b/lisp/imenu.el
@@ -107,7 +107,7 @@ This variable is buffer-local."
 
 (defvar imenu-always-use-completion-buffer-p nil)
 (make-obsolete-variable 'imenu-always-use-completion-buffer-p
-                        'imenu-use-popup-menu "21.4")
+                        'imenu-use-popup-menu "22.1")
 
 (defcustom imenu-use-popup-menu
   (if imenu-always-use-completion-buffer-p
@@ -126,7 +126,7 @@ If `on-mouse' use a popup menu when `imenu' was invoked with the mouse."
   "If non-nil, eagerly popup the completion buffer."
   :type 'boolean
   :group 'imenu
-  :version "21.4")
+  :version "22.1")
 
 (defcustom imenu-after-jump-hook nil
   "*Hooks called after jumping to a place in the buffer.
diff --git a/lisp/info.el b/lisp/info.el
index 4fcbdeb6330..e6f85d19fe1 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -98,7 +98,7 @@ The Lisp code is executed when the node is selected.")
 
 (defcustom Info-fontify-visited-nodes t
   "*Non-nil means to fontify visited nodes in a different face."
-  :version "21.4"
+  :version "22.1"
   :type 'boolean
   :group 'info)
 
@@ -169,7 +169,7 @@ that you visit a subnode before getting to the end of the menu.
 Setting this option to nil results in behavior similar to the stand-alone
 Info reader program, which visits the first subnode from the menu only
 when you hit the end of the current node."
-  :version "21.4"
+  :version "22.1"
   :type 'boolean
   :group 'info)
 
@@ -177,7 +177,7 @@ when you hit the end of the current node."
   "*If non-nil, hide the tag and section reference in *note and * menu items.
 If value is non-nil but not `hide', also replaces the \"*note\" with \"see\".
 If value is non-nil but not t or `hide', the reference section is still shown."
-  :version "21.4"
+  :version "22.1"
   :type '(choice (const :tag "No hiding" nil)
                  (const :tag "Replace tag and hide reference" t)
                  (const :tag "Hide tag and reference" hide)
@@ -188,7 +188,7 @@ If value is non-nil but not t or `hide', the reference section is still shown."
   "*If non-nil, attempt to refill paragraphs with hidden references.
 This refilling may accidentally remove explicit line breaks in the info
 file, so be prepared for a few surprises if you enable this feature."
-  :version "21.4"
+  :version "22.1"
   :type 'boolean
   :group 'info)
 
diff --git a/lisp/international/latin1-disp.el b/lisp/international/latin1-disp.el
index 132f11d485b..86f5bf7a726 100644
--- a/lisp/international/latin1-disp.el
+++ b/lisp/international/latin1-disp.el
@@ -156,7 +156,7 @@ input sequences."
 (defcustom latin1-display-face 'default
   "Face to use for displaying substituted ASCII sequences."
   :type 'face
-  :version "21.4"
+  :version "22.1"
   :group 'latin1-display)
 
 (defun latin1-display-char (char display &optional alt-display)
@@ -225,7 +225,7 @@ character set: `latin-2', `hebrew' etc."
 
 ;; Backwards compatibility.
 (defalias 'latin1-char-displayable-p 'char-displayable-p)
-(make-obsolete 'latin1-char-displayable-p 'char-displayable-p "21.4")
+(make-obsolete 'latin1-char-displayable-p 'char-displayable-p "22.1")
 
 (defun latin1-display-setup (set &optional force)
   "Set up Latin-1 display for characters in the given SET.
diff --git a/lisp/international/mule-util.el b/lisp/international/mule-util.el
index 682b850c2d8..513fd28bb91 100644
--- a/lisp/international/mule-util.el
+++ b/lisp/international/mule-util.el
@@ -61,7 +61,7 @@ TYPE should be `list' or `vector'."
 ;;;###autoload
 (make-obsolete 'string-to-sequence
                "use `string-to-list' or `string-to-vector'."
-               "21.4")
+               "22.1")
 
 ;;;###autoload
 (defsubst string-to-list (string)
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index fe16d07fe17..5ba6f1d69e4 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -1268,7 +1268,7 @@ use either \\[customize] or \\[set-keyboard-coding-system]."
          (if (or value (boundp 'encoded-kbd-mode))
              (set-keyboard-coding-system value)
            (set-default 'keyboard-coding-system nil))) ; must initialize
-  :version "21.4"
+  :version "22.1"
   :group 'keyboard
   :group 'mule)
 
@@ -1912,7 +1912,7 @@ Part of the job of this function is setting `buffer-undo-list' appropriately."
           ;; Otherwise, if we can recognize the undo elt for the insertion,
           ;; remove it and get ready to replace it later.
           ;; In the mean time, turn off undo recording.
-          (let ((last (car-safe buffer-undo-list))) 
+          (let ((last (car-safe buffer-undo-list)))
             (if (and (consp last) (eql (car last) from) (eql (cdr last) to))
                 (setq undo-list-saved (cdr buffer-undo-list)
                       buffer-undo-list t))))
diff --git a/lisp/international/utf-8.el b/lisp/international/utf-8.el
index 2fa096300d2..863bb22ef0a 100644
--- a/lisp/international/utf-8.el
+++ b/lisp/international/utf-8.el
@@ -186,7 +186,7 @@ Setting this variable outside customize has no effect."
                        ucs-mule-to-mule-unicode)
              (define-translation-table 'utf-translation-table-for-encode)))
          (set-default s v))
-  :version "21.4"
+  :version "22.1"
   :type 'boolean
   :group 'mule)
 
@@ -218,7 +218,7 @@ The value nil means that the tables are not yet loaded.")
                           (setq x (- x #x100))
                           (make-char 'mule-unicode-0100-24ff
                                      (+ (/ x 96) 32) (+ (% x 96) 32)))
-                         ((< x #x3400) 
+                         ((< x #x3400)
                           (setq x (- x #x2500))
                           (make-char 'mule-unicode-2500-33ff
                                      (+ (/ x 96) 32) (+ (% x 96) 32)))
@@ -254,8 +254,8 @@ The value nil means that the tables are not yet loaded.")
                              to #x33FF))))
             (if (<= from to)
                 (setq ranges (cons (cons from to) ranges))))
-          (mapconcat #'(lambda (x) 
-                         (format "%c-%c" 
+          (mapconcat #'(lambda (x)
+                         (format "%c-%c"
                                  (funcall decode-char-no-trans (car x))
                                  (funcall decode-char-no-trans (cdr x))))
                      ranges "")))
@@ -271,7 +271,7 @@ The value nil means that the tables are not yet loaded.")
 Setting this variable directly does not take effect;
 use either \\[customize] or the function
 `utf-translate-cjk-set-unicode-range'."
-  :version "21.4"
+  :version "22.1"
   :type '(repeat (cons integer integer))
   :set (lambda (symbol value)
          (utf-translate-cjk-set-unicode-range value))
@@ -378,7 +378,7 @@ characters and want to avoid some overhead on encoding/decoding
 by the above coding systems, you can customize the user option
 `utf-translate-cjk-mode' to nil."
   :init-value t
-  :version "21.4"
+  :version "22.1"
   :type 'boolean
   :group 'mule
   :global t
@@ -941,7 +941,7 @@ Move point to the end of the sequence."
 (defcustom utf-8-compose-scripts nil
   "*Non-nil means compose various scripts on decoding utf-8 text."
   :group 'mule
-  :version "21.4"
+  :version "22.1"
   :type 'boolean)
 
 (defun utf-8-post-read-conversion (length)
diff --git a/lisp/kmacro.el b/lisp/kmacro.el
index 3f4ff73177f..c6a97bb3d34 100644
--- a/lisp/kmacro.el
+++ b/lisp/kmacro.el
@@ -120,7 +120,7 @@
   "Simplified keyboard macro user interface."
   :group 'keyboard
   :group 'convenience
-  :version "21.4"
+  :version "22.1"
   :link '(emacs-commentary-link :tag "Commentary" "kmacro.el")
   :link '(emacs-library-link :tag "Lisp File" "kmacro.el"))
 
diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index f7cd4e41d74..5223193a2e4 100644
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@ -3054,7 +3054,7 @@ The frame setup of the calendar.
 The choices are: `one-frame' (calendar and diary together in one separate,
 dedicated frame); `two-frames' (calendar and diary in separate, dedicated
 frames); `calendar-only' (calendar in a separate, dedicated frame); with
-any other value the current frame is used.  Using any of the first 
+any other value the current frame is used.  Using any of the first
 three options overrides the value of `view-diary-entries-initially'.")
 
 (custom-autoload (quote calendar-setup) "calendar")
@@ -10526,7 +10526,7 @@ next enabled. Depends upon the caller to determine whether group deletion is sup
 ;;;;;;  "gnus-delay" "gnus/gnus-delay.el" (16775 26712))
 ;;; Generated autoloads from gnus/gnus-delay.el
 
-(defgroup gnus-delay nil "Arrange for sending postings later." :version "21.4" :group (quote gnus))
+(defgroup gnus-delay nil "Arrange for sending postings later." :version "22.1" :group (quote gnus))
 
 (autoload (quote gnus-delay-article) "gnus-delay" "\
 Delay this article by some time.
@@ -12935,7 +12935,7 @@ The main features of this mode are
    \\i         IF statement template
    \\elif      IF-ELSE statement template
    \\b         BEGIN
-   
+
    For a full list, use \\[idlwave-list-abbrevs].  Some templates also
    have direct keybindings - see the list of keybindings below.
 
@@ -13620,7 +13620,7 @@ for more information.
 ;;; Generated autoloads from language/ind-util.el
 
 (autoload (quote indian-compose-region) "ind-util" "\
-Compose the region according to `composition-function-table'. 
+Compose the region according to `composition-function-table'.
 
 \(fn FROM TO)" t nil)
 
@@ -16361,7 +16361,7 @@ Not documented
 
 (autoload (quote malayalam-composition-function) "mlm-util" "\
 Compose Malayalam characters in REGION, or STRING if specified.
-Assume that the REGION or STRING must fully match the composable 
+Assume that the REGION or STRING must fully match the composable
 PATTERN regexp.
 
 \(fn FROM TO PATTERN &optional STRING)" nil nil)
@@ -16800,7 +16800,7 @@ TYPE should be `list' or `vector'.
 
 \(fn STRING TYPE)" nil nil)
 
-(make-obsolete (quote string-to-sequence) "use `string-to-list' or `string-to-vector'." "21.4")
+(make-obsolete (quote string-to-sequence) "use `string-to-list' or `string-to-vector'." "22.1")
 
 (defsubst string-to-list (string) "\
 Return a list of characters in STRING." (append string nil))
@@ -17521,7 +17521,7 @@ The Custom feature is intended to make this obsolete.
 ;;; Generated autoloads from textmodes/org.el
 
 (autoload (quote org-mode) "org" "\
-Outline-based notes management and organizer, alias 
+Outline-based notes management and organizer, alias
 \"Carstens outline-mode for keeping track of everything.\"
 
 Org-mode develops organizational tasks around a NOTES file which
@@ -25188,7 +25188,7 @@ Not documented
 
 (autoload (quote tamil-composition-function) "tml-util" "\
 Compose Tamil characters in REGION, or STRING if specified.
-Assume that the REGION or STRING must fully match the composable 
+Assume that the REGION or STRING must fully match the composable
 PATTERN regexp.
 
 \(fn FROM TO PATTERN &optional STRING)" nil nil)
diff --git a/lisp/locate.el b/lisp/locate.el
index 3a18d77f089..42463a160fa 100644
--- a/lisp/locate.el
+++ b/lisp/locate.el
@@ -157,7 +157,7 @@
 This should contain the \"-l\" switch, but not the \"-F\" or \"-b\" switches."
   :type 'string
   :group 'locate
-  :version "21.4")
+  :version "22.1")
 
 (defcustom locate-update-command "updatedb"
   "The command used to update the locate database."
diff --git a/lisp/log-edit.el b/lisp/log-edit.el
index e2d3762ff77..1fa48b65aee 100644
--- a/lisp/log-edit.el
+++ b/lisp/log-edit.el
@@ -281,19 +281,19 @@ automatically."
 
 ;; Compatibility with old names.
 (defvaralias 'vc-comment-ring 'log-edit-comment-ring)
-(make-obsolete-variable 'vc-comment-ring 'log-edit-comment-ring "21.4")
+(make-obsolete-variable 'vc-comment-ring 'log-edit-comment-ring "22.1")
 (defvaralias 'vc-comment-ring-index 'log-edit-comment-ring-index)
-(make-obsolete-variable 'vc-comment-ring-index 'log-edit-comment-ring-index "21.4")
+(make-obsolete-variable 'vc-comment-ring-index 'log-edit-comment-ring-index "22.1")
 (defalias 'vc-previous-comment 'log-edit-previous-comment)
-(make-obsolete 'vc-previous-comment 'log-edit-previous-comment "21.4")
+(make-obsolete 'vc-previous-comment 'log-edit-previous-comment "22.1")
 (defalias 'vc-next-comment 'log-edit-next-comment)
-(make-obsolete 'vc-next-comment 'log-edit-next-comment "21.4")
+(make-obsolete 'vc-next-comment 'log-edit-next-comment "22.1")
 (defalias 'vc-comment-search-reverse 'log-edit-comment-search-backward)
-(make-obsolete 'vc-comment-search-reverse 'log-edit-comment-search-backward "21.4")
+(make-obsolete 'vc-comment-search-reverse 'log-edit-comment-search-backward "22.1")
 (defalias 'vc-comment-search-forward 'log-edit-comment-search-forward)
-(make-obsolete 'vc-comment-search-forward 'log-edit-comment-search-forward "21.4")
+(make-obsolete 'vc-comment-search-forward 'log-edit-comment-search-forward "22.1")
 (defalias 'vc-comment-to-change-log 'log-edit-comment-to-change-log)
-(make-obsolete 'vc-comment-to-change-log 'log-edit-comment-to-change-log "21.4")
+(make-obsolete 'vc-comment-to-change-log 'log-edit-comment-to-change-log "22.1")
 
 ;;;
 ;;; Actual code
diff --git a/lisp/mail/footnote.el b/lisp/mail/footnote.el
index b5ec6f02260..d85ca45bf19 100644
--- a/lisp/mail/footnote.el
+++ b/lisp/mail/footnote.el
@@ -89,7 +89,7 @@ If nil, no blank line will be inserted."
 
 (defcustom footnote-section-tag "Footnotes: "
   "*Tag inserted at beginning of footnote section."
-  :version "21.4"
+  :version "22.1"
   :type 'string
   :group 'footnote)
 
diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el
index b7521ad8e91..2291ed454bf 100644
--- a/lisp/mail/mail-extr.el
+++ b/lisp/mail/mail-extr.el
@@ -231,7 +231,7 @@ we will assume that \"John Q. Smith\" is the fellow's name."
 If true, then when we see an address like \"Idiot <dumb@stupid.com>\"
 we will act as though we couldn't find a full name in the address."
   :type 'boolean
-  :version "21.4"
+  :version "22.1"
   :group 'mail-extr)
 
 (defcustom mail-extr-ignore-realname-equals-mailbox-name t
@@ -1411,7 +1411,7 @@ consing a string.)"
                     (setq names-match-flag nil))
                 (setq i (1+ i)))
               (delete-region (+ (point-min) buffer-length) (point-max))
-              (and names-match-flag 
+              (and names-match-flag
                            mail-extr-ignore-realname-equals-mailbox-name
                            (narrow-to-region (point) (point)))))
 
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index a2b6a693ab9..15a42dc585a 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -117,7 +117,7 @@
                  (const :tag "Not Required" nil))
   :set-after '(rmail-pop-password)
   :set #'(lambda (symbol value)
-           (set-default symbol 
+           (set-default symbol
                         (if (and (not value)
                                  (boundp 'rmail-pop-password)
                                  rmail-pop-password)
@@ -125,14 +125,14 @@
                           value))
            (setq rmail-pop-password nil))
   :group 'rmail-retrieve
-  :version "21.3.50.1")
+  :version "22.1")
 
 (defcustom rmail-remote-password-required nil
   "*Non-nil if a password is required when reading mail from a remote server."
   :type 'boolean
   :set-after '(rmail-pop-password-required)
   :set #'(lambda (symbol value)
-           (set-default symbol 
+           (set-default symbol
                         (if (and (not value)
                                  (boundp 'rmail-pop-password-required)
                                  rmail-pop-password-required)
@@ -140,7 +140,7 @@
                           value))
            (setq rmail-pop-password-required nil))
   :group 'rmail-retrieve
-  :version "21.3.50.1")
+  :version "22.1")
 
 (defcustom rmail-movemail-flags nil
   "*List of flags to pass to movemail.
@@ -1621,7 +1621,7 @@ supplied as a separate argument to `movemail' or nil otherwise, GOT-PASSWORD
 is non-nil if the user has supplied the password interactively.
 "
   (if (string-match "^\\([^:]+\\)://\\(\\([^:@]+\\)\\(:\\([^@]+\\)\\)?@\\)?.*" file)
-      (let (got-password supplied-password 
+      (let (got-password supplied-password
             (proto (match-string 1 file))
             (user  (match-string 3 file))
             (pass  (match-string 5 file))
@@ -1632,7 +1632,7 @@ is non-nil if the user has supplied the password interactively.
               (setq got-password (not (rmail-have-password)))
               (setq supplied-password (rmail-get-remote-password
                                        (string-equal proto "imap")))))
-                              
+
         (if (rmail-movemail-variant-p 'emacs)
             (if (string-equal proto "pop")
                 (list (concat "po:" user ":" host)
@@ -1671,7 +1671,7 @@ is non-nil if the user has supplied the password interactively.
                     ;; Generate name to move to from inbox name,
                     ;; in case of multiple inboxes that need moving.
                     (concat ".newmail-"
-                            (file-name-nondirectory 
+                            (file-name-nondirectory
                              (if (memq system-type '(windows-nt cygwin))
                                  ;; cannot have "po:" in file name
                                  (substring file 3)
@@ -1777,14 +1777,14 @@ is non-nil if the user has supplied the password interactively.
                      (goto-char (point-min))
                      (when (looking-at "[A-Z][A-Z0-9_]*:")
                        (delete-region (point-min) (match-end 0))))
-                   
+
                    (message "movemail: %s"
                             (buffer-substring (point-min)
                                               (point-max)))
-                       
+
                    (sit-for 3)
                    nil)))))
-               
+
       ;; At this point, TOFILE contains the name to read:
       ;; Either the alternate name (if we renamed)
       ;; or the actual inbox (if not renaming).
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index d5a85741371..8cf30f295df 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -282,7 +282,7 @@ Value of `default-directory' for mail buffers.
 This directory is used for auto-save files of mail buffers."
   :type '(directory :tag "Directory")
   :group 'sendmail
-  :version "21.4")
+  :version "22.1")
 
 (defvar mail-reply-action nil)
 (defvar mail-send-actions nil
@@ -324,7 +324,7 @@ support Delivery Status Notification."
   :type '(repeat (radio (const :tag "Failure" failure)
                         (const :tag "Delay" delay)
                         (const :tag "Success" success)))
-  :version "21.4")
+  :version "22.1")
 
 ;; Note: could use /usr/ucb/mail instead of sendmail;
 ;; options -t, and -v if not interactive.
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 7e6d4746e8d..605af6cdbe7 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -170,7 +170,7 @@ looks like `user@realm'."
                        (string  :tag "Username")
                        (choice (const :tag "Query when needed" nil)
                                        (string  :tag "Password")))))
-  :version "21.4"
+  :version "22.1"
   :group 'smtpmail)
 
 (defcustom smtpmail-starttls-credentials '(("" 25 "" ""))
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 7d94b678ca2..96c1b85f98b 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -46,7 +46,7 @@
 (defcustom mouse-drag-copy-region t
   "*If non-nil, mouse drag copies region to kill-ring."
   :type 'boolean
-  :version "21.4"
+  :version "22.1"
   :group 'mouse)
 
 (defcustom mouse-1-click-follows-link 350
@@ -75,7 +75,7 @@ Note that dragging the mouse never follows the link.
 This feature only works in modes that specifically identify
 clickable text as links, so it may not work with some external
 packages.  See `mouse-on-link-p' for details."
-  :version "21.4"
+  :version "22.1"
   :type '(choice (const :tag "Disabled" nil)
                  (const :tag "Double click" double)
                  (number :tag "Single click time limit" :value 350)
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index 16a4826b8ae..8b4ed89e7b0 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -1004,7 +1004,7 @@ or nil meaning don't change it."
   :type '(repeat (cons regexp (choice (const :tag "On" "on")
                                       (const :tag "Off" "off")
                                       (const :tag "Don't change" nil))))
-  :version "21.4")
+  :version "22.1")
 
 ;;;; ------------------------------------------------------------
 ;;;; Hash table support.
diff --git a/lisp/net/tls.el b/lisp/net/tls.el
index 1b58760c17c..fd747387100 100644
--- a/lisp/net/tls.el
+++ b/lisp/net/tls.el
@@ -67,21 +67,21 @@ after successful negotiation."
 
 (defcustom tls-process-connection-type nil
   "*Value for `process-connection-type' to use when starting TLS process."
-  :version "21.4"
+  :version "22.1"
   :type 'boolean
   :group 'tls)
 
 (defcustom tls-success "- Handshake was completed"
   "*Regular expression indicating completed TLS handshakes.
 The default is what GNUTLS's \"gnutls-cli\" outputs."
-  :version "21.4"
+  :version "22.1"
   :type 'regexp
   :group 'tls)
 
 (defcustom tls-certtool-program (executable-find "certtool")
   "Name of  GnuTLS certtool.
 Used by `tls-certificate-information'."
-  :version "21.4"
+  :version "22.1"
   :type '(repeat string)
   :group 'tls)
 
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el
index 6fa0433a574..55ab9e693f1 100644
--- a/lisp/net/tramp-smb.el
+++ b/lisp/net/tramp-smb.el
@@ -340,11 +340,11 @@ KEEP-DATE is not handled in case NEWNAME resides on an SMB server."
   (mapcar
    (lambda (x)
      ;; We cannot call `file-attributes' for backward compatibility reasons.
-     ;; Its optional parameter ID-FORMAT is introduced with Emacs 21.4.
+     ;; Its optional parameter ID-FORMAT is introduced with Emacs 22.1.
      (cons x (tramp-smb-handle-file-attributes
         (if full x (concat (file-name-as-directory directory) x)) id-format)))
    (directory-files directory full match nosort)))
- 
+
 (defun tramp-smb-handle-file-attributes (filename &optional id-format)
   "Like `file-attributes' for tramp files."
 ;  (with-parsed-tramp-file-name filename nil
@@ -500,7 +500,7 @@ WILDCARD and FULL-DIRECTORY-P are not handled."
              (entries (tramp-smb-get-file-entries user host share file)))
 
         ;; Delete dummy "" entry, useless entries
-        (setq entries 
+        (setq entries
               (if (file-directory-p filename)
                   (delq (assoc "" entries) entries)
                 ;; We just need the only and only entry FILENAME.
diff --git a/lisp/net/tramp-util.el b/lisp/net/tramp-util.el
index 1cd7f14dcd6..8f195fe4ad8 100644
--- a/lisp/net/tramp-util.el
+++ b/lisp/net/tramp-util.el
@@ -34,7 +34,7 @@
 
 ;; Define a Tramp minor mode. It's intention is to redefine some keys for Tramp
 ;; specific functions, like compilation.
-;; The key remapping works since Emacs 21.4 only. Unknown for XEmacs.
+;; The key remapping works since Emacs 22.1 only. Unknown for XEmacs.
 
 (when (fboundp 'define-minor-mode)
 
@@ -59,7 +59,7 @@ If remapping functionality for keymaps is defined, this happens for all
 bindings.  Otherwise, only bindings active during invocation are taken
 into account.  XEmacs menubar bindings are not changed by this."
     (if (functionp 'command-remapping)
-        ;; Emacs 21.4
+        ;; Emacs 22.1
         (eval
          `(define-key tramp-minor-mode-map [remap ,old-command] new-command))
       ;; previous Emacs 21 versions.
diff --git a/lisp/net/tramp-vc.el b/lisp/net/tramp-vc.el
index c2a9ae737df..7c75b0f01c9 100644
--- a/lisp/net/tramp-vc.el
+++ b/lisp/net/tramp-vc.el
@@ -51,7 +51,7 @@
 ;; This used to blow away the file-name-handler-alist and reinstall
 ;; TRAMP into it. This was intended to let VC work remotely. It didn't,
 ;; at least not in my XEmacs 21.2 install.
-;; 
+;;
 ;; In any case, tramp-run-real-handler now deals correctly with disabling
 ;; the things that should be, making this a no-op.
 ;;
@@ -96,7 +96,7 @@ See `vc-do-command' for more information."
         (set (make-local-variable 'vc-parent-buffer-name)
              (concat " from " (buffer-name camefrom)))
         (setq default-directory olddir)
-    
+
         (erase-buffer)
 
         (mapcar
@@ -230,7 +230,7 @@ Since TRAMP doesn't do async commands yet, this function doesn't, either."
         (if (or (and (stringp file)     (tramp-tramp-file-p file))
                 (and (buffer-file-name) (tramp-tramp-file-p (buffer-file-name))))
             (setq ad-return-value
-                  (apply 'tramp-vc-do-command-new buffer okstatus command 
+                  (apply 'tramp-vc-do-command-new buffer okstatus command
                          file ;(or file (buffer-file-name))
                          flags))
           ad-do-it)))
@@ -243,7 +243,7 @@ Since TRAMP doesn't do async commands yet, this function doesn't, either."
       (if (or (and (stringp file)     (tramp-tramp-file-p file))
               (and (buffer-file-name) (tramp-tramp-file-p (buffer-file-name))))
           (setq ad-return-value
-                (apply 'tramp-vc-do-command buffer okstatus command 
+                (apply 'tramp-vc-do-command buffer okstatus command
                        (or file (buffer-file-name)) last flags))
         ad-do-it)))))
 ;;-)
@@ -298,7 +298,7 @@ Since TRAMP doesn't do async commands yet, this function doesn't, either."
             (tramp-wait-for-output)
             (setq exec-status (read (current-buffer)))
             (message "Command %s returned status %d." command exec-status)))
-      
+
         ;; Maybe okstatus can be `async' here.  But then, maybe the
         ;; async thing is new in Emacs 21, but this function is only
         ;; used in Emacs 20.
@@ -319,7 +319,7 @@ Since TRAMP doesn't do async commands yet, this function doesn't, either."
     (if (or (and (stringp file)     (tramp-tramp-file-p file))
             (and (buffer-file-name) (tramp-tramp-file-p (buffer-file-name))))
         (setq ad-return-value
-              (apply 'tramp-vc-simple-command okstatus command 
+              (apply 'tramp-vc-simple-command okstatus command
                      (or file (buffer-file-name)) args))
       ad-do-it)))
 
@@ -381,17 +381,17 @@ Since TRAMP doesn't do async commands yet, this function doesn't, either."
 
 
 ;; Do we need to advise the vc-user-login-name function anyway?
-;; This will return the correct login name for the owner of a 
+;; This will return the correct login name for the owner of a
 ;; file. It does not deal with the default remote user name...
 ;;
-;; That is, when vc calls (vc-user-login-name), we return the 
+;; That is, when vc calls (vc-user-login-name), we return the
 ;; local login name, something that may be different to the remote
-;; default. 
+;; default.
 ;;
 ;; The remote VC operations will occur as the user that we logged
 ;; in with however - not always the same as the local user.
 ;;
-;; In the end, I did advise the function. This is because, well, 
+;; In the end, I did advise the function. This is because, well,
 ;; the thing didn't work right otherwise ;)
 ;;
 ;; Daniel Pittman <daniel@danann.net>
@@ -409,7 +409,7 @@ filename we are thinking about..."
   ;; boundness-checking into this function?
   (let* ((file (symbol-value 'file))
          (remote-uid
-          ;; With Emacs 21.4, `file-attributes' has got an optional parameter
+          ;; With Emacs 22.1, `file-attributes' has got an optional parameter
           ;; ID-FORMAT. Handle this case backwards compatible.
           (if (and (functionp 'subr-arity)
                    (= 2 (cdr (funcall (symbol-function 'subr-arity)
@@ -444,11 +444,11 @@ filename we are thinking about..."
                      (tramp-handle-vc-user-login-name uid)))) ; get the owner name
         ad-do-it)))                     ; else call the original
 
-  
+
 ;; Determine the name of the user owning a file.
 (defun tramp-file-owner (filename)
   "Return who owns FILE (user name, as a string)."
-  (let ((v (tramp-dissect-file-name 
+  (let ((v (tramp-dissect-file-name
             (expand-file-name filename))))
     (if (not (file-exists-p filename))
         nil                             ; file cannot be opened
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 90bc30744c7..583b5fa2afe 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -34,7 +34,7 @@
 ;;
 ;; Notes:
 ;; -----
-;; 
+;;
 ;; This package only works for Emacs 20 and higher, and for XEmacs 21
 ;; and higher.  (XEmacs 20 is missing the `with-timeout' macro.  Emacs
 ;; 19 is reported to have other problems.  For XEmacs 21, you need the
@@ -160,7 +160,7 @@ Nil means to use a separate filename syntax for Tramp.")
 (defgroup tramp nil
   "Edit remote files with a combination of rsh and rcp or similar programs."
   :group 'files
-  :version "21.4")
+  :version "22.1")
 
 (defcustom tramp-verbose 9
   "*Verbosity level for tramp.el.  0 means be silent, 10 is most verbose."
@@ -205,7 +205,7 @@ file name, the backup directory is prepended with Tramp file name prefix
 
 gives the same backup policy for Tramp files on their hosts like the
 policy for local files."
-      :type '(repeat 
+      :type '(repeat
               (list (regexp :tag "File regexp")
                     (string :tag "Backup Dir")
                     (set :inline t
@@ -506,7 +506,7 @@ This variable defaults to the value of `tramp-encoding-shell'."
               (tramp-copy-args            nil)
               (tramp-copy-keep-date-arg   "-p")
               (tramp-password-end-of-line "xy")) ;see docstring for "xy"
-     ("fcp"   
+     ("fcp"
               (tramp-connection-function  tramp-open-connection-rsh)
               (tramp-login-program        "fsh")
               (tramp-copy-program         "fcp")
@@ -633,7 +633,7 @@ variable `tramp-methods'."
     ("rsh"    tramp-multi-connect-rlogin "rsh %h -l %u%n")
     ("remsh"  tramp-multi-connect-rlogin "remsh %h -l %u%n")
     ("ssh"    tramp-multi-connect-rlogin "ssh %h -l %u%n")
-    ("ssht"   tramp-multi-connect-rlogin "ssh %h -e none -t -t -l %u%n")     
+    ("ssht"   tramp-multi-connect-rlogin "ssh %h -e none -t -t -l %u%n")
     ("su"     tramp-multi-connect-su     "su - %u%n")
     ("sudo"   tramp-multi-connect-su     "sudo -u %u -s -p Password:%n"))
   "*List of connection functions for multi-hop methods.
@@ -777,7 +777,7 @@ the info pages.")
       "sudo" tramp-completion-function-alist-su)
      (tramp-set-completion-function
       "multi" nil)
-     (tramp-set-completion-function 
+     (tramp-set-completion-function
       "scpx" tramp-completion-function-alist-ssh)
      (tramp-set-completion-function
       "sshx" tramp-completion-function-alist-ssh)
@@ -2064,7 +2064,7 @@ target of the symlink differ."
         (setq filename (tramp-file-name-localname
                         (tramp-dissect-file-name
                          (expand-file-name filename)))))
-    
+
       ;; Right, they are on the same host, regardless of user, method, etc.
       ;; We now make the link on the remote machine. This will occur as the user
       ;; that FILENAME belongs to.
@@ -2073,7 +2073,7 @@ target of the symlink differ."
         l-multi-method l-method l-user l-host
         (format "cd %s && %s -sf %s %s"
                 cwd ln
-                filename 
+                filename
                 l-localname)
         t)))))
 
@@ -2419,7 +2419,7 @@ of."
           (let* ((attr (file-attributes f))
                  (modtime (nth 5 attr))
                  (mt (visited-file-modtime)))
-            
+
             (cond
              ;; file exists, and has a known modtime.
              ((and attr (not (equal modtime '(0 0))))
@@ -2766,7 +2766,7 @@ if the remote host can't provide the modtime."
             (push (buffer-substring (point)
                                     (tramp-line-end-position))
                   result))
-        
+
           (tramp-send-command multi-method method user host "cd")
           (tramp-wait-for-output)
 
@@ -3211,7 +3211,7 @@ This is like `dired-recursive-delete-directory' for tramp files."
          'file-error
          (list "Removing old file name" "no such directory" filename)))
     ;; Which is better, -r or -R? (-r works for me <daniel@danann.net>)
-    (tramp-send-command multi-method method user host 
+    (tramp-send-command multi-method method user host
                         (format "rm -r %s" (tramp-shell-quote-argument localname)))
     ;; Wait for the remote system to return to us...
     ;; This might take a while, allow it plenty of time.
@@ -3219,7 +3219,7 @@ This is like `dired-recursive-delete-directory' for tramp files."
     ;; Make sure that it worked...
     (and (file-exists-p filename)
          (error "Failed to recursively delete %s" filename))))
-         
+
 (defun tramp-handle-dired-call-process (program discard &rest arguments)
   "Like `dired-call-process' for tramp files."
   (with-parsed-tramp-file-name default-directory nil
@@ -3241,7 +3241,7 @@ This is like `dired-recursive-delete-directory' for tramp files."
           (tramp-send-command-and-check multi-method method user host nil)
         (tramp-send-command multi-method method user host "cd")
         (tramp-wait-for-output)))))
-         
+
 (defun tramp-handle-dired-compress-file (file &rest ok-flag)
   "Like `dired-compress-file' for tramp files."
   ;; OK-FLAG is valid for XEmacs only, but not implemented.
@@ -3501,7 +3501,7 @@ Used in `tramp-handle-shell-command'")
 This will break if COMMAND prints a newline, followed by the value of
 `tramp-end-of-output', followed by another newline."
   ;; Asynchronous processes are far from being perfect.  But it works at least
-  ;; for `find-grep-dired' and `find-name-dired' in Emacs 21.4.
+  ;; for `find-grep-dired' and `find-name-dired' in Emacs 22.1.
   (if (tramp-tramp-file-p default-directory)
       (with-parsed-tramp-file-name default-directory nil
         (let ((asynchronous (string-match "[ \t]*&[ \t]*\\'" command))
@@ -3609,7 +3609,7 @@ This will break if COMMAND prints a newline, followed by the value of
   (when (and (numberp buffer) (zerop buffer))
     (error "Implementation does not handle immediate return"))
   (when (consp buffer) (error "Implementation does not handle error files"))
-  (shell-command 
+  (shell-command
    (mapconcat 'tramp-shell-quote-argument
               (cons program args)
               " ")
@@ -4213,7 +4213,7 @@ Falls back to normal file name handler if no tramp file name handler exists."
 
 (defun tramp-repair-jka-compr ()
   "If jka-compr is already loaded, move it to the front of
-`file-name-handler-alist'.  On Emacs 21.4 or so this will not be
+`file-name-handler-alist'.  On Emacs 22.1 or so this will not be
 necessary anymore."
   (let ((jka (rassoc 'jka-compr-handler file-name-handler-alist)))
     (when jka
@@ -4293,7 +4293,7 @@ necessary anymore."
 ;; `tramp-completion-file-name-regexp-unified' aren't different.
 ;; If nil, `tramp-completion-run-real-handler' is called (i.e. forwarding to
 ;; `tramp-file-name-handler'). Otherwise, it takes `tramp-run-real-handler'.
-;; Using `last-input-event' is a little bit risky, because completing a file 
+;; Using `last-input-event' is a little bit risky, because completing a file
 ;; might require loading other files, like "~/.netrc", and for them it
 ;; shouldn't be decided based on that variable. On the other hand, those files
 ;; shouldn't have partial tramp file name syntax. Maybe another variable should
@@ -4397,7 +4397,7 @@ necessary anymore."
                                (funcall (nth 0 x) (nth 1 x)))))
                (tramp-get-completion-function m))
 
-              (setq result (append result 
+              (setq result (append result
                 (mapcar
                  (lambda (x)
                    (tramp-get-completion-user-host
@@ -4438,7 +4438,7 @@ necessary anymore."
 ;; [nil nil "x" nil nil]
 ;; [nil "x" nil nil nil]
 
-;; "/x:"                    "/x:y"                   "/x:y:"                  
+;; "/x:"                    "/x:y"                   "/x:y:"
 ;; [nil nil nil "x" ""]     [nil nil nil "x" "y"]    [nil "x" nil "y" ""]
 ;;       "/[x/"                   "/[x/y"
 ;; [nil "x" nil "" nil]     [nil "x" nil "y" nil]
@@ -4907,7 +4907,7 @@ TIME is an Emacs internal time value as returned by `current-time'."
                         "touch" nil (current-buffer) nil "-t" touch-time file))
               (pop-to-buffer (current-buffer))
               (error "tramp-touch: touch failed"))))))
- 
+
 (defun tramp-buffer-name (multi-method method user host)
   "A name for the connection buffer for USER at HOST using METHOD."
   (if multi-method
@@ -5072,7 +5072,7 @@ file exists and nonzero exit status otherwise."
                   (file-exists-p existing)
                   (not (file-exists-p nonexisting))))
       (error "Couldn't find command to check if file exists."))))
-    
+
 
 ;; CCC test ksh or bash found for tilde expansion?
 (defun tramp-find-shell (multi-method method user host)
@@ -5171,9 +5171,9 @@ Returns nil if none was found, else the command is returned."
    (tramp-check-ls-commands multi-method method user host "gnuls" tramp-remote-path)
    (tramp-check-ls-commands multi-method method user host "gls" tramp-remote-path)))
 
-;; ------------------------------------------------------------ 
-;; -- Functions for establishing connection -- 
-;; ------------------------------------------------------------ 
+;; ------------------------------------------------------------
+;; -- Functions for establishing connection --
+;; ------------------------------------------------------------
 
 ;; The following functions are actions to be taken when seeing certain
 ;; prompts from the remote host.  See the variable
@@ -5422,7 +5422,7 @@ Maybe the different regular expressions need to be tuned.
     (when multi-method
       (error "Cannot multi-connect using telnet connection method"))
     (tramp-pre-connection multi-method method user host)
-    (tramp-message 7 "Opening connection for %s@%s using %s..." 
+    (tramp-message 7 "Opening connection for %s@%s using %s..."
                    (or user (user-login-name)) host method)
     (let ((process-environment (copy-sequence process-environment)))
       (setenv "TERM" tramp-terminal-type)
@@ -5456,7 +5456,7 @@ Maybe the different regular expressions need to be tuned.
          p multi-method method user host)
         (tramp-post-connection multi-method method user host)))))
 
-            
+
 (defun tramp-open-connection-rsh (multi-method method user host)
   "Open a connection using an rsh METHOD.
 This starts the command `rsh HOST -l USER'[*], then waits for a remote
@@ -5481,7 +5481,7 @@ arguments, and xx will be used as the host name to connect to.
       (error "Cannot multi-connect using rsh connection method"))
     (tramp-pre-connection multi-method method user host)
     (if (and user (not (string= user "")))
-        (tramp-message 7 "Opening connection for %s@%s using %s..." 
+        (tramp-message 7 "Opening connection for %s@%s using %s..."
                        user host method)
       (tramp-message 7 "Opening connection at %s using %s..." host method))
     (let ((process-environment (copy-sequence process-environment))
@@ -5510,9 +5510,9 @@ arguments, and xx will be used as the host name to connect to.
                                                   (> emacs-major-version 20))
                                        tramp-dos-coding-system))
              (p (if (and user (not (string= user "")))
-                    (apply #'start-process bufnam buf login-program  
+                    (apply #'start-process bufnam buf login-program
                            real-host "-l" user login-args)
-                  (apply #'start-process bufnam buf login-program 
+                  (apply #'start-process bufnam buf login-program
                          real-host login-args)))
              (found nil))
         (tramp-set-process-query-on-exit-flag p nil)
@@ -5582,10 +5582,10 @@ prompt than you do, so it is not at all unlikely that the variable
                                tramp-actions-before-shell)
         (tramp-open-connection-setup-interactive-shell
          p multi-method method user host)
-        (tramp-post-connection multi-method method 
+        (tramp-post-connection multi-method method
                                user host)))))
 
-;; HHH: Not Changed.  Multi method.  It is not clear to me how this can 
+;; HHH: Not Changed.  Multi method.  It is not clear to me how this can
 ;;      handle not giving a user name in the "file name".
 ;;
 ;;      This is more difficult than for the single-hop method.  In the
@@ -5655,7 +5655,7 @@ log in as u2 to h2."
         (tramp-post-connection multi-method method user host)))))
 
 ;; HHH: Changed.  Multi method.  Don't know how to handle this in the case
-;;      of no user name provided.  Hack to make it work as it did before:  
+;;      of no user name provided.  Hack to make it work as it did before:
 ;;      changed `user' to `(or user (user-login-name))' in the places where
 ;;      the value is actually used.
 (defun tramp-multi-connect-telnet (p method user host command)
@@ -5677,8 +5677,8 @@ If USER is nil, uses the return value of (user-login-name) instead."
     (tramp-process-multi-actions p method user host
                                  tramp-multi-actions)))
 
-;; HHH: Changed.  Multi method.  Don't know how to handle this in the case 
-;;      of no user name provided.  Hack to make it work as it did before:  
+;; HHH: Changed.  Multi method.  Don't know how to handle this in the case
+;;      of no user name provided.  Hack to make it work as it did before:
 ;;      changed `user' to `(or user (user-login-name))' in the places where
 ;;      the value is actually used.
 (defun tramp-multi-connect-rlogin (p method user host command)
@@ -5703,8 +5703,8 @@ If USER is nil, uses the return value of (user-login-name) instead."
     (tramp-process-multi-actions p method user host
                                  tramp-multi-actions)))
 
-;; HHH: Changed.  Multi method.  Don't know how to handle this in the case 
-;;      of no user name provided.  Hack to make it work as it did before:  
+;; HHH: Changed.  Multi method.  Don't know how to handle this in the case
+;;      of no user name provided.  Hack to make it work as it did before:
 ;;      changed `user' to `(or user (user-login-name))' in the places where
 ;;      the value is actually used.
 (defun tramp-multi-connect-su (p method user host command)
@@ -6334,7 +6334,7 @@ Sends COMMAND, then waits 30 seconds for shell prompt."
   (tramp-barf-if-no-shell-prompt
    nil 30
    "Couldn't `%s', see buffer `%s'" command (buffer-name)))
-  
+
 (defun tramp-wait-for-output (&optional timeout)
   "Wait for output from remote rsh command."
   (let ((proc (get-buffer-process (current-buffer)))
@@ -6667,9 +6667,9 @@ Not actually used.  Use `(format \"%o\" i)' instead?"
    ""))
 
 
-;; ------------------------------------------------------------ 
-;; -- TRAMP file names -- 
-;; ------------------------------------------------------------ 
+;; ------------------------------------------------------------
+;; -- TRAMP file names --
+;; ------------------------------------------------------------
 ;; Conversion functions between external representation and
 ;; internal data structure.  Convenience functions for internal
 ;; data structure.
@@ -6680,7 +6680,7 @@ Not actually used.  Use `(format \"%o\" i)' instead?"
   "Return t iff NAME is a tramp file."
   (save-match-data
     (string-match tramp-file-name-regexp name)))
- 
+
 ;; HHH: Changed.  Used to assign the return value of (user-login-name)
 ;;      to the `user' part of the structure if a user name was not
 ;;      provided, now it assigns nil.
@@ -6733,7 +6733,7 @@ This is MULTI-METHOD, if non-nil.  Otherwise, it is METHOD, if non-nil.
 If both MULTI-METHOD and METHOD are nil, do a lookup in
 `tramp-default-method-alist'."
   (or multi-method method (tramp-find-default-method user host)))
-    
+
 ;; HHH: Not Changed.  Multi method.  Will probably not handle the case where
 ;;      a user name is not provided in the "file name" very well.
 (defun tramp-dissect-multi-file-name (name)
@@ -6905,7 +6905,7 @@ as default."
     (if entry
         (second entry)
       (symbol-value param))))
-      
+
 
 ;; Auto saving to a special directory.
 
@@ -6937,7 +6937,7 @@ as default."
             (tramp-make-auto-save-file-name (buffer-file-name)))
     ad-do-it))
 
-;; In Emacs < 21.4 and XEmacs < 21.5 autosaved remote files have
+;; In Emacs < 22.1 and XEmacs < 21.5 autosaved remote files have
 ;; permission 666 minus umask. This is a security threat.
 
 (defun tramp-set-auto-save-file-modes ()
@@ -7097,9 +7097,9 @@ exiting if process is running."
              process flag)))
 
 
-;; ------------------------------------------------------------ 
-;; -- Kludges section -- 
-;; ------------------------------------------------------------ 
+;; ------------------------------------------------------------
+;; -- Kludges section --
+;; ------------------------------------------------------------
 
 ;; Currently (as of Emacs 20.5), the function `shell-quote-argument'
 ;; does not deal well with newline characters.  Newline is replaced by
@@ -7362,7 +7362,7 @@ report.
 ;;   strange when doing zerop, we should kill the process and start
 ;;   again.  (Greg Stark)
 ;; * Add caching for filename completion.  (Greg Stark)
-;;   Of course, this has issues with usability (stale cache bites) 
+;;   Of course, this has issues with usability (stale cache bites)
 ;;      -- <daniel@danann.net>
 ;; * Provide a local cache of old versions of remote files for the rsync
 ;;   transfer method to use.  (Greg Stark)
diff --git a/lisp/novice.el b/lisp/novice.el
index b2a0bec0204..e9db95bd619 100644
--- a/lisp/novice.el
+++ b/lisp/novice.el
@@ -44,7 +44,7 @@ If nil, the feature is disabled, i.e., all commands work normally.")
 (defvaralias 'disabled-command-hook 'disabled-command-function)
 (make-obsolete-variable
  'disabled-command-hook
- 'disabled-command-function "21.4")
+ 'disabled-command-function "22.1")
 
 ;;;###autoload
 (defun disabled-command-function (&rest ignore)
diff --git a/lisp/progmodes/asm-mode.el b/lisp/progmodes/asm-mode.el
index 17cb7c78316..968dc1a9e23 100644
--- a/lisp/progmodes/asm-mode.el
+++ b/lisp/progmodes/asm-mode.el
@@ -186,7 +186,7 @@ Special commands:
       (delete-horizontal-space)
       (tab-to-tab-stop))))
 
-;; Obsolete since Emacs-21.4.
+;; Obsolete since Emacs-22.1.
 (defalias 'asm-newline 'newline-and-indent)
 
 (defun asm-comment ()
diff --git a/lisp/progmodes/cfengine.el b/lisp/progmodes/cfengine.el
index 3f6c24c85c6..a9e86de44aa 100644
--- a/lisp/progmodes/cfengine.el
+++ b/lisp/progmodes/cfengine.el
@@ -175,7 +175,7 @@ Intended as the value of `indent-line-function'."
     (if (> (- (point-max) pos) (point))
         (goto-char (- (point-max) pos)))))
 
-;; This doesn't work too well in Emacs 21.2.  See 21.4 development
+;; This doesn't work too well in Emacs 21.2.  See 22.1 development
 ;; code.
 (defun cfengine-fill-paragraph (&optional justify)
   "Fill `paragraphs' in Cfengine code."
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 7b401da794e..79a6b4b43be 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -459,7 +459,7 @@ starting the compilation process.")
     (t (:weight bold)))
   "Face used to highlight compiler warnings."
   :group 'font-lock-highlighting-faces
-  :version "21.4")
+  :version "22.1")
 
 (defface compilation-info-face
   '((((class color) (min-colors 16) (background light))
@@ -470,7 +470,7 @@ starting the compilation process.")
     (t (:weight bold)))
   "Face used to highlight compiler warnings."
   :group 'font-lock-highlighting-faces
-  :version "21.4")
+  :version "22.1")
 
 (defvar compilation-message-face nil
   "Face name to use for whole messages.
@@ -1133,7 +1133,7 @@ info, are considered errors."
                  (const :tag "Info" 1)
                  (const :tag "None" 0))
   :group 'compilation
-  :version "21.4")
+  :version "22.1")
 
 (defcustom compilation-skip-visited nil
   "*Compilation motion commands skip visited messages if this is t.
@@ -1142,7 +1142,7 @@ to from the current content in the current compilation buffer, even if it was
 from a different message."
   :type 'boolean
   :group 'compilation
-  :version "21.4")
+  :version "22.1")
 
 ;;;###autoload
 (defun compilation-mode (&optional name-of-mode)
@@ -1557,7 +1557,7 @@ region and the first line of the next region."
 If nil, don't scroll the compilation output window."
   :type '(choice integer (const :tag "No window scrolling" nil))
   :group 'compilation
-  :version "21.4")
+  :version "22.1")
 
 (defsubst compilation-set-window (w mk)
   "Align the compilation output window W with marker MK near top."
diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el
index 3ded7758b90..768012c736c 100644
--- a/lisp/progmodes/fortran.el
+++ b/lisp/progmodes/fortran.el
@@ -147,7 +147,7 @@ You might want to change this to \"*\", for instance."
   "*Regexp to match a directive line.
 The matching text will be fontified with `font-lock-keyword-face'.
 The matching line will be given zero indentation."
-  :version "21.4"
+  :version "22.1"
   :type    'regexp
   :group   'fortran-indent)
 
@@ -952,7 +952,7 @@ Auto-indent does not happen if a numeric ARG is used."
                         fortran-minimum-statement-indent-tab
                       fortran-minimum-statement-indent-fixed) (current-column))
                  ;; In col 8 with a single tab to the left.
-                 (eq ?\t (char-after (line-beginning-position))) 
+                 (eq ?\t (char-after (line-beginning-position)))
                  (not (or (eq last-command 'fortran-indent-line)
                           (eq last-command
                               'fortran-indent-new-line))))
diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index bdcce671a9c..66740773165 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -59,7 +59,7 @@
 ;;    of 'info registers'.
 ;; 3) Use tree-widget.el instead of the speedbar for watch-expressions?
 ;; 4) Mark breakpoint locations on scroll-bar of source buffer?
-;; 5) After release of 21.4 use '-var-list-children --all-values'
+;; 5) After release of 22.1 use '-var-list-children --all-values'
 ;;    and '-stack-list-locals 2' which need GDB 6.1 onwards.
 
 ;;; Code:
@@ -183,13 +183,13 @@ detailed description of this mode.
   "Non-nil means record the process input and output in `gdb-debug-log'."
   :type 'boolean
   :group 'gud
-  :version "21.4")
+  :version "22.1")
 
 (defcustom gdb-use-inferior-io-buffer nil
   "Non-nil means display output from the inferior in a separate buffer."
   :type 'boolean
   :group 'gud
-  :version "21.4")
+  :version "22.1")
 
 (defun gdb-ann3 ()
   (setq gdb-debug-log nil)
@@ -268,7 +268,7 @@ detailed description of this mode.
   "If non-nil use FUN::VAR format to display variables in the speedbar." ;
   :type 'boolean
   :group 'gud
-  :version "21.4")
+  :version "22.1")
 
 (defun gud-watch ()
   "Watch expression at point."
@@ -441,7 +441,7 @@ detailed description of this mode.
 The highlighting is done with `font-lock-warning-face'."
   :type 'boolean
   :group 'gud
-  :version "21.4")
+  :version "22.1")
 
 (defun gdb-speedbar-expand-node (text token indent)
   "Expand the node the user clicked on.
@@ -491,7 +491,7 @@ The key should be one of the cars in `gdb-buffer-rules-assoc'."
              (name (funcall (gdb-rules-name-maker rules)))
              (new (get-buffer-create name)))
         (with-current-buffer new
-          (let ((trigger))        
+          (let ((trigger))
             (if (cdr (cdr rules))
                 (setq trigger (funcall (car (cdr (cdr rules))))))
             (set (make-local-variable 'gdb-buffer-type) key)
@@ -691,7 +691,7 @@ This filter may simply queue input for a later time."
   "Default command to execute an executable under the GDB-UI debugger."
   :type 'string
   :group 'gud
-  :version "21.4")
+  :version "22.1")
 
 (defvar gdb-annotation-rules
   '(("pre-prompt" gdb-pre-prompt)
@@ -789,7 +789,7 @@ not GDB."
         (setq gud-running t)
         (if gdb-use-inferior-io-buffer
             (setq gdb-output-sink 'inferior))))
-     (t 
+     (t
       (gdb-resync)
       (error "Unexpected `starting' annotation")))))
 
@@ -1205,7 +1205,7 @@ static char *magick[] = {
         (with-selected-window (posn-window posn)
           (save-excursion
             (goto-char (posn-point posn))
-            (if 
+            (if
 ;               (or
                  (posn-object posn)
 ;                (eq (car (fringe-bitmaps-at-pos (posn-point posn)))
@@ -1544,7 +1544,7 @@ static char *magick[] = {
   "Number of data items in memory window."
   :type 'integer
   :group 'gud
-  :version "21.4")
+  :version "22.1")
 
 (defcustom gdb-memory-format "x"
   "Display format of data items in memory window."
@@ -1554,7 +1554,7 @@ static char *magick[] = {
                  (const :tag "Octal" "o")
                  (const :tag "Binary" "t"))
   :group 'gud
-  :version "21.4")
+  :version "22.1")
 
 (defcustom gdb-memory-unit "w"
   "Unit size of data items in memory window."
@@ -1563,7 +1563,7 @@ static char *magick[] = {
                  (const :tag "Word" "w")
                  (const :tag "Giant word" "g"))
   :group 'gud
-  :version "21.4")
+  :version "22.1")
 
 (gdb-set-buffer-rules 'gdb-memory-buffer
                       'gdb-memory-buffer-name
@@ -1753,7 +1753,7 @@ corresponding to the mode line clicked."
   (use-local-map gdb-memory-mode-map)
   (setq header-line-format
         '(:eval
-          (concat 
+          (concat
            "Read address: "
            (propertize gdb-memory-address
                        'face font-lock-warning-face
@@ -1957,7 +1957,7 @@ corresponding to the mode line clicked."
   "Nil means don't display source file containing the main routine."
   :type 'boolean
   :group 'gud
-  :version "21.4")
+  :version "22.1")
 
 (defun gdb-set-window-buffer (name)
   (set-window-buffer (selected-window) (get-buffer name))
@@ -2001,7 +2001,7 @@ of the inferior.  Non-nil means display the layout shown for
 `gdba'."
   :type 'boolean
   :group 'gud
-  :version "21.4")
+  :version "22.1")
 
 (defun gdb-many-windows (arg)
   "Toggle the number of windows in the basic arrangement."
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index ac052a893b2..ab705212397 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -44,7 +44,7 @@
   "*Number of lines in a grep window.  If nil, use `compilation-window-height'."
   :type '(choice (const :tag "Default" nil)
                  integer)
-  :version "21.4"
+  :version "22.1"
   :group 'grep)
 
 (defcustom grep-auto-highlight t
@@ -61,7 +61,7 @@ will be parsed and highlighted as soon as you try to move to them."
   :type '(choice (const :tag "All" t)
                  (const :tag "None" nil)
                  (integer :tag "First N lines"))
-  :version "21.4"
+  :version "22.1"
   :group 'grep)
 
 (defcustom grep-highlight-matches 'auto-detect
@@ -81,7 +81,7 @@ call that function before using this variable in your program."
   :type '(choice (const :tag "Do not highlight matches with grep markers" nil)
                  (const :tag "Highlight matches with grep markers" t)
                  (other :tag "Not Set" auto-detect))
-  :version "21.4"
+  :version "22.1"
   :group 'grep)
 
 (defcustom grep-scroll-output nil
@@ -91,7 +91,7 @@ Setting it causes the grep commands to put point at the end of their
 output window so that the end of the output is always visible rather
 than the begining."
   :type 'boolean
-  :version "21.4"
+  :version "22.1"
   :group 'grep)
 
 ;;;###autoload
@@ -141,7 +141,7 @@ The following place holders should be present in the string:
  <R> - the regular expression searched for."
   :type '(choice string
                  (const :tag "Not Set" nil))
-  :version "21.4"
+  :version "22.1"
   :group 'grep)
 
 (defcustom grep-tree-files-aliases '(
@@ -172,7 +172,7 @@ The following place holders should be present in the string:
 See `compilation-error-screen-columns'"
   :type '(choice (const :tag "Default" nil)
                  integer)
-  :version "21.4"
+  :version "22.1"
   :group 'grep)
 
 ;;;###autoload
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index f73ccdda9eb..745bc57a9b0 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -72,7 +72,7 @@
 (defgroup python nil
   "Silly walks in the Python language"
   :group 'languages
-  :version "21.4"
+  :version "22.1"
   :link '(emacs-commentary-link "python"))
 
 ;;;###autoload
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index 0e0d89b07e1..902cd920ead 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -617,7 +617,7 @@ The program can also specify a TCP connection.  See `make-comint'."
   ;; -w is the linesize
   "*List of additional options for `sql-ms-program'."
   :type '(repeat string)
-  :version "21.4"
+  :version "22.1"
   :group 'SQL)
 
 ;; Customization for Postgres
diff --git a/lisp/recentf.el b/lisp/recentf.el
index 2fee8e637a8..169fee99529 100644
--- a/lisp/recentf.el
+++ b/lisp/recentf.el
@@ -192,7 +192,7 @@ elements (see `recentf-make-menu-element' for menu element form)."
   'recentf-menu-append-commands-flag)
 (make-obsolete-variable 'recentf-menu-append-commands-p
                         'recentf-menu-append-commands-flag
-                        "21.4")
+                        "22.1")
 
 (defcustom recentf-keep-non-readable-files-flag nil
   "*non-nil means to keep non readable files in the recent list."
@@ -203,7 +203,7 @@ elements (see `recentf-make-menu-element' for menu element form)."
   'recentf-keep-non-readable-files-flag)
 (make-obsolete-variable 'recentf-keep-non-readable-files-p
                         'recentf-keep-non-readable-files-flag
-                        "21.4")
+                        "22.1")
 
 (defcustom recentf-auto-cleanup 'mode
   "*Define when to automatically cleanup the recent list.
@@ -740,7 +740,7 @@ Arrange them in sub-menus following rules in `recentf-arrange-rules'."
                 elts  (cdr elts)))
         (unless menu
           (push elt others)))
-      
+
       (setq l nil
             min (if (natnump recentf-arrange-by-rules-min-items)
                     recentf-arrange-by-rules-min-items 0))
@@ -755,7 +755,7 @@ Arrange them in sub-menus following rules in `recentf-arrange-rules'."
              menu (recentf-apply-menu-filter
                    recentf-arrange-by-rule-subfilter (nreverse elts)))
             (push menu l))))
-      
+
       (if (and (stringp recentf-arrange-by-rule-others) others)
           (nreverse
            (cons
diff --git a/lisp/replace.el b/lisp/replace.el
index 82b2a993fdb..42480b656d6 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -62,7 +62,7 @@ strings or patterns."
   "*Non-nil means `query-replace' and friends ignore read-only matches."
   :type 'boolean
   :group 'matching
-  :version "21.4")
+  :version "22.1")
 
 (defcustom query-replace-highlight t
   "*Non-nil means to highlight matches during query replacement."
@@ -77,13 +77,13 @@ is highlighted lazily using isearch lazy highlighting (see
   :type 'boolean
   :group 'lazy-highlight
   :group 'matching
-  :version "21.4")
+  :version "22.1")
 
 (defface query-replace
   '((t (:inherit isearch)))
   "Face for highlighting query replacement matches."
   :group 'matching
-  :version "21.4")
+  :version "22.1")
 
 (defun query-replace-descr (string)
   (mapconcat 'isearch-text-char-description string ""))
@@ -789,7 +789,7 @@ Compatibility function for \\[next-error] invocations."
     (t :background "gray"))
   "Face used to highlight matches permanently."
   :group 'matching
-  :version "21.4")
+  :version "22.1")
 
 (defcustom list-matching-lines-default-context-lines 0
   "*Default number of context lines included around `list-matching-lines' matches.
diff --git a/lisp/ruler-mode.el b/lisp/ruler-mode.el
index e6861cc486c..928b5baabec 100644
--- a/lisp/ruler-mode.el
+++ b/lisp/ruler-mode.el
@@ -116,7 +116,7 @@
 
 (defgroup ruler-mode nil
   "Display a ruler in the header line."
-  :version "21.4"
+  :version "22.1"
   :group 'convenience)
 
 (defcustom ruler-mode-show-tab-stops nil
diff --git a/lisp/server.el b/lisp/server.el
index 2c946b90275..a0f41e59ff8 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -123,7 +123,7 @@ If it is a frame, use the frame's selected window.
 It is not meaningful to set this to a specific frame or window with Custom.
 Only programs can do so."
   :group 'server
-  :version "21.4"
+  :version "22.1"
   :type '(choice (const :tag "Use selected window"
                         :match (lambda (widget value)
                                  (not (functionp value)))
@@ -282,7 +282,7 @@ Server mode runs a process that accepts commands from the
 `emacsclient' program.  See `server-start' and Info node `Emacs server'."
   :global t
   :group 'server
-  :version "21.4"
+  :version "22.1"
   ;; Fixme: Should this check for an existing server socket and do
   ;; nothing if there is one (for multiple Emacs sessions)?
   (server-start (not server-mode)))
diff --git a/lisp/simple.el b/lisp/simple.el
index e6b445f9ec7..03a91fb4db0 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -71,13 +71,13 @@
 (defgroup next-error nil
   "next-error support framework."
   :group 'compilation
-  :version "21.4")
+  :version "22.1")
 
 (defface next-error
   '((t (:inherit region)))
   "Face used to highlight next error locus."
   :group 'next-error
-  :version "21.4")
+  :version "22.1")
 
 (defcustom next-error-highlight 0.1
   "*Highlighting of locations in selected source buffers.
@@ -90,7 +90,7 @@ If `fringe-arrow', indicate the locus by the fringe arrow."
                  (const :tag "No highlighting" nil)
                  (const :tag "Fringe arrow" 'fringe-arrow))
   :group 'next-error
-  :version "21.4")
+  :version "22.1")
 
 (defcustom next-error-highlight-no-select 0.1
   "*Highlighting of locations in non-selected source buffers.
@@ -103,7 +103,7 @@ If `fringe-arrow', indicate the locus by the fringe arrow."
                  (const :tag "No highlighting" nil)
                  (const :tag "Fringe arrow" 'fringe-arrow))
   :group 'next-error
-  :version "21.4")
+  :version "22.1")
 
 (defvar next-error-last-buffer nil
   "The most recent next-error buffer.
@@ -1540,7 +1540,7 @@ leak memory.  So you should make sure that you do not wait
 excessively long before answering the question."
   :type 'boolean
   :group 'undo
-  :version "21.4")
+  :version "22.1")
 
 (defvar undo-extra-outer-limit nil
   "If non-nil, an extra level of size that's ok in an undo item.
@@ -2461,7 +2461,7 @@ The value should be a list of text properties to discard or t,
 which means to discard all text properties."
   :type '(choice (const :tag "All" t) (repeat symbol))
   :group 'killing
-  :version "21.4")
+  :version "22.1")
 
 (defvar yank-window-start nil)
 (defvar yank-undo-function nil
@@ -5094,7 +5094,7 @@ Various Emacs features that update auxiliary information when point moves
 wait this many seconds after Emacs becomes idle before doing an update."
   :type 'number
   :group 'display
-  :version "21.4")
+  :version "22.1")
 
 (defvar vis-mode-saved-buffer-invisibility-spec nil
   "Saved value of `buffer-invisibility-spec' when Visible mode is on.")
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index a8f74de0b11..ecb213d52fd 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -711,7 +711,7 @@ incurs extra I/O, hence it slows down directory display
 proportionally to the number of subdirs."
   :group 'speedbar
   :type 'boolean
-  :version 21.4)
+  :version 22.1)
 
 (defun speedbar-add-supported-extension (extension)
   "Add EXTENSION as a new supported extension for speedbar tagging.
diff --git a/lisp/subr.el b/lisp/subr.el
index f338e47ea56..3d1a7203dd0 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -810,9 +810,9 @@ Like the function `insert' except that any argument that is a number
 is converted into a string by expressing it in decimal."
   (dolist (el args)
     (insert (if (integerp el) (number-to-string el) el))))
-(make-obsolete 'insert-string 'insert "21.4")
+(make-obsolete 'insert-string 'insert "22.1")
 (defun makehash (&optional test) (make-hash-table :test (or test 'eql)))
-(make-obsolete 'makehash 'make-hash-table "21.4")
+(make-obsolete 'makehash 'make-hash-table "22.1")
 
 ;; Some programs still use this as a function.
 (defun baud-rate ()
@@ -837,9 +837,9 @@ is converted into a string by expressing it in decimal."
   "use timers instead, with `run-with-idle-timer'." "before 19.34")
 
 (defvaralias 'x-lost-selection-hooks 'x-lost-selection-functions)
-(make-obsolete-variable 'x-lost-selection-hooks 'x-lost-selection-functions "21.4")
+(make-obsolete-variable 'x-lost-selection-hooks 'x-lost-selection-functions "22.1")
 (defvaralias 'x-sent-selection-hooks 'x-sent-selection-functions)
-(make-obsolete-variable 'x-sent-selection-hooks 'x-sent-selection-functions "21.4")
+(make-obsolete-variable 'x-sent-selection-hooks 'x-sent-selection-functions "22.1")
 
 (defvaralias 'messages-buffer-max-lines 'message-log-max)
 
@@ -1156,7 +1156,7 @@ Optional args SENTINEL and FILTER specify the sentinel and filter
 
 (make-obsolete 'process-kill-without-query
                "use `process-query-on-exit-flag' or `set-process-query-on-exit-flag'."
-               "21.4")
+               "22.1")
 (defun process-kill-without-query (process &optional flag)
   "Say no query needed if PROCESS is running when Emacs is exited.
 Optional second argument if non-nil says to require a query.
diff --git a/lisp/textmodes/conf-mode.el b/lisp/textmodes/conf-mode.el
index 59ffbb29a4c..3b8687ce670 100644
--- a/lisp/textmodes/conf-mode.el
+++ b/lisp/textmodes/conf-mode.el
@@ -36,7 +36,7 @@
 (defgroup conf nil
   "Configuration files."
   :group 'data
-  :version "21.4")
+  :version "22.1")
 
 (defcustom conf-assignment-column 24
   "Align assignments to this column by default with \\[conf-align-assignments].
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index 9e18dbc0651..694903b1fb6 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -352,7 +352,7 @@ If this variable is customized, the custom value is used always.
 Otherwise, it is set to be buffer-local when the file has
  a DOCTYPE or an XML declaration."
   :type 'boolean
-  :version "21.4"
+  :version "22.1"
   :group 'sgml)
 
 (defvar sgml-empty-tags nil
@@ -1215,7 +1215,7 @@ not the case, the first tag returned is the one inside which we are."
                   (if (cdr tmp) (setcdr tmp (cddr tmp)))))
             (message "Unmatched tags <%s> and </%s>"
                      (sgml-tag-name tag-info) (pop stack)))))
-        
+
         (if (and (null stack) (sgml-unclosed-tag-p (sgml-tag-name tag-info)))
             ;; This is a top-level open of an implicitly closed tag, so any
             ;; occurrence of such an open tag at the same level can be ignored
diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el
index f064dd4dee0..2c685753f1f 100644
--- a/lisp/textmodes/table.el
+++ b/lisp/textmodes/table.el
@@ -646,7 +646,7 @@ See `table-insert' for examples about how to use."
   :group 'wp
   :group 'paragraphs
   :group 'fill
-  :version "21.4")
+  :version "22.1")
 
 (defgroup table-hooks nil
   "Hooks for table manipulation utilities"
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index ce34138d5fb..4b878f4f240 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -127,7 +127,7 @@ and the input file name, with no separating space and are not shell-quoted.
 If nil, TeX runs with no options.  See the documentation of `tex-command'."
   :type 'string
   :group 'tex-run
-  :version "21.4")
+  :version "22.1")
 
 ;;;###autoload
 (defcustom tex-start-commands "\\nonstopmode\\input"
@@ -139,7 +139,7 @@ If nil, no commands are used.  See the documentation of `tex-command'."
                        "\\nonstopmode\\input")
                 (string :tag "String at your choice"))
   :group 'tex-run
-  :version "21.4")
+  :version "22.1")
 
 (defvar latex-standard-block-names
   '("abstract"          "array"         "center"        "description"
@@ -199,7 +199,7 @@ use."
 (defcustom tex-dvi-view-command
   '(cond
     ((eq window-system 'x) "xdvi")
-    ((eq window-system 'w32) "yap") 
+    ((eq window-system 'w32) "yap")
     (t "dvi2tty * | cat -s"))
   "*Command used by \\[tex-view] to display a `.dvi' file.
 If it is a string, that specifies the command directly.
@@ -1776,7 +1776,7 @@ FILE is typically the output DVI or PDF file."
            (when (file-newer-than-file-p f file)
              (setq uptodate nil)))))
      uptodate)))
-    
+
 
 (autoload 'format-spec "format-spec")
 
diff --git a/lisp/thumbs.el b/lisp/thumbs.el
index b6a68df33c4..5ceb4f2c148 100644
--- a/lisp/thumbs.el
+++ b/lisp/thumbs.el
@@ -21,7 +21,7 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
-;;              
+;;
 ;; Thanks: Alex Schroeder <alex@gnu.org> for maintaining the package at some time
 ;;         The peoples at #emacs@freenode.net for numerous help
 ;;         RMS for emacs and the GNU project.
@@ -62,7 +62,7 @@
 
 (defgroup thumbs nil
   "Thumbnails previewer."
-  :version "21.4"
+  :version "22.1"
   :group 'multimedia)
 
 (defcustom thumbs-thumbsdir
diff --git a/lisp/time.el b/lisp/time.el
index ebc883b3d8e..850843402ca 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -131,7 +131,7 @@ background colour is the background of this face.  Set this to
 make the mail indicator stand out on a colour display."
   :group 'faces
   :group 'display-time
-  :version "21.4"
+  :version "22.1"
   :type '(choice (const :tag "None" nil) face))
 
 (defvar display-time-mail-icon
@@ -153,7 +153,7 @@ of the mode line.  It is specified by `display-time-mail-icon'."
   "String to use as the mail indicator in `display-time-string-forms'.
 This can use the Unicode letter character if you can display it."
   :group 'display-time
-  :version "21.4"
+  :version "22.1"
   :type '(choice (const "Mail")
                  ;; Use :tag here because the Lucid menu won't display
                  ;; multibyte text.
diff --git a/lisp/tree-widget.el b/lisp/tree-widget.el
index 54323e41dd3..2a20e708729 100644
--- a/lisp/tree-widget.el
+++ b/lisp/tree-widget.el
@@ -112,7 +112,7 @@
 ;;
 (defgroup tree-widget nil
   "Customization support for the Tree Widget Library."
-  :version "21.4"
+  :version "22.1"
   :group 'widgets)
 
 (defcustom tree-widget-image-enable
diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el
index e4073db4271..c3e17365242 100644
--- a/lisp/url/url-vars.el
+++ b/lisp/url/url-vars.el
@@ -30,7 +30,7 @@
 
 (defgroup url nil
   "Uniform Resource Locator tool"
-  :version "21.4"
+  :version "22.1"
   :group 'hypermedia)
 
 (defgroup url-file nil
diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el
index 2bca3fb90b1..ec24282702b 100644
--- a/lisp/vc-cvs.el
+++ b/lisp/vc-cvs.el
@@ -42,7 +42,7 @@
                  (repeat :tag "Argument List"
                          :value ("")
                          string))
-  :version "21.4"
+  :version "22.1"
   :group 'vc)
 
 (defcustom vc-cvs-register-switches nil
@@ -106,7 +106,7 @@ by these regular expressions."
 Format is according to `format-time-string'.  Only used if
 `vc-cvs-sticky-tag-display' is t."
   :type '(string)
-  :version "21.4"
+  :version "22.1"
   :group 'vc)
 
 (defcustom vc-cvs-sticky-tag-display t
@@ -145,7 +145,7 @@ displayed.  Date and time is displayed for sticky dates.
 
 See also variable `vc-cvs-sticky-date-format-string'."
   :type '(choice boolean function)
-  :version "21.4"
+  :version "22.1"
   :group 'vc)
 
 ;;;
@@ -548,7 +548,7 @@ The changes are between FIRST-VERSION and SECOND-VERSION."
                (append (vc-switches nil 'diff) '("/dev/null")))
         ;; Even if it's empty, it's locally modified.
         1)
-    (let* ((async (and (not vc-disable-async-diff) 
+    (let* ((async (and (not vc-disable-async-diff)
                        (vc-stay-local-p file)
                        (fboundp 'start-process)))
            (status (apply 'vc-cvs-command (or buffer "*vc-diff*")
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index bdff9fbe12c..81a18eadd87 100644
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -149,7 +149,7 @@ by these regular expressions."
                 (set :format "%v" :inline t (const :format "%t" :tag "don't" except))
                 (regexp :format " stay local,\n%t: %v" :tag "if it matches")
                 (repeat :format "%v%i\n" :inline t (regexp :tag "or"))))
-  :version "21.4"
+  :version "22.1"
   :group 'vc)
 
 (defun vc-stay-local-p (file)
@@ -637,7 +637,7 @@ Before doing that, check if there are any old backups and get rid of them."
                    nil 'keep-date)
       ;; It's ok if it doesn't work (e.g. directory not writable),
       ;; since this is just for efficiency.
-      (file-error 
+      (file-error
        (message
         (concat "Warning: Cannot make version backup; "
                 "diff/revert therefore not local"))))))
diff --git a/lisp/vc-mcvs.el b/lisp/vc-mcvs.el
index aca8bcd66f0..eef01f2aad5 100644
--- a/lisp/vc-mcvs.el
+++ b/lisp/vc-mcvs.el
@@ -70,7 +70,7 @@
                  (repeat :tag "Argument List"
                          :value ("")
                          string))
-  :version "21.4"
+  :version "22.1"
   :group 'vc)
 
 (defcustom vc-mcvs-register-switches nil
@@ -82,7 +82,7 @@ A string or list of strings passed to the checkin program by
                  (repeat :tag "Argument List"
                          :value ("")
                          string))
-  :version "21.4"
+  :version "22.1"
   :group 'vc)
 
 (defcustom vc-mcvs-diff-switches nil
@@ -92,13 +92,13 @@ A string or list of strings passed to the checkin program by
                  (repeat :tag "Argument List"
                          :value ("")
                          string))
-  :version "21.4"
+  :version "22.1"
   :group 'vc)
 
 (defcustom vc-mcvs-header (or (cdr (assoc 'MCVS vc-header-alist))
                               vc-cvs-header)
   "*Header keywords to be inserted by `vc-insert-headers'."
-  :version "21.4"
+  :version "22.1"
   :type '(repeat string)
   :group 'vc)
 
@@ -107,7 +107,7 @@ A string or list of strings passed to the checkin program by
 This is only meaningful if you don't use the implicit checkout model
 \(i.e. if you have $CVSREAD set)."
   :type 'boolean
-  :version "21.4"
+  :version "22.1"
   :group 'vc)
 
 ;;;
@@ -447,7 +447,7 @@ The changes are between FIRST-VERSION and SECOND-VERSION."
         ;; Even if it's empty, it's locally modified.
         1)
     (let* ((async (and (not vc-disable-async-diff)
-                       (vc-stay-local-p file) 
+                       (vc-stay-local-p file)
                        (fboundp 'start-process)))
            ;; Run the command from the root dir so that `mcvs filt' returns
            ;; valid relative names.
diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el
index f783066b39b..b6e3ac29568 100644
--- a/lisp/vc-svn.el
+++ b/lisp/vc-svn.el
@@ -51,7 +51,7 @@
                  (repeat :tag "Argument List"
                          :value ("")
                          string))
-  :version "21.4"
+  :version "22.1"
   :group 'vc)
 
 (defcustom vc-svn-register-switches nil
@@ -63,7 +63,7 @@ A string or list of strings passed to the checkin program by
                  (repeat :tag "Argument List"
                          :value ("")
                          string))
-  :version "21.4"
+  :version "22.1"
   :group 'vc)
 
 (defcustom vc-svn-diff-switches
@@ -77,12 +77,12 @@ If you want to force an empty list of arguments, use t."
                  (repeat :tag "Argument List"
                          :value ("")
                          string))
-  :version "21.4"
+  :version "22.1"
   :group 'vc)
 
 (defcustom vc-svn-header (or (cdr (assoc 'SVN vc-header-alist)) '("\$Id\$"))
   "*Header keywords to be inserted by `vc-insert-headers'."
-  :version "21.4"
+  :version "22.1"
   :type '(repeat string)
   :group 'vc)
 
@@ -92,7 +92,7 @@ If you want to force an empty list of arguments, use t."
 This is only meaningful if you don't use the implicit checkout model
 \(i.e. if you have $SVNREAD set)."
   ;; :type 'boolean
-  ;; :version "21.4"
+  ;; :version "22.1"
   ;; :group 'vc
   )
 
diff --git a/lisp/vc.el b/lisp/vc.el
index 4a26b88c0e3..2daf100ff57 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -573,7 +573,7 @@ if the local changes in the file have not been found and displayed yet."
   :type '(choice (const :tag "No" nil)
                  (const :tag "Yes" t))
   :group 'vc
-  :version "21.4")
+  :version "22.1")
 
 ;;;###autoload
 (defcustom vc-checkout-hook nil
@@ -1827,7 +1827,7 @@ actually call the backend, but performs a local diff."
 
 ;; Old def for compatibility with Emacs-21.[123].
 (defmacro vc-diff-switches-list (backend) `(vc-switches ',backend 'diff))
-(make-obsolete 'vc-diff-switches-list 'vc-switches "21.4")
+(make-obsolete 'vc-diff-switches-list 'vc-switches "22.1")
 
 (defun vc-default-diff-tree (backend dir rev1 rev2)
   "List differences for all registered files at and below DIR.
diff --git a/lisp/version.el b/lisp/version.el
index d489eeea02e..d2d45a361f7 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -27,7 +27,7 @@
 
 ;;; Code:
 
-(defconst emacs-version "21.3.50" "\
+(defconst emacs-version "22.0.50" "\
 Version numbers of this version of Emacs.")
 
 (defconst emacs-major-version
diff --git a/lisp/w32-vars.el b/lisp/w32-vars.el
index 72c4d30cc88..6a3ff36108e 100644
--- a/lisp/w32-vars.el
+++ b/lisp/w32-vars.el
@@ -30,7 +30,7 @@
 (defgroup w32 nil
   "MS-Windows specific features"
   :group 'environment
-  :version "21.4"
+  :version "22.1"
   :prefix "w32")
 
 ;; Redefine the font selection to use the standard W32 dialog
diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el
index a540c1b7af3..ef7cc1ccc73 100644
--- a/lisp/x-dnd.el
+++ b/lisp/x-dnd.el
@@ -47,7 +47,7 @@ The function shall return nil to reject the drop or a cons with two values,
 the wanted action as car and the wanted type as cdr.  The wanted action
 can be copy, move, link, ask or private.
 The default value for this variable is `x-dnd-default-test-function'."
-  :version "21.4"
+  :version "22.1"
   :type 'symbol
   :group 'x)
 
@@ -70,7 +70,7 @@ Insertion of text is not handeled by these functions, see `x-dnd-types-alist'
 for that.
 The function shall return the action done (move, copy, link or private)
 if some action was made, or nil if the URL is ignored."
-  :version "21.4"
+  :version "22.1"
   :type 'alist
   :group 'x)
 
@@ -98,13 +98,13 @@ this drop (copy, move, link, private or ask) as determined by a previous
 call to `x-dnd-test-function'.  DATA is the drop data.
 The function shall return the action used (copy, move, link or private) if drop
 is successful, nil if not."
-  :version "21.4"
+  :version "22.1"
   :type 'alist
   :group 'x)
 
 (defcustom x-dnd-open-file-other-window nil
   "If non-nil, always use find-file-other-window to open dropped files."
-  :version "21.4"
+  :version "22.1"
   :type 'boolean
   :group 'x)
 
@@ -124,7 +124,7 @@ is successful, nil if not."
     )
   "The types accepted by default for dropped data.
 The types are chosen in the order they appear in the list."
-  :version "21.4"
+  :version "22.1"
   :type '(repeat string)
   :group 'x
 )
@@ -135,10 +135,10 @@ The types are chosen in the order they appear in the list."
   "The current state for a drop.
 This is an alist with one entry for each display.  The value for each display
 is a vector that contains the state for drag and drop for that display.
-Elements in the vector are: 
+Elements in the vector are:
 Last buffer drag was in,
 last window drag was in,
-types available for drop, 
+types available for drop,
 the action suggested by the source,
 the type we want for the drop,
 the action we want for the drop,
@@ -209,7 +209,7 @@ action and type we got from `x-dnd-test-function'."
                (handler (cdr (assoc (cdr action-type) x-dnd-types-alist))))
           ;; Ignore action-type if we have no handler.
           (setq current-state
-                (x-dnd-save-state window 
+                (x-dnd-save-state window
                                   action
                                   (when handler action-type)))))))
   (let ((current-state (x-dnd-get-state-for-frame window)))
@@ -300,13 +300,13 @@ Return nil if URI is not a local file."
                  ((string-match "^file:" uri)           ; Old KDE, Motif, Sun
                   (substring uri (match-end 0))))))
     (when (and f must-exist)
-      (let* ((decoded-f (decode-coding-string 
+      (let* ((decoded-f (decode-coding-string
                          f
                          (or file-name-coding-system
                              default-file-name-coding-system)))
              (try-f (if (file-readable-p decoded-f) decoded-f f)))
         (when (file-readable-p try-f) try-f)))))
-        
+
 
 (defun x-dnd-open-local-file (uri action)
   "Open a local file.
@@ -590,7 +590,7 @@ FORMAT is 32 (not used).  MESSAGE is the data part of an XClientMessageEvent."
                         (frame-parameter frame 'outer-window-id))
                        accept ;; 1 = Accept, 0 = reject.
                        (x-dnd-get-drop-x-y frame window)
-                       (x-dnd-get-drop-width-height 
+                       (x-dnd-get-drop-width-height
                         frame window (eq accept 1))
                        (or reply-action 0)
                        )))
@@ -612,9 +612,9 @@ FORMAT is 32 (not used).  MESSAGE is the data part of an XClientMessageEvent."
 
            (setq action (if value
                             (condition-case info
-                                (x-dnd-drop-data event frame window value 
+                                (x-dnd-drop-data event frame window value
                                                  (x-dnd-current-type window))
-                              (error 
+                              (error
                                (message "Error: %s" info)
                                nil))))
 
@@ -738,7 +738,7 @@ FORMAT is 32 (not used).  MESSAGE is the data part of an XClientMessageEvent."
           ((eq message-type 'XmDRAG_MOTION)
            (let* ((state (x-dnd-get-state-for-frame frame))
                   (timestamp (x-dnd-motif-value-to-list
-                              (x-dnd-get-motif-value data 4 4 
+                              (x-dnd-get-motif-value data 4 4
                                                      source-byteorder)
                               4 my-byteorder))
                   (x (x-dnd-motif-value-to-list
@@ -757,7 +757,7 @@ FORMAT is 32 (not used).  MESSAGE is the data part of an XClientMessageEvent."
                   (reply-flags
                    (x-dnd-motif-value-to-list
                     (if reply-action
-                        (+ reply-action 
+                        (+ reply-action
                            ?\x30        ; 30:  valid drop site
                            ?\x700)      ; 700: can do copy, move or link
                       ?\x30)            ; 30:  drop site, but noop.
@@ -794,7 +794,7 @@ FORMAT is 32 (not used).  MESSAGE is the data part of an XClientMessageEvent."
                   (reply-flags
                    (x-dnd-motif-value-to-list
                     (if reply-action
-                        (+ reply-action 
+                        (+ reply-action
                            ?\x30        ; 30:  valid drop site
                            ?\x700)      ; 700: can do copy, move or link
                       ?\x30)            ; 30:  drop site, but noop
@@ -833,7 +833,7 @@ FORMAT is 32 (not used).  MESSAGE is the data part of an XClientMessageEvent."
                   (reply-flags
                    (x-dnd-motif-value-to-list
                     (if reply-action
-                        (+ reply-action 
+                        (+ reply-action
                            ?\x30        ; 30:  valid drop site
                            ?\x700)      ; 700: can do copy, move or link
                       (+ ?\x30          ; 30:  drop site, but noop.
@@ -847,7 +847,7 @@ FORMAT is 32 (not used).  MESSAGE is the data part of an XClientMessageEvent."
                           reply-flags
                           x
                           y))
-                  (timestamp (x-dnd-get-motif-value 
+                  (timestamp (x-dnd-get-motif-value
                               data 4 4 source-byteorder))
                   action)
 
@@ -857,26 +857,26 @@ FORMAT is 32 (not used).  MESSAGE is the data part of an XClientMessageEvent."
                                     "_MOTIF_DRAG_AND_DROP_MESSAGE"
                                     8
                                     reply)
-             (setq action 
+             (setq action
                    (when (and reply-action atom-name)
                      (let* ((value (x-get-selection-internal
                                     (intern atom-name)
                                     (intern (x-dnd-current-type window)))))
                        (when value
                          (condition-case info
-                             (x-dnd-drop-data event frame window value 
+                             (x-dnd-drop-data event frame window value
                                               (x-dnd-current-type window))
                            (error
                             (message "Error: %s" info)
                             nil))))))
              (x-get-selection-internal
-              (intern atom-name)          
+              (intern atom-name)
               (if action 'XmTRANSFER_SUCCESS 'XmTRANSFER_FAILURE)
               timestamp)
              (x-dnd-forget-drop frame)))
 
           (t (error "Unknown Motif DND message %s %s" message-atom data)))))
-                                           
+
 
 ;;;