changeset 59996:aac0a33f5772

Change release version from 21.4 to 22.1 throughout. Change development version from 21.3.50 to 22.0.50.
author Kim F. Storm <storm@cua.dk>
date Wed, 09 Feb 2005 15:50:47 +0000
parents 8f4938738427
children e89ca9089d07
files ChangeLog README etc/MACHINES etc/MH-E-NEWS etc/NEWS etc/PROBLEMS lisp/ChangeLog lisp/ChangeLog.10 lisp/add-log.el lisp/allout.el lisp/autorevert.el lisp/calendar/appt.el lisp/calendar/diary-lib.el lisp/comint.el lisp/cus-edit.el lisp/cus-start.el lisp/dabbrev.el lisp/descr-text.el lisp/desktop.el lisp/dired.el lisp/emacs-lisp/bytecomp.el lisp/emacs-lisp/derived.el lisp/emacs-lisp/find-func.el lisp/emacs-lisp/timer.el lisp/emacs-lisp/warnings.el lisp/emulation/cua-base.el lisp/emulation/keypad.el lisp/faces.el lisp/files.el lisp/filesets.el lisp/find-dired.el lisp/frame.el lisp/fringe.el lisp/gnus/ChangeLog lisp/gnus/ChangeLog.2 lisp/gnus/binhex.el lisp/gnus/deuglify.el lisp/gnus/flow-fill.el lisp/gnus/gnus-agent.el lisp/gnus/gnus-art.el lisp/gnus/gnus-cite.el lisp/gnus/gnus-delay.el lisp/gnus/gnus-diary.el lisp/gnus/gnus-fun.el lisp/gnus/gnus-group.el lisp/gnus/gnus-int.el lisp/gnus/gnus-msg.el lisp/gnus/gnus-registry.el lisp/gnus/gnus-score.el lisp/gnus/gnus-spec.el lisp/gnus/gnus-srvr.el lisp/gnus/gnus-start.el lisp/gnus/gnus-sum.el lisp/gnus/gnus-util.el lisp/gnus/gnus-win.el lisp/gnus/gnus.el lisp/gnus/imap.el lisp/gnus/mail-source.el lisp/gnus/message.el lisp/gnus/mm-decode.el lisp/gnus/mm-url.el lisp/gnus/mm-uu.el lisp/gnus/mml-sec.el lisp/gnus/mml.el lisp/gnus/mml2015.el lisp/gnus/nndiary.el lisp/gnus/nnimap.el lisp/gnus/nnmail.el lisp/gnus/pgg-def.el lisp/gnus/pop3.el lisp/gnus/sha1.el lisp/gnus/sieve.el lisp/gnus/smiley.el lisp/gnus/smime.el lisp/gnus/spam-stat.el lisp/gnus/spam.el lisp/gnus/starttls.el lisp/gnus/utf7.el lisp/gnus/uudecode.el lisp/help-at-pt.el lisp/hl-line.el lisp/ibuffer.el lisp/ido.el lisp/ielm.el lisp/imenu.el lisp/info.el lisp/international/latin1-disp.el lisp/international/mule-util.el lisp/international/mule.el lisp/international/utf-8.el lisp/kmacro.el lisp/ldefs-boot.el lisp/locate.el lisp/log-edit.el lisp/mail/footnote.el lisp/mail/mail-extr.el lisp/mail/rmail.el lisp/mail/sendmail.el lisp/mail/smtpmail.el lisp/mouse.el lisp/net/ange-ftp.el lisp/net/tls.el lisp/net/tramp-smb.el lisp/net/tramp-util.el lisp/net/tramp-vc.el lisp/net/tramp.el lisp/novice.el lisp/progmodes/asm-mode.el lisp/progmodes/cfengine.el lisp/progmodes/compile.el lisp/progmodes/fortran.el lisp/progmodes/gdb-ui.el lisp/progmodes/grep.el lisp/progmodes/python.el lisp/progmodes/sql.el lisp/recentf.el lisp/replace.el lisp/ruler-mode.el lisp/server.el lisp/simple.el lisp/speedbar.el lisp/subr.el lisp/textmodes/conf-mode.el lisp/textmodes/sgml-mode.el lisp/textmodes/table.el lisp/textmodes/tex-mode.el lisp/thumbs.el lisp/time.el lisp/tree-widget.el lisp/url/url-vars.el lisp/vc-cvs.el lisp/vc-hooks.el lisp/vc-mcvs.el lisp/vc-svn.el lisp/vc.el lisp/version.el lisp/w32-vars.el lisp/x-dnd.el lispref/modes.texi lispref/processes.texi lispref/text.texi man/ChangeLog man/cc-mode.texi man/custom.texi man/emacs-xtra.texi man/emacs.texi man/faq.texi man/tramp.texi
diffstat 148 files changed, 799 insertions(+), 792 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Feb 08 23:51:31 2005 +0000
+++ b/ChangeLog	Wed Feb 09 15:50:47 2005 +0000
@@ -1,3 +1,8 @@
+2005-02-09  Kim F. Storm  <storm@cua.dk>
+
+	Change release version from 21.4 to 22.1 throughout.
+	Change development version from 21.3.50 to 22.0.50.
+
 2005-01-19  Steven Tamm  <steventamm@mac.com>
 
 	* configure.in: Check for <sys/utsname.h>.
--- a/README	Tue Feb 08 23:51:31 2005 +0000
+++ b/README	Wed Feb 09 15:50:47 2005 +0000
@@ -1,4 +1,4 @@
-This directory tree holds version 21.3.50 of GNU Emacs, the extensible,
+This directory tree holds version 22.0.50 of GNU Emacs, the extensible,
 customizable, self-documenting real-time display editor.
 
 You may encounter bugs in this release.  If you do, please report
--- a/etc/MACHINES	Tue Feb 08 23:51:31 2005 +0000
+++ b/etc/MACHINES	Wed Feb 09 15:50:47 2005 +0000
@@ -651,7 +651,7 @@
 	i386-unknown-isc3.0 as your configuration name.
   Use i386-*-esix for Esix; Emacs runs as of version 19.6.
   Use i386-*-linux-gnu for GNU/Linux systems; Emacs runs as of version 19.26.
-  Use i386-*-cygwin for Cygwin; Emacs builds as of version 21.4, in both X11
+  Use i386-*-cygwin for Cygwin; Emacs builds as of version 22.1, in both X11
   and non-X11 modes.  (The Cygwin site has source and binaries for 21.2.)
   Use i386-intsys-sysv for Integrated Solutions 386 machines.
   It may also be correct for Microport systems.
--- a/etc/MH-E-NEWS	Tue Feb 08 23:51:31 2005 +0000
+++ b/etc/MH-E-NEWS	Wed Feb 09 15:50:47 2005 +0000
@@ -1,7 +1,7 @@
 * COPYRIGHT
 
 Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-	
+
 Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
 notice and this notice are preserved.
@@ -392,7 +392,7 @@
 * Changes in MH-E 7.4.4
 
 Version 7.4.4 addresses programmatic issues from the FSF and prepares
-MH-E for inclusion into an impending GNU Emacs release (21.4). There
+MH-E for inclusion into an impending GNU Emacs release (22.1). There
 are no user-visible changes (unless you are using XEmacs on DOS or
 don't have the cl package installed). Filenames are now unique in
 their first 8 characters (DOS 8.3 requirement). The runtime dependency
--- a/etc/NEWS	Tue Feb 08 23:51:31 2005 +0000
+++ b/etc/NEWS	Wed Feb 09 15:50:47 2005 +0000
@@ -15,7 +15,7 @@
 so we will look at it and add it to the manual.
 
 
-* Installation Changes in Emacs 21.4
+* Installation Changes in Emacs 22.1
 
 ** Emacs includes now support for loading image libraries on demand.
 (Currently this feature is only used on MS Windows.)  You can configure
@@ -97,7 +97,7 @@
 types any more.  Add -DUSE_LISP_UNION_TYPE if you want union types.
 
 
-* Changes in Emacs 21.4
+* Changes in Emacs 22.1
 
 ** Emacs now responds to mouse-clicks on the mode-line, header-line and
 display margin, when run in an xterm.
@@ -139,7 +139,7 @@
 more than just follow a link, so the new Mouse-1 behavior is only
 activated for modes which explicitly mark a clickable text as a "link"
 (see the new function `mouse-on-link-p' for details).  The Lisp
-packages that are included in release 21.4 have been adapted to do
+packages that are included in release 22.1 have been adapted to do
 this, but external packages may not yet support this.  However, there
 is no risk in using such packages, as the worst thing that could
 happen is that you get the original Mouse-1 behavior when you click
@@ -2232,7 +2232,7 @@
 coding system.
 
 
-* New modes and packages in Emacs 21.4
+* New modes and packages in Emacs 22.1
 
 ** The new package conf-mode.el handles thousands of configuration files, with
 varying syntaxes for comments (;, #, //, /* */ or !), assignment (var = value,
@@ -2476,7 +2476,7 @@
 ** `cfengine-mode' is a major mode for editing GNU Cfengine
 configuration files.
 
-* Incompatible Lisp Changes in Emacs 21.4
+* Incompatible Lisp Changes in Emacs 22.1
 
 +++
 ** `suppress-keymap' now works by remapping `self-insert-command' to
@@ -2489,7 +2489,7 @@
 :propertize and :eval forms in the value of a variable whose
 `risky-local-variable' property is nil.
 
-* Lisp Changes in Emacs 21.4
+* Lisp Changes in Emacs 22.1
 
 ** An element of buffer-undo-list can now have the form (FUNNAME .
 ARGS), where FUNNAME is a symbol other than t or nil.  That stands for
--- a/etc/PROBLEMS	Tue Feb 08 23:51:31 2005 +0000
+++ b/etc/PROBLEMS	Wed Feb 09 15:50:47 2005 +0000
@@ -731,7 +731,7 @@
 through the buffer, especially scrolling backwards, and also jumping
 to the end of a very large buffer.
 
-Beginning with version 21.4, a parenthesis or a brace in column zero
+Beginning with version 22.1, a parenthesis or a brace in column zero
 is highlighted in bold-red face if it is inside a string or a comment,
 to indicate that it could interfere with Font Lock (and also with
 indentation) and should be moved or escaped with a backslash.
@@ -1549,7 +1549,7 @@
 `xterm-color' might activate the color support on an xterm-compatible
 emulator.
 
-Beginning with version 21.4, Emacs supports the --color command-line
+Beginning with version 22.1, Emacs supports the --color command-line
 option which may be used to force Emacs to use one of a few popular
 modes for getting colors on a tty.  For example, --color=ansi8 sets up
 for using the ANSI-standard escape sequences that support 8 colors.
@@ -2869,7 +2869,7 @@
 
 *** HP/UX versions before 11.0
 
-HP/UX 9 was end-of-lifed in December 1998.  
+HP/UX 9 was end-of-lifed in December 1998.
 HP/UX 10 was end-of-lifed in May 1999.
 
 **** HP/UX 9: Emacs crashes with SIGBUS or SIGSEGV after you delete a frame.
@@ -2947,7 +2947,7 @@
 
 *** Irix 5 and earlier
 
-Exactly when Irix-5 end-of-lifed is obscure.  But since Irix 6.0 
+Exactly when Irix-5 end-of-lifed is obscure.  But since Irix 6.0
 shipped in 1994, it has been some years.
 
 **** Irix 5.2: unexelfsgi.c can't find cmplrs/stsupport.h.
--- a/lisp/ChangeLog	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/ChangeLog	Wed Feb 09 15:50:47 2005 +0000
@@ -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').
--- a/lisp/ChangeLog.10	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/ChangeLog.10	Wed Feb 09 15:50:47 2005 +0000
@@ -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.
--- a/lisp/add-log.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/add-log.el	Wed Feb 09 15:50:47 2005 +0000
@@ -126,7 +126,7 @@
 
 (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 @@
 		   ;; 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))
--- a/lisp/allout.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/allout.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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
 
--- a/lisp/autorevert.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/autorevert.el	Wed Feb 09 15:50:47 2005 +0000
@@ -174,7 +174,7 @@
 \(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 @@
 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.
--- a/lisp/calendar/appt.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/calendar/appt.el	Wed Feb 09 15:50:47 2005 +0000
@@ -88,7 +88,7 @@
 
 (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 @@
   :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 @@
   :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 @@
           (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
--- a/lisp/calendar/diary-lib.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/calendar/diary-lib.el	Wed Feb 09 15:50:47 2005 +0000
@@ -282,7 +282,7 @@
 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 @@
 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 @@
 (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 @@
 		:value-type (choice
 			     (string :tag "Template for entry")
 			     (function :tag "Unary function providing template")))
-  :version "21.4"
+  :version "22.1"
   :group 'diary)
 
 
--- a/lisp/comint.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/comint.el	Wed Feb 09 15:50:47 2005 +0000
@@ -194,7 +194,7 @@
 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 @@
       ;; 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
--- a/lisp/cus-edit.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/cus-edit.el	Wed Feb 09 15:50:47 2005 +0000
@@ -1183,7 +1183,7 @@
 (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
--- a/lisp/cus-start.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/cus-start.el	Wed Feb 09 15:50:47 2005 +0000
@@ -51,7 +51,7 @@
 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 @@
 				    (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 @@
 						     :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")
--- a/lisp/dabbrev.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/dabbrev.el	Wed Feb 09 15:50:47 2005 +0000
@@ -168,7 +168,7 @@
 		 (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.
--- a/lisp/descr-text.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/descr-text.el	Wed Feb 09 15:50:47 2005 +0000
@@ -225,7 +225,7 @@
 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))
 
--- a/lisp/desktop.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/desktop.el	Wed Feb 09 15:50:47 2005 +0000
@@ -130,7 +130,7 @@
     (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 @@
 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 @@
 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 @@
 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 @@
 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 @@
    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 @@
 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 @@
   (desktop-kill)
   (desktop-clear)
   (desktop-read dirname))
-  
+
 ;; ----------------------------------------------------------------------------
 ;;;###autoload
 (defun desktop-save-in-desktop-dir ()
--- a/lisp/dired.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/dired.el	Wed Feb 09 15:50:47 2005 +0000
@@ -291,7 +291,7 @@
   '((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 @@
   '((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 @@
   '((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 @@
   '((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 @@
   '((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 @@
   '((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 @@
   '((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 @@
   '((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'.")
 
--- a/lisp/emacs-lisp/bytecomp.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/emacs-lisp/bytecomp.el	Wed Feb 09 15:50:47 2005 +0000
@@ -1765,7 +1765,7 @@
 	(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.
--- a/lisp/emacs-lisp/derived.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/emacs-lisp/derived.el	Wed Feb 09 15:50:47 2005 +0000
@@ -249,7 +249,7 @@
   (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
--- a/lisp/emacs-lisp/find-func.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/emacs-lisp/find-func.el	Wed Feb 09 15:50:47 2005 +0000
@@ -96,7 +96,7 @@
 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)
--- a/lisp/emacs-lisp/timer.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/emacs-lisp/timer.el	Wed Feb 09 15:50:47 2005 +0000
@@ -151,7 +151,7 @@
   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."
--- a/lisp/emacs-lisp/warnings.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/emacs-lisp/warnings.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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 @@
 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 @@
 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 @@
 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 @@
 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
--- a/lisp/emulation/cua-base.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/emulation/cua-base.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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 @@
   (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,
--- a/lisp/emulation/keypad.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/emulation/keypad.el	Wed Feb 09 15:50:47 2005 +0000
@@ -108,7 +108,7 @@
 	     (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 @@
 	     (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 @@
 	     (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 @@
 	     (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))
--- a/lisp/faces.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/faces.el	Wed Feb 09 15:50:47 2005 +0000
@@ -1822,7 +1822,7 @@
      :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 @@
 			     (((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
--- a/lisp/files.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/files.el	Wed Feb 09 15:50:47 2005 +0000
@@ -305,7 +305,7 @@
 		 (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 @@
 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 @@
   :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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 	     (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
--- a/lisp/filesets.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/filesets.el	Wed Feb 09 15:50:47 2005 +0000
@@ -296,7 +296,7 @@
   "The fileset swapper."
   :prefix "filesets-"
   :group 'convenience
-  :version "21.4")
+  :version "22.1")
 
 (defcustom filesets-menu-name "Filesets"
   "*Filesets' menu name."
--- a/lisp/find-dired.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/find-dired.el	Wed Feb 09 15:50:47 2005 +0000
@@ -62,7 +62,7 @@
 them for `find-ls-option'."
   :type 'string
   :group 'find-dired
-  :version "21.4")
+  :version "22.1")
 
 ;;;###autoload
 (defcustom find-grep-options
--- a/lisp/frame.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/frame.el	Wed Feb 09 15:50:47 2005 +0000
@@ -135,7 +135,7 @@
 	   ;; (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 @@
 
 ;; 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 @@
 
 ;; 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.
--- a/lisp/fringe.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/fringe.el	Wed Feb 09 15:50:47 2005 +0000
@@ -37,7 +37,7 @@
 
 (defgroup fringe nil
   "Window fringes."
-  :version "21.4"
+  :version "22.1"
   :group 'frames)
 
 ;; Standard fringe bitmaps
--- a/lisp/gnus/ChangeLog	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/ChangeLog	Wed Feb 09 15:50:47 2005 +0000
@@ -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>
 
--- a/lisp/gnus/ChangeLog.2	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/ChangeLog.2	Wed Feb 09 15:50:47 2005 +0000
@@ -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.
 
--- a/lisp/gnus/binhex.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/binhex.el	Wed Feb 09 15:50:47 2005 +0000
@@ -50,7 +50,7 @@
 (defcustom binhex-use-external
   (executable-find binhex-decoder-program)
   "*Use external binhex program."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-extract
   :type 'boolean)
 
--- a/lisp/gnus/deuglify.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/deuglify.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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)
 
--- a/lisp/gnus/flow-fill.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/flow-fill.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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 @@
   "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 @@
   '(
     ;; 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 @@
 ")
 ;    ("
 ;> foo
-;> 
-;> 
+;>
+;>
 ;> bar
 ;" . "
 ;> foo bar
--- a/lisp/gnus/gnus-agent.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/gnus-agent.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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 @@
 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 @@
   "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 @@
 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 @@
 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 @@
   "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 @@
   "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 @@
 (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 @@
 (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 @@
       (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 @@
       (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 @@
     (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 @@
     (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 @@
 
 (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 @@
                    ;; 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 @@
 		  (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 @@
                       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 @@
 	  ;; 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 @@
 	      (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 @@
           ;; 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 @@
   (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 @@
         (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 @@
       (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 @@
 
 (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 @@
 
       (while (not (eobp))
         (condition-case err
-            (let (group 
+            (let (group
                   min
                   max
                   (cur (current-buffer)))
@@ -2108,7 +2108,7 @@
                          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 @@
 				   (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 @@
           (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 @@
          (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 @@
 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 @@
 
   (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 @@
 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 @@
                                              gnus-command-method))
                       (let* ((active
                               (gnus-gethash-safe expiring-group orig)))
-                                        
+
                         (when active
                           (save-excursion
                             (gnus-agent-expire-group-1
@@ -3349,9 +3349,9 @@
                 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 @@
              (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 @@
                             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 @@
                                       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 @@
 
             (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
--- a/lisp/gnus/gnus-art.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/gnus-art.el	Wed Feb 09 15:50:47 2005 +0000
@@ -213,7 +213,7 @@
 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 @@
 		   (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 @@
 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 @@
 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 @@
   "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 @@
   "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 @@
   "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 @@
   "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 @@
   "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 @@
   "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 @@
   "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 @@
   "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
   "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 @@
   "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 @@
 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 @@
 (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 @@
 			      (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 @@
 
 (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 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 @@
 (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 @@
   "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 @@
 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 @@
 (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 @@
    "\\)")
   "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 @@
 	  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 @@
 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 @@
 
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
   (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)))
--- a/lisp/gnus/gnus-cite.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/gnus-cite.el	Wed Feb 09 15:50:47 2005 +0000
@@ -124,7 +124,7 @@
 (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 @@
   "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 @@
 (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)
 
--- a/lisp/gnus/gnus-delay.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/gnus-delay.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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)
 
--- a/lisp/gnus/gnus-diary.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/gnus-diary.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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."
--- a/lisp/gnus/gnus-fun.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/gnus-fun.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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 @@
   "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)
 
--- a/lisp/gnus/gnus-group.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/gnus-group.el	Wed Feb 09 15:50:47 2005 +0000
@@ -435,7 +435,7 @@
 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 @@
 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)
--- a/lisp/gnus/gnus-int.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/gnus-int.el	Wed Feb 09 15:50:47 2005 +0000
@@ -47,7 +47,7 @@
 `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 @@
 	       (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 @@
       (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)
--- a/lisp/gnus/gnus-msg.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/gnus-msg.el	Wed Feb 09 15:50:47 2005 +0000
@@ -142,7 +142,7 @@
 
 (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 @@
 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 @@
     "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 @@
   '(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 @@
   '(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 @@
 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 @@
 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 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)
 
--- a/lisp/gnus/gnus-registry.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/gnus-registry.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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 @@
 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 @@
 				 "%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 @@
 		    (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 @@
 	     (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 @@
       (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 @@
 
 (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 @@
     ;; 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 @@
   "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 @@
 		    (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 @@
 		   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 @@
 		   (< 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 @@
 	   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 @@
     (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 @@
   (when word
     (memq nil
 	  (mapcar 'not
-		  (mapcar 
+		  (mapcar
 		   (lambda (x)
 		     (string-match x word))
 		   list)))))
@@ -540,7 +540,7 @@
 
 	  ;; 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 @@
     (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 @@
     (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 @@
 	  (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 @@
 (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 @@
 (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)
 
--- a/lisp/gnus/gnus-score.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/gnus-score.el	Wed Feb 09 15:50:47 2005 +0000
@@ -237,7 +237,7 @@
 
 (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")))
--- a/lisp/gnus/gnus-spec.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/gnus-spec.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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)
 
--- a/lisp/gnus/gnus-srvr.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/gnus-srvr.el	Wed Feb 09 15:50:47 2005 +0000
@@ -71,7 +71,7 @@
 (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 @@
 
 (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 @@
 	  (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 @@
     (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)))))))
 
--- a/lisp/gnus/gnus-start.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/gnus-start.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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 @@
 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 @@
 (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 @@
 
 (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 @@
                             (setcdr range (1- article))
                             (setq modified t)
                             ranges))))))))
-                  
+
     (when modified
       (when (eq modified 'remove-null)
         (setq r (delq nil r)))
@@ -2307,7 +2307,7 @@
                                   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)))))))
 
--- a/lisp/gnus/gnus-sum.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/gnus-sum.el	Wed Feb 09 15:50:47 2005 +0000
@@ -119,7 +119,7 @@
 
 (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 @@
   "*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 @@
   "*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 @@
 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 @@
 
 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 @@
 
 (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 @@
 
 (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 @@
 
 (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 @@
 
 (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 @@
 
 (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 @@
   (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 @@
 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 @@
 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 @@
 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 @@
 (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 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
--- a/lisp/gnus/gnus-util.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/gnus-util.el	Wed Feb 09 15:50:47 2005 +0000
@@ -1125,7 +1125,7 @@
             (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 @@
 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 @@
 			(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 "..")))))))))
 
 
--- a/lisp/gnus/gnus-win.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/gnus-win.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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 @@
 
 (defcustom gnus-configure-windows-hook nil
   "*A hook called when configuring windows."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-windows
   :type 'hook)
 
--- a/lisp/gnus/gnus.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/gnus.el	Wed Feb 09 15:50:47 2005 +0000
@@ -964,7 +964,7 @@
      (\"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 @@
 			(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 @@
   "*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 @@
 		  (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 @@
 (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 @@
   (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 @@
 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 @@
   (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 @@
    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 @@
   (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 @@
 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 @@
 	(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 @@
   (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 @@
 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 @@
        (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 @@
 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 @@
 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 @@
 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 @@
 `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 @@
               ;; 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 @@
 (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))
 
--- a/lisp/gnus/imap.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/imap.el	Wed Feb 09 15:50:47 2005 +0000
@@ -228,7 +228,7 @@
 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)
 
--- a/lisp/gnus/mail-source.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/mail-source.el	Wed Feb 09 15:50:47 2005 +0000
@@ -236,7 +236,7 @@
   "*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 @@
   "*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 @@
 
 (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 @@
 			       (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)
--- a/lisp/gnus/message.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/message.el	Wed Feb 09 15:50:47 2005 +0000
@@ -135,7 +135,7 @@
 
 (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 @@
 
 (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 @@
   "*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 @@
 
 (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 @@
 `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 @@
 `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 @@
 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 @@
 (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 @@
 (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 @@
   "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 @@
   "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, `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 @@
 (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 @@
 (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 @@
 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 @@
 		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 @@
 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 @@
 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 @@
   "*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 @@
 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 @@
 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 @@
 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 @@
   "*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 @@
     (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 @@
   "*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 @@
 ;;;###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 @@
   "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 @@
 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 @@
   "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 @@
 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 @@
 				 (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 @@
 	  "\\)")
   "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 @@
 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 @@
 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 @@
 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 @@
 (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 @@
 	'("^\\(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)
--- a/lisp/gnus/mm-decode.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/mm-decode.el	Wed Feb 09 15:50:47 2005 +0000
@@ -115,7 +115,7 @@
 `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 @@
   "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 @@
 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 @@
 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 @@
     "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 @@
 
 (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 @@
   "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 @@
   "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)
--- a/lisp/gnus/mm-url.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/mm-url.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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 @@
 
 (defcustom mm-url-arguments nil
   "The arguments for `mm-url-program'."
-  :version "21.4"
+  :version "22.1"
   :type '(repeat string)
   :group 'mm-url)
 
--- a/lisp/gnus/mm-uu.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/mm-uu.el	Wed Feb 09 15:50:47 2005 +0000
@@ -80,7 +80,7 @@
 
 (defcustom mm-uu-diff-groups-regexp "gnus\\.commits"
   "*Regexp matching diff groups."
-  :version "21.4"
+  :version "22.1"
   :type 'regexp
   :group 'gnus-article-mime)
 
--- a/lisp/gnus/mml-sec.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/mml-sec.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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 @@
 (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 @@
 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")
--- a/lisp/gnus/mml.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/mml.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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 @@
   '(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)
 
--- a/lisp/gnus/mml2015.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/mml2015.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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)
--- a/lisp/gnus/nndiary.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/nndiary.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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 @@
   (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)
--- a/lisp/gnus/nnimap.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/nnimap.el	Wed Feb 09 15:50:47 2005 +0000
@@ -211,7 +211,7 @@
 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 @@
 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 @@
 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 @@
 
 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 @@
 
 (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 @@
 				   (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 @@
   "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 @@
 			     '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 @@
 			      (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 @@
 			     (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 @@
 			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 @@
 		   (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)
--- a/lisp/gnus/nnmail.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/nnmail.el	Wed Feb 09 15:50:47 2005 +0000
@@ -119,7 +119,7 @@
 (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 @@
 (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 @@
 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 @@
 
 (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 @@
 (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 @@
                       (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 @@
                             (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 @@
 
 (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 @@
 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 @@
   "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 @@
   (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 @@
 	      (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)
--- a/lisp/gnus/pgg-def.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/pgg-def.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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)
 
--- a/lisp/gnus/pop3.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/pop3.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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 @@
 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)
 
--- a/lisp/gnus/sha1.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/sha1.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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
--- a/lisp/gnus/sieve.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/sieve.el	Wed Feb 09 15:50:47 2005 +0000
@@ -65,7 +65,7 @@
 
 (defgroup sieve nil
   "Manage sieve scripts."
-  :version "21.4"
+  :version "22.1"
   :group 'tools)
 
 (defcustom sieve-new-script "<new script>"
--- a/lisp/gnus/smiley.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/smiley.el	Wed Feb 09 15:50:47 2005 +0000
@@ -78,7 +78,7 @@
       (push "xpm" types))
     types)
   "*List of suffixes on picon file names to try."
-  :version "21.4"
+  :version "22.1"
   :type '(repeat string)
   :group 'smiley)
 
--- a/lisp/gnus/smime.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/smime.el	Wed Feb 09 15:50:47 2005 +0000
@@ -150,7 +150,7 @@
 (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 @@
 
 (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 @@
 (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)
--- a/lisp/gnus/spam-stat.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/spam-stat.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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"
--- a/lisp/gnus/spam.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/spam.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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."
--- a/lisp/gnus/starttls.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/starttls.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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 @@
 
 (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 @@
 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 @@
   ;; 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."
   ;; 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 @@
   ;; 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)
 
--- a/lisp/gnus/utf7.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/utf7.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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)
--- a/lisp/gnus/uudecode.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/gnus/uudecode.el	Wed Feb 09 15:50:47 2005 +0000
@@ -51,7 +51,7 @@
 (defcustom uudecode-use-external
   (executable-find uudecode-decoder-program)
   "*Use external uudecode program."
-  :version "21.4"
+  :version "22.1"
   :group 'gnus-extract
   :type 'boolean)
 
--- a/lisp/help-at-pt.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/help-at-pt.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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)
--- a/lisp/hl-line.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/hl-line.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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 @@
 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.
 
--- a/lisp/ibuffer.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/ibuffer.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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 @@
 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))
--- a/lisp/ido.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/ido.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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"))
 
--- a/lisp/ielm.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/ielm.el	Wed Feb 09 15:50:47 2005 +0000
@@ -77,7 +77,7 @@
 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.
--- a/lisp/imenu.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/imenu.el	Wed Feb 09 15:50:47 2005 +0000
@@ -107,7 +107,7 @@
 
 (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 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.
--- a/lisp/info.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/info.el	Wed Feb 09 15:50:47 2005 +0000
@@ -98,7 +98,7 @@
 
 (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 @@
 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 @@
   "*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 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)
 
--- a/lisp/international/latin1-disp.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/international/latin1-disp.el	Wed Feb 09 15:50:47 2005 +0000
@@ -156,7 +156,7 @@
 (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 @@
 
 ;; 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.
--- a/lisp/international/mule-util.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/international/mule-util.el	Wed Feb 09 15:50:47 2005 +0000
@@ -61,7 +61,7 @@
 ;;;###autoload
 (make-obsolete 'string-to-sequence
 	       "use `string-to-list' or `string-to-vector'."
-	       "21.4")
+	       "22.1")
 
 ;;;###autoload
 (defsubst string-to-list (string)
--- a/lisp/international/mule.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/international/mule.el	Wed Feb 09 15:50:47 2005 +0000
@@ -1268,7 +1268,7 @@
 	 (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 @@
 	  ;; 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))))
--- a/lisp/international/utf-8.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/international/utf-8.el	Wed Feb 09 15:50:47 2005 +0000
@@ -186,7 +186,7 @@
 		       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 @@
 			  (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 @@
 			     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 @@
 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 @@
 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 @@
 (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)
--- a/lisp/kmacro.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/kmacro.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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"))
 
--- a/lisp/ldefs-boot.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/ldefs-boot.el	Wed Feb 09 15:50:47 2005 +0000
@@ -3054,7 +3054,7 @@
 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 @@
 ;;;;;;  "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 @@
    \\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 @@
 ;;; 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 @@
 
 (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 @@
 
 \(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 @@
 ;;; 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 @@
 
 (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)
--- a/lisp/locate.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/locate.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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."
--- a/lisp/log-edit.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/log-edit.el	Wed Feb 09 15:50:47 2005 +0000
@@ -281,19 +281,19 @@
 
 ;; 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
--- a/lisp/mail/footnote.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/mail/footnote.el	Wed Feb 09 15:50:47 2005 +0000
@@ -89,7 +89,7 @@
 
 (defcustom footnote-section-tag "Footnotes: "
   "*Tag inserted at beginning of footnote section."
-  :version "21.4"
+  :version "22.1"
   :type 'string
   :group 'footnote)
 
--- a/lisp/mail/mail-extr.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/mail/mail-extr.el	Wed Feb 09 15:50:47 2005 +0000
@@ -231,7 +231,7 @@
 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 @@
 		    (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)))))
 
--- a/lisp/mail/rmail.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/mail/rmail.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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 @@
 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 @@
 	      (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 @@
 		    ;; 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 @@
 		     (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).
--- a/lisp/mail/sendmail.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/mail/sendmail.el	Wed Feb 09 15:50:47 2005 +0000
@@ -282,7 +282,7 @@
 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 @@
   :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.
--- a/lisp/mail/smtpmail.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/mail/smtpmail.el	Wed Feb 09 15:50:47 2005 +0000
@@ -170,7 +170,7 @@
 		       (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 "" ""))
--- a/lisp/mouse.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/mouse.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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 @@
 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)
--- a/lisp/net/ange-ftp.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/net/ange-ftp.el	Wed Feb 09 15:50:47 2005 +0000
@@ -1004,7 +1004,7 @@
   :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.
--- a/lisp/net/tls.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/net/tls.el	Wed Feb 09 15:50:47 2005 +0000
@@ -67,21 +67,21 @@
 
 (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)
 
--- a/lisp/net/tramp-smb.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/net/tramp-smb.el	Wed Feb 09 15:50:47 2005 +0000
@@ -340,11 +340,11 @@
   (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 @@
 	     (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.
--- a/lisp/net/tramp-util.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/net/tramp-util.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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 @@
 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.
--- a/lisp/net/tramp-vc.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/net/tramp-vc.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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 @@
 	(set (make-local-variable 'vc-parent-buffer-name)
 	     (concat " from " (buffer-name camefrom)))
 	(setq default-directory olddir)
-    
+
 	(erase-buffer)
 
 	(mapcar
@@ -230,7 +230,7 @@
         (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 @@
       (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 @@
 	    (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 @@
     (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 @@
 
 
 ;; 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 @@
   ;; 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 @@
 		     (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
--- a/lisp/net/tramp.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/net/tramp.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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 @@
 (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 @@
 
 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 @@
 	      (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 @@
     ("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 @@
       "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 @@
 	(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 @@
 	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 @@
 	  (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 @@
 	    (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 @@
 	 '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 @@
     ;; 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 @@
 	  (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 @@
 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 @@
   (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 @@
 
 (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 @@
 ;; `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 @@
 			       (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 @@
 ;; [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 @@
 			"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-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 @@
    (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 @@
     (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 @@
          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 @@
       (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 @@
                                                   (> 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 @@
 			       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 @@
         (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 @@
     (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 @@
     (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 @@
   (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 @@
    ""))
 
 
-;; ------------------------------------------------------------ 
-;; -- 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 @@
   "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 @@
 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 @@
     (if entry
 	(second entry)
       (symbol-value param))))
-      
+
 
 ;; Auto saving to a special directory.
 
@@ -6937,7 +6937,7 @@
             (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 @@
 	     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 @@
 ;;   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)
--- a/lisp/novice.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/novice.el	Wed Feb 09 15:50:47 2005 +0000
@@ -44,7 +44,7 @@
 (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)
--- a/lisp/progmodes/asm-mode.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/progmodes/asm-mode.el	Wed Feb 09 15:50:47 2005 +0000
@@ -186,7 +186,7 @@
       (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 ()
--- a/lisp/progmodes/cfengine.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/progmodes/cfengine.el	Wed Feb 09 15:50:47 2005 +0000
@@ -175,7 +175,7 @@
     (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."
--- a/lisp/progmodes/compile.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/progmodes/compile.el	Wed Feb 09 15:50:47 2005 +0000
@@ -459,7 +459,7 @@
     (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 @@
     (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 @@
 		 (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 @@
 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 @@
 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."
--- a/lisp/progmodes/fortran.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/progmodes/fortran.el	Wed Feb 09 15:50:47 2005 +0000
@@ -147,7 +147,7 @@
   "*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 @@
 			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))))
--- a/lisp/progmodes/gdb-ui.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/progmodes/gdb-ui.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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 @@
   "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 @@
   "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 @@
 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 @@
 	     (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 @@
   "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 @@
 	(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 @@
 	(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 @@
   "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 @@
 		 (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 @@
 		 (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 @@
   (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 @@
   "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 @@
 `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."
--- a/lisp/progmodes/grep.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/progmodes/grep.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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 @@
   :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 @@
   :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 @@
 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 @@
  <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 @@
 See `compilation-error-screen-columns'"
   :type '(choice (const :tag "Default" nil)
 		 integer)
-  :version "21.4"
+  :version "22.1"
   :group 'grep)
 
 ;;;###autoload
--- a/lisp/progmodes/python.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/progmodes/python.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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
--- a/lisp/progmodes/sql.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/progmodes/sql.el	Wed Feb 09 15:50:47 2005 +0000
@@ -617,7 +617,7 @@
   ;; -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
--- a/lisp/recentf.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/recentf.el	Wed Feb 09 15:50:47 2005 +0000
@@ -192,7 +192,7 @@
   '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 @@
   '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 @@
                 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 @@
              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
--- a/lisp/replace.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/replace.el	Wed Feb 09 15:50:47 2005 +0000
@@ -62,7 +62,7 @@
   "*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 @@
   :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 @@
     (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.
--- a/lisp/ruler-mode.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/ruler-mode.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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
--- a/lisp/server.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/server.el	Wed Feb 09 15:50:47 2005 +0000
@@ -123,7 +123,7 @@
 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 @@
 `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)))
--- a/lisp/simple.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/simple.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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 @@
                  (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 @@
                  (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 @@
 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 @@
 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 @@
 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.")
--- a/lisp/speedbar.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/speedbar.el	Wed Feb 09 15:50:47 2005 +0000
@@ -711,7 +711,7 @@
 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.
--- a/lisp/subr.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/subr.el	Wed Feb 09 15:50:47 2005 +0000
@@ -810,9 +810,9 @@
 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 @@
   "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 @@
 
 (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.
--- a/lisp/textmodes/conf-mode.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/textmodes/conf-mode.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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].
--- a/lisp/textmodes/sgml-mode.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/textmodes/sgml-mode.el	Wed Feb 09 15:50:47 2005 +0000
@@ -352,7 +352,7 @@
 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 @@
 		  (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
--- a/lisp/textmodes/table.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/textmodes/table.el	Wed Feb 09 15:50:47 2005 +0000
@@ -646,7 +646,7 @@
   :group 'wp
   :group 'paragraphs
   :group 'fill
-  :version "21.4")
+  :version "22.1")
 
 (defgroup table-hooks nil
   "Hooks for table manipulation utilities"
--- a/lisp/textmodes/tex-mode.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/textmodes/tex-mode.el	Wed Feb 09 15:50:47 2005 +0000
@@ -127,7 +127,7 @@
 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 @@
 		       "\\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 @@
 (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 @@
 	   (when (file-newer-than-file-p f file)
 	     (setq uptodate nil)))))
      uptodate)))
-    
+
 
 (autoload 'format-spec "format-spec")
 
--- a/lisp/thumbs.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/thumbs.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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
--- a/lisp/time.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/time.el	Wed Feb 09 15:50:47 2005 +0000
@@ -131,7 +131,7 @@
 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 @@
   "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.
--- a/lisp/tree-widget.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/tree-widget.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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
--- a/lisp/url/url-vars.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/url/url-vars.el	Wed Feb 09 15:50:47 2005 +0000
@@ -30,7 +30,7 @@
 
 (defgroup url nil
   "Uniform Resource Locator tool"
-  :version "21.4"
+  :version "22.1"
   :group 'hypermedia)
 
 (defgroup url-file nil
--- a/lisp/vc-cvs.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/vc-cvs.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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 @@
 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 @@
 
 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 @@
 	       (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*")
--- a/lisp/vc-hooks.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/vc-hooks.el	Wed Feb 09 15:50:47 2005 +0000
@@ -149,7 +149,7 @@
 		(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 @@
                    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"))))))
--- a/lisp/vc-mcvs.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/vc-mcvs.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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 @@
 		 (repeat :tag "Argument List"
 			 :value ("")
 			 string))
-  :version "21.4"
+  :version "22.1"
   :group 'vc)
 
 (defcustom vc-mcvs-diff-switches nil
@@ -92,13 +92,13 @@
 		 (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 @@
 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 @@
 	;; 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.
--- a/lisp/vc-svn.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/vc-svn.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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 @@
 		 (repeat :tag "Argument List"
 			 :value ("")
 			 string))
-  :version "21.4"
+  :version "22.1"
   :group 'vc)
 
 (defcustom vc-svn-diff-switches
@@ -77,12 +77,12 @@
 		 (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 @@
 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
   )
 
--- a/lisp/vc.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/vc.el	Wed Feb 09 15:50:47 2005 +0000
@@ -573,7 +573,7 @@
   :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 @@
 
 ;; 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.
--- a/lisp/version.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/version.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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
--- a/lisp/w32-vars.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/w32-vars.el	Wed Feb 09 15:50:47 2005 +0000
@@ -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
--- a/lisp/x-dnd.el	Tue Feb 08 23:51:31 2005 +0000
+++ b/lisp/x-dnd.el	Wed Feb 09 15:50:47 2005 +0000
@@ -47,7 +47,7 @@
 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 @@
 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 @@
 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 @@
     )
   "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 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 @@
 	       (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 @@
 		 ((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 @@
 			(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 @@
 
 	   (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 @@
 	  ((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 @@
 		  (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 @@
 		  (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 @@
 		  (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 @@
 			  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 @@
 				    "_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)))))
-					   
+
 
 ;;;
 
--- a/lispref/modes.texi	Tue Feb 08 23:51:31 2005 +0000
+++ b/lispref/modes.texi	Wed Feb 09 15:50:47 2005 +0000
@@ -1355,8 +1355,7 @@
 process the mode-line construct @var{elt} recursively and add the text
 properties specified by @var{props} to the result.  The argument
 @var{props} should consist of zero or more pairs @var{text-property}
-@var{value}.  (This feature is new as of Emacs 21.4.)
-@c FIXME: This might be Emacs 21.5.
+@var{value}.  (This feature is new as of Emacs 22.1.)
 
 @item (@var{symbol} @var{then} @var{else})
 A list whose first element is a symbol that is not a keyword specifies a
--- a/lispref/processes.texi	Tue Feb 08 23:51:31 2005 +0000
+++ b/lispref/processes.texi	Wed Feb 09 15:50:47 2005 +0000
@@ -1314,7 +1314,7 @@
 of a second; on those that do not, you get an error if you specify
 nonzero @var{millisec}.
 
-@c Emacs 21.4 feature
+@c Emacs 22.1 feature
 If @var{process} is a process, and the argument @var{just-this-one} is
 non-@code{nil}, only output from that process is handled, suspending output
 from other processes until some output has been received from that
--- a/lispref/text.texi	Tue Feb 08 23:51:31 2005 +0000
+++ b/lispref/text.texi	Wed Feb 09 15:50:47 2005 +0000
@@ -2886,7 +2886,7 @@
 property; rather, it is implemented in Font Lock mode using
 @code{char-property-alias-alist}.  @xref{Examining Properties}.
 
-This property is new in Emacs 21.4.
+This property is new in Emacs 22.1.
 
 @item mouse-face
 @kindex mouse-face @r{(text property)}
--- a/man/ChangeLog	Tue Feb 08 23:51:31 2005 +0000
+++ b/man/ChangeLog	Wed Feb 09 15:50:47 2005 +0000
@@ -384,7 +384,7 @@
 2004-12-08  Luc Teirlinck  <teirllm@auburn.edu>
 
 	* custom.texi (Saving Customizations): Emacs only loads the custom
-	file automatically after the init file in version 21.4 or later.
+	file automatically after the init file in version 22.1 or later.
 	Adapt text and examples to this fact.
 
 	* makefile.w32-in (INFO_TARGETS, DVI_TARGETS, $(infodir)/org)
@@ -937,7 +937,7 @@
 
 	* reftex.texi (AUCTeX): Update links, section name.
 
-	* faq.texi (Calc): Update availability (included in 21.4).
+	* faq.texi (Calc): Update availability (included in 22.1).
 	(AUCTeX): Update availability, information, versions, description.
 
 2004-08-21  Luc Teirlinck  <teirllm@auburn.edu>
--- a/man/cc-mode.texi	Tue Feb 08 23:51:31 2005 +0000
+++ b/man/cc-mode.texi	Wed Feb 09 15:50:47 2005 +0000
@@ -41,7 +41,7 @@
 
 
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-@comment 
+@comment
 @comment Texinfo manual for CC Mode
 @comment Generated from the original README file by Krishna Padmasola
 @comment <krishna@earth-gw.njit.edu>
@@ -51,7 +51,7 @@
 @comment Martin Stjernholm
 @comment
 @comment Maintained by Martin Stjernholm <bug-cc-mode@gnu.org>
-@comment 
+@comment
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 @comment Define an index for syntactic symbols.
@@ -1951,9 +1951,9 @@
 @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 The following list of commands reindent C constructs.  Note that when
-you change your coding style, either interactively or through some other 
+you change your coding style, either interactively or through some other
 means, your file does @emph{not} automatically get reindented.  You
-will need to execute one of the following commands to see the effects of 
+will need to execute one of the following commands to see the effects of
 your changes.
 
 @cindex GNU indent program
@@ -2865,9 +2865,9 @@
 If @samp{other} is not found then the @samp{gnu} style is used.
 
 @item
-In all cases, the style described in @code{c-default-style} is installed 
+In all cases, the style described in @code{c-default-style} is installed
 @emph{before} the language hooks are run, so you can always override
-this setting by including an explicit call to @code{c-set-style} in your 
+this setting by including an explicit call to @code{c-set-style} in your
 language mode hook, or in @code{c-mode-common-hook}.
 @end enumerate
 @end defopt
@@ -3051,7 +3051,7 @@
 like @ccmode{} to be a little more intelligent so that it aligns
 all the @samp{<<} symbols in lines 3 through 6.  To do this, we have
 to write a custom indentation function which finds the column of the first
-stream operator on the first line of the statement.  Here is sample 
+stream operator on the first line of the statement.  Here is sample
 lisp code implementing this:
 
 @example
@@ -3878,19 +3878,19 @@
 @example
  1: void a_function( int line1,
  2:                  int line2 );
- 3: 
+ 3:
  4: void a_longer_function(
  5:     int line1,
  6:     int line2
  7:     );
- 8: 
+ 8:
  9: void call_them( int line1, int line2 )
 10: @{
 11:     a_function(
 12:         line1,
 13:         line2
 14:         );
-15: 
+15:
 16:     a_longer_function( line1,
 17:                        line2 );
 18: @}
@@ -3927,10 +3927,10 @@
  3: @{
  4:     /* this line starts a multiline
  5:      * comment.  This line should get `c' syntax */
- 6: 
+ 6:
  7:     char* a_multiline_string = "This line starts a multiline \
  8: string.  This line should get `string' syntax.";
- 9: 
+ 9:
 10:   note:
 11:     @{
 12: #ifdef LOCK
@@ -4243,7 +4243,7 @@
 @example
 @group
 int *foo[] = @{
-    NULL,                 
+    NULL,
     @{17@},             @hereFn{c-indent-multi-line-block}
 @end group
 @end example
@@ -4474,7 +4474,7 @@
 @example
 @group
 main (int,
-      char **           
+      char **
      )                @hereFn{c-lineup-close-paren}
 @end group
 @end example
@@ -4684,7 +4684,7 @@
 @example
 @group
 class Foo
-    extends           
+    extends
         Bar           @hereFn{c-lineup-java-inher}
     @sssTBasicOffset{}
 @end group
@@ -5548,7 +5548,7 @@
 (@xref{Defuns,,, emacs, The Emacs Editor}, in the Emacs 20 manual).
 
 This heuristic is built into the core syntax analysis routines in
-(X)Emacs, so it's not really a @ccmode{} issue.  However, in Emacs 21.4
+(X)Emacs, so it's not really a @ccmode{} issue.  However, in Emacs 22.1
 it has become possible to turn it off@footnote{Using the variable
 @code{open-paren-in-column-0-is-defun-start}.} and @ccmode{} does so
 there since it got its own system to keep track of blocks.
--- a/man/custom.texi	Tue Feb 08 23:51:31 2005 +0000
+++ b/man/custom.texi	Wed Feb 09 15:50:47 2005 +0000
@@ -506,9 +506,12 @@
       ((and (= emacs-major-version 21) (< emacs-minor-version 4))
        ;; @r{Emacs 21 customization, before version 21.4.}
        (setq custom-file "~/.custom-21.el"))
-      (t
+      ((< emacs-major-version 22)
        ;; @r{Emacs version 21.4 or later.}
-       (setq custom-file "~/.custom-21.4.el")))
+       (setq custom-file "~/.custom-21.4.el"))
+      (t
+       ;; @r{Emacs version 22.1 or later.}
+       (setq custom-file "~/.custom-22.el")))
 
 (load custom-file)
 @end example
--- a/man/emacs-xtra.texi	Tue Feb 08 23:51:31 2005 +0000
+++ b/man/emacs-xtra.texi	Wed Feb 09 15:50:47 2005 +0000
@@ -274,7 +274,7 @@
 Dired buffers, using @kbd{C-u i}.  You can change the @code{ls}
 switches of an already inserted subdirectory using @kbd{C-u l}.
 
-In Emacs versions 21.4 and later, Dired remembers the switches, so
+In Emacs versions 22.1 and later, Dired remembers the switches, so
 that reverting the buffer will not change them back to the main
 directory's switches.  Deleting a subdirectory forgets about its
 switches.
--- a/man/emacs.texi	Tue Feb 08 23:51:31 2005 +0000
+++ b/man/emacs.texi	Wed Feb 09 15:50:47 2005 +0000
@@ -5,7 +5,7 @@
 
 @c The edition number appears in several places in this file
 @set EDITION   Fourteenth
-@set EMACSVER  21.3.50
+@set EMACSVER  22.0.50
 
 @copying
 This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},
--- a/man/faq.texi	Tue Feb 08 23:51:31 2005 +0000
+++ b/man/faq.texi	Wed Feb 09 15:50:47 2005 +0000
@@ -424,7 +424,7 @@
 
 The archive is at @uref{ftp://ftp-mailing-list-archives.gnu.org}.
 
-The archive can be browsed over the web at 
+The archive can be browsed over the web at
 @uref{http://mail.gnu.org/archive/html/, the GNU mail archive}.
 
 Web-based Usenet search services, such as
@@ -2633,7 +2633,7 @@
 default, a backslash (@samp{\}) will appear in the mode line.
 
 If you are running a version of Emacs before 20.1, get @code{crypt++}
-(@pxref{Packages that do not come with Emacs}).  Among other things, 
+(@pxref{Packages that do not come with Emacs}).  Among other things,
 @code{crypt++} transparently modifies MS-DOS files as they are loaded
 and saved, allowing you to ignore the different conventions that Unix
 and MS-DOS have for delineating the end of a line.
@@ -3300,10 +3300,10 @@
 @uref{ftp://ftp.gnu.org/pub/gnu/emacs/emacs-@value{VER}.tar.gz}
 
 The above will obviously change as new versions of Emacs come out.  For
-instance, when Emacs 21.42 is released, it will most probably be
+instance, when Emacs 22.42 is released, it will most probably be
 available as
 
-@uref{ftp://ftp.gnu.org/pub/gnu/emacs/emacs-21.42.tar.gz}
+@uref{ftp://ftp.gnu.org/pub/gnu/emacs/emacs-22.42.tar.gz}
 
 Again, you should use one of the GNU mirror sites (see @ref{Current GNU
 distributions}, and adjust the URL accordingly) so as to reduce load on
@@ -3543,7 +3543,7 @@
 List (ELL)}, maintained by @email{stephen@@anc.ed.ac.uk, Stephen Eglen},
 aims to provide one compact list with links to all of the current Emacs
 Lisp files on the internet.  The ELL can be browsed over the web, or
-from Emacs with @uref{http://www.anc.ed.ac.uk/~stephen/emacs/ell.el, 
+from Emacs with @uref{http://www.anc.ed.ac.uk/~stephen/emacs/ell.el,
 the @file{ell} package}.
 
 Many authors post their packages to the @uref{news:gnu.emacs.sources,
@@ -3805,7 +3805,7 @@
 
 Most of these modes are now available in standard Emacs distribution.
 To get additional modes, see @ref{Finding a package with particular
-functionality}.  
+functionality}.
 
 Barry Warsaw's @code{cc-mode} now works for C, C@t{++}, Objective-C, and
 Java code.  It is distributed with Emacs, but has
@@ -3932,7 +3932,7 @@
 @email{daveg@@csvax.cs.caltech.edu, Dave Gillespie}
 
 @item Latest version
-2.02g (part of Emacs since version 21.4)
+2.02g (part of Emacs since version 22.1)
 
 @item Distribution
 No separate distribution outside of Emacs.  Older versions
--- a/man/tramp.texi	Tue Feb 08 23:51:31 2005 +0000
+++ b/man/tramp.texi	Wed Feb 09 15:50:47 2005 +0000
@@ -381,7 +381,7 @@
 may be downloaded from
 @uref{http://savannah.nongnu.org/download/tramp/}. This
 release includes the full documentation and code for @value{tramp},
-suitable for installation.  But Emacs (21.4 or later) includes
+suitable for installation.  But Emacs (22.1 or later) includes
 @value{tramp} already, and there is a @value{tramp} package for XEmacs, as well.
 So maybe it is easier to just use those.  But if you want the bleeding
 edge, read on@dots{...}