Trailing whitespace deleted.

73 files changed, 420 insertions, 420 deletions

diff --git a/lisp/ChangeLog.6 b/lisp/ChangeLog.6
index 647a7b8abae..49ca67fe5de 100644
--- a/lisp/ChangeLog.6
+++ b/lisp/ChangeLog.6
@@ -1194,7 +1194,7 @@
 
 	* winnt.el (using-unix-filesystems): Update doc string.
 
-1996-05-11  Andrew Innes <andrewi@harlequin.co.uk>
+1996-05-11  Andrew Innes  <andrewi@harlequin.co.uk>
 
 	* scroll-bar.el (scroll-bar-drag-position): New function.
 	(scroll-bar-maybe-set-window-start): New function.
@@ -1313,7 +1313,7 @@
 	* apropos.el (apropos-print): If command has no key bindings,
 	say how to run it with M-x.
 
-1996-05-03  Andrew Innes <andrewi@harlequin.co.uk>
+1996-05-03  Andrew Innes  <andrewi@harlequin.co.uk>
 
 	* winnt.el (original-make-auto-save-file-name): New symbol bound
 	to old value of make-auto-save-file-name.
@@ -1364,7 +1364,7 @@
 	* solar.el (diary-sabbath-candles): Don't correct for DST a second
 	time.
 
-1996-04-26  Andrew Innes <andrewi@harlequin.co.uk>
+1996-04-26  Andrew Innes  <andrewi@harlequin.co.uk>
 
 	* compile.el (compilation-error-regexp-alist): Add regexp
 	for Microsoft VC++ error messages containing drive letters.
@@ -1466,7 +1466,7 @@
 	* metamail.el: Optional argument which value is passed to the
 	environment variable EMACS_VIEW_MODE is added to the function
 	metamail-buffer and metamail-region.
-	
+
 	* files.el (after-find-file): Mention file name in
 	"auto save is newer" message.
 
@@ -1495,7 +1495,7 @@
 	(vc-clear-context): Initialise vc-comment-ring using make-ring.
 	(vc-finish-logentry): Don't initialise vc-comment-ring here.
 
-1996-04-15  Eric Ding <ericding@mit.edu>
+1996-04-15  Eric Ding  <ericding@mit.edu>
 
 	* goto-addr.el (goto-address-send-using-mh-e):
 	Renamed from goto-address-send-using-mhe.  Require `mh-comp'.
@@ -2862,7 +2862,7 @@
 	(timer-inc-time): Use timer-relative-time.
 	(timer-set-time, timer-set-time-with-usecs): Allow floating DELTA.
 
-1996-01-31  Caleb Deupree <cdeupree@cincom.com>
+1996-01-31  Caleb Deupree  <cdeupree@cincom.com>
 
 	* winnt.el (mode-line-format): Include column-number-mode.
 
@@ -3393,7 +3393,7 @@
 
 	* files.el (auto-mode-alist): Use "\\`" instead of "^".
 
-1996-01-17  Michael Staats <michael@thp.Uni-Duisburg.DE>
+1996-01-17  Michael Staats  <michael@thp.Uni-Duisburg.DE>
 
 	* pc-select.el: Add some keybindings.
 	(next-line-mark, next-line-nomark): Set this-command.
@@ -4257,7 +4257,7 @@
 	Look for an end-delimiter in case where the start-of-bounce
 	delimiter looks like -- plus some more text.
 
-1995-12-13  Kevin Rodgers <kevinr@ihs.com>
+1995-12-13  Kevin Rodgers  <kevinr@ihs.com>
 
 	* ange-ftp.el (ange-ftp-load): Added missing form to `cdr' down
 	tryfiles in `while' loop.
@@ -4275,7 +4275,7 @@
 
 	* rmail.el (rmail-search): Doc fix.
 
-1995-12-11  Ake Stenhoff <etxaksf@aom.ericsson.se>
+1995-12-11  Ake Stenhoff  <etxaksf@aom.ericsson.se>
 
 	* cc-mode.el (cc-imenu-c++-generic-expression): New variable.
 	(cc-imenu-c-generic-expression): New variable.
@@ -4349,12 +4349,12 @@
 	(isearch-repeat): If isearch-just-started, don't test for empty match.
 	(isearch-unread): Use store-kbd-macro-event.
 
-1995-12-01  Francesco Potorti` <pot@cnuce.cnr.it>
+1995-12-01  Francesco Potorti`  <pot@cnuce.cnr.it>
 
 	* gud.el (gud-sdb-marker-filter): Modify the regexp for sysVR3 to
 	take care of the asterisk prompt.  Correctly set gud-marker-acc.
 
-1995-12-01  Francesco Potorti` <pot@cnuce.cnr.it>
+1995-12-01  Francesco Potorti`  <pot@cnuce.cnr.it>
 
 	* make-mode.el: Add faces to menu only if window-system.
 	(makefile-mode): Do not check if makefile-define-space-face is
@@ -4696,7 +4696,7 @@
 	* disp-table.el (display-table-slot,set-display-table-slot):
 	Document the slot names.
 
-1995-12-01  Francesco Potorti` <pot@cnuce.cnr.it>
+1995-12-01  Francesco Potorti`  <pot@cnuce.cnr.it>
 
 	* gud.el (gud-sdb-marker-filter): start may be nil, so check it
 	with numberp before using it.
@@ -5102,7 +5102,7 @@
 
 	* view.el (View-scroll-lines-forward): Don't recenter at end.
 
-1995-11-10  Kevin Rodgers <kevinr@ihs.com>
+1995-11-10  Kevin Rodgers  <kevinr@ihs.com>
 
 	* files.el (find-file-noselect): Respect the value of
 	find-file-visit-truename when FILENAME is a directory and
@@ -5277,7 +5277,7 @@
 
 	* view.el (view-mode-map): Use ordinary Help command.
 
-1995-11-02  Daniel Pfeiffer <Daniel.Pfeiffer@Informatik.START.dbp.de>
+1995-11-02  Daniel Pfeiffer  <Daniel.Pfeiffer@Informatik.START.dbp.de>
 
 	* sh-script.el (sh-shells): Eliminated variable redundant with
 	`interpreter-mode-alist'.
@@ -5308,7 +5308,7 @@
 	Renamed from shrink-window-horizontally, enlarge-window-horizontally
 	to avoid redefining the standard functions.
 
-1995-11-02  Stephen Gildea <gildea@stop.mail-abuse.org>
+1995-11-02  Stephen Gildea  <gildea@stop.mail-abuse.org>
 
 	* mh-e.el (mh-make-folder-mode-line): support mh-msg-count.
 	(mh-delete-scan-msgs): use fast new mh-goto-msg.
@@ -5700,13 +5700,13 @@
 
 	* hippie-exp.el (he-transfer-case): Fix typo in prev change.
 
-1995-10-13  Michael Kifer  <Michael Kifer <kifer@cs.sunysb.edu>>
+1995-10-13  Michael Kifer  <Michael Kifer  <kifer@cs.sunysb.edu>>
 
 	* ediff.el (ediff-version): is now autoloaded.
 	* ediff-init.el: Moved defsubsts up.
 	* ediff-hook.el: Now defines [window] in menu-bar-ediff-menu.
 
-1995-10-13  Michael Kifer  <Michael Kifer <kifer@cs.sunysb.edu>>
+1995-10-13  Michael Kifer  <Michael Kifer  <kifer@cs.sunysb.edu>>
 
 	* viper.el (vip-set-hooks): Use view-mode-hook in emacs and view
 	hook in xemacs.
@@ -6050,7 +6050,7 @@
 	* edt.el (edt-setup-default-bindings): Revert function is
 	revert-buffer, not revert-file.
 
-1995-09-22  Torbjorn Einarsson <T.Einarsson@clab.ericsson.se>
+1995-09-22  Torbjorn Einarsson  <T.Einarsson@clab.ericsson.se>
 
 	* f90.el: Major revision.
 	Much improved and quicker highlighting using font-lock.
@@ -6683,7 +6683,7 @@
 	* jka-compr.el (jka-compr-byte-compiler-base-file-name): New function.
 	Use it to handle byte-compiler-base-file-name operation.
 
-1995-08-20  Michael Kifer  <Michael Kifer <kifer@cs.sunysb.edu>>
+1995-08-20  Michael Kifer  <kifer@cs.sunysb.edu>
 
 	* viper.el (vip-set-hooks): Use view-mode-hook in emacs and view
 	hook in xemacs.
@@ -6857,7 +6857,7 @@
 	* sh-script.el (sh-mode-map): Use new name skeleton-pair-insert-maybe.
 	(sh-mode): Use new names skeleton-pair-alist, skeleton-pair-filter.
 
-1995-08-15  Daniel Pfeiffer <Daniel.Pfeiffer@Informatik.START.dbp.de>
+1995-08-15  Daniel Pfeiffer  <Daniel.Pfeiffer@Informatik.START.dbp.de>
 
 	* skeleton.el (skeleton-pair-insert-maybe): Plain insert in Ovwrt mode
 	(skeleton-insert): If skeleton doesn't fit in window, put beginning
@@ -7784,7 +7784,7 @@ Wed Jul 26 15:40:00 Michael Kifer  (kifer@cs.sunysb.edu)
 
 	* term/x-win.el (x-colors): Doc fix.
 
-1995-06-30  Kevin Rodgers <kevinr@ihs.com>
+1995-06-30  Kevin Rodgers  <kevinr@ihs.com>
 
 	* mailabbrev.el (mail-resolve-all-aliases-1):
 	Downcase address before recursive call.
diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7
index 01852a8ad77..be3b42d8eda 100644
--- a/lisp/ChangeLog.7
+++ b/lisp/ChangeLog.7
@@ -735,7 +735,7 @@
 	* files.el (auto-mode-alist): Fix regular expression error for
 	sh-mode.
 
-1998-07-26  Ken'ichi HANDA <handa@etl.go.jp>
+1998-07-26  Ken'ichi HANDA  <handa@etl.go.jp>
 
 	* arc-mode.el (archive-summarize): Set buffer unibyte before
 	calling archive-XXX-summarize.
@@ -1297,7 +1297,7 @@
 
 	* language/misc-lang.el ("IPA"): Add coding-priority and coding-system.
 
-1998-07-07  Kevin Rodgers <kevinr@ihs.com>
+1998-07-07  Kevin Rodgers  <kevinr@ihs.com>
 
 	* vc.el (vc-finish-logentry): Only delete windows in the
 	selected frame displaying the *VC-log* buffer, in case another
@@ -1905,7 +1905,7 @@
 	(japanese-hankaku-region): Likewise.
 	(japanese-zenkaku-region): Likewise.
 
-1998-06-22  WJCarpenter <bill@carpenter.ORG>
+1998-06-22  WJCarpenter  <bill@carpenter.ORG>
 
 	* mail/feedmail.el: New file.
 
@@ -2475,7 +2475,7 @@
 	* rsz-mini.el (resize-minibuffer-mode):
 	* iswitchb.el (iswitchb-read-buffer): Add autoload cookie.
 
-1998-06-03  Kevin Rodgers <kevinr@ihs.com>
+1998-06-03  Kevin Rodgers  <kevinr@ihs.com>
 
 	* replace.el (esc-map): Bind C-M-% to query-replace-regexp.
 
@@ -2604,7 +2604,7 @@
 	* international/mule.el (coding-system-mnemonic):
 	Don't crash if arg is nil.
 
-1998-05-31  Alan Shutko <shutkoa@ugsolutions.com>
+1998-05-31  Alan Shutko  <shutkoa@ugsolutions.com>
 
 	* emacs-lisp/easy-mmode.el (easy-mmode-define-minor-mode): Add
 	missing format arg.
@@ -2613,7 +2613,7 @@
 
 	* finder.el (finder-known-keywords): Fix `convenience' entry.
 
-1998-05-30  Richard Stallman <rms@gnu.org>
+1998-05-30  Richard Stallman  <rms@gnu.org>
 
 	* textmodes/tex-mode.el: Undo May 15 change.
 
@@ -2752,7 +2752,7 @@
 	* autoinsert.el:
 	* abbrev.el: Likewise.
 
-1998-05-26  Emilio Lopes <Emilio.Lopes@Physik.TU-Muenchen.DE>
+1998-05-26  Emilio Lopes  <Emilio.Lopes@Physik.TU-Muenchen.DE>
 	        and Karl Fogel  <kfogel@red-bean.com>
 
 	* bookmark.el: Changes so bookmark list mode works with Info:
@@ -4121,7 +4121,7 @@
 
 	* ffap.el (dired-at-point): Add autoload cookie.
 
-1998-04-23  Jens Petersen <petersen@kurims.kyoto-u.ac.jp>
+1998-04-23  Jens Petersen  <petersen@kurims.kyoto-u.ac.jp>
 
 	* ffap.el (dired-at-point-require-prefix): New option.
 	(dired-at-point): New command.
@@ -5871,7 +5871,7 @@
 
 	* battery.el: Fixed spelling of `autoload' magic cookies.
 
-1998-03-05  Sam Steingold <sds@usa.net>
+1998-03-05  Sam Steingold  <sds@usa.net>
 
 	* lisp/simple.el (backward-delete-char-untabify-method):
 	New user option.
@@ -5898,7 +5898,7 @@
 
 	* subr.el (sref): Increase CHAR in the while loop.
 
-1998-03-03  Sam Steingold <sds@usa.net>
+1998-03-03  Sam Steingold  <sds@usa.net>
 
 	* dired.el (dired-quit): Function deleted.
 	(dired-mode-map): Use quit-window for q.
@@ -7508,7 +7508,7 @@
 	* avoid.el (mouse-avoidance-mode): Variable customized to
 	automatically load the package.
 
-1997-12-22  Kevin Rodgers <kevinr@ihs.com>
+1997-12-22  Kevin Rodgers  <kevinr@ihs.com>
 
 	* simple.el (previous-matching-history-element): Bind
 	case-fold-search to nil if REGEXP contains an uppercase letter.
@@ -9275,7 +9275,7 @@
 
 	* gnus.el: Gnus v5.4.56 is released.
 
-1997-10-21  Shuhei KOBAYASHI <shuhei-k@jaist.ac.jp>
+1997-10-21  Shuhei KOBAYASHI  <shuhei-k@jaist.ac.jp>
 
 	* message.el (message-make-in-reply-to): Make valid In-Reply-To.
 
@@ -9284,7 +9284,7 @@
 	* gnus-art.el (gnus-header-button-alist): Check for URLs in the
 	Subject.
 
-1997-10-21  Hrvoje Niksic <hniksic@srce.hr>
+1997-10-21  Hrvoje Niksic  <hniksic@srce.hr>
 
 	* gnus-xmas.el: Cleanup.
 
@@ -9292,12 +9292,12 @@
 
 	* gnus-art.el (gnus-output-to-file): Return t.
 
-1997-10-21  Guy Geens <Guy.Geens@elis.rug.ac.be>
+1997-10-21  Guy Geens  <Guy.Geens@elis.rug.ac.be>
 
 	* gnus-score.el (gnus-decay-score): Make decay work on negative
 	scores.
 
-1997-10-21  Kurt Swanson <kurt@dna.lth.se>
+1997-10-21  Kurt Swanson  <kurt@dna.lth.se>
 
 	* nnmail.el (nnmail-article-group): Handle junk properly.
 
@@ -11224,7 +11224,7 @@
 
 	* mail/sendmail.el (mail-send): Complain about invalid header line.
 
-1997-08-30  Jerry James <jerry@cs.ucsb.edu>
+1997-08-30  Jerry James  <jerry@cs.ucsb.edu>
 
 	* format.el (format-subtract-regions): New function.
 	(format-property-increment-region): New function.
@@ -14875,7 +14875,7 @@
 	custom-nest-groups controls this.
 	<l, i, e>: Indent differently if custom-nest-groups.
 
-1997-06-20   Ryszard Kubiak <rysiek@ipipan.gda.pl>
+1997-06-20  Ryszard Kubiak  <rysiek@ipipan.gda.pl>
 
 	* ogonek.el: Doc fixes.
 	(ogonek-jak, ogonek-how): Examples of customization fixed.
@@ -15021,7 +15021,7 @@
 	(reftex-plug-into-AUCTeX) New variable and function.
 	(reftex-make-master-buffer) Fixed bug with relative path names.
 
-1997-06-18   Ryszard Kubiak <rysiek@ipipan.gda.pl>
+1997-06-18  Ryszard Kubiak  <rysiek@ipipan.gda.pl>
 
 	* ogonek.el: Doc Fix.
 	(prefix-code): Change the name to `ogonek-prefix-code'.
@@ -18634,7 +18634,7 @@
 
 	* skeleton.el (skeleton-read): Doc fix.
 
-1997-04-24  Per Abrahamsen <abraham@dina.kvl.dk>
+1997-04-24  Per Abrahamsen  <abraham@dina.kvl.dk>
 
 	* widget.el (define-widget): Return name.
 
@@ -19673,7 +19673,7 @@
 	* mh-utils.el (mh-find-progs): When looking for mh-lib, construct
 	likely paths based on mh-progs rather than using a static list.
 
-1997-03-24  Kevin Rodgers <kevinr@ihs.com>
+1997-03-24  Kevin Rodgers  <kevinr@ihs.com>
 
 	* compile.el (grep-program): New variable.
 	(grep-command): Use it, and test whether it supports the -e
@@ -19949,7 +19949,7 @@
 	c-Java-defun-prompt-regexp.
 	(c-guess-basic-syntax): CASE 2: relpos for c and c++ is now boi.
 
-1997-03-11  Kurt Hornik <Kurt.Hornik@ci.tuwien.ac.at>
+1997-03-11  Kurt Hornik  <Kurt.Hornik@ci.tuwien.ac.at>
 
 	* octave-mod.el (octave-abbrev-table): Add abbrevs for switch,
 	case, otherwise, and endswitch.
@@ -19988,7 +19988,7 @@
 	(makefile-dependency-regex, makefile-macroassign-regex): Disallow
 	spaces in symbol name.
 
-1997-03-11  Dan Nicolaescu <done@ece.arizona.edu>
+1997-03-11  Dan Nicolaescu  <done@ece.arizona.edu>
 
 	* subr.el (add-to-invisibility-spec, remove-from-invisibility-spec):
 	New functions.
diff --git a/lisp/ChangeLog.8 b/lisp/ChangeLog.8
index e819d7990bb..60bb4e6813d 100644
--- a/lisp/ChangeLog.8
+++ b/lisp/ChangeLog.8
@@ -5352,7 +5352,7 @@
 	* international/mule-diag.el (describe-coding-system): Fix English
 	message.
 
-1999-05-03  Jason Rumney <jasonr@altavista.net>
+1999-05-03  Jason Rumney  <jasonr@altavista.net>
 
 	* term/w32-win.el: Change the x-charset-registry property for the
 	Japanese charsets that are supported by Japanese Windows fonts.
@@ -5363,7 +5363,7 @@
 	diary-block diary entries for which the reminders and the diary
 	entries can overlap.
 
-1999-05-02  Jason Rumney <jasonr@altavista.net>
+1999-05-02  Jason Rumney  <jasonr@altavista.net>
 
 	* term/w32-win.el (mouse-set-font): Ensure constructed fontset
 	matches the font selected in the dialog.
@@ -5573,7 +5573,7 @@
 	* jka-compr.el (jka-compr-insert-file-contents):
 	Use raw-text-unix when we want no conversion.
 
-1999-04-06  Thierry Emery <Thierry.Emery@nmu.alcatel.fr>
+1999-04-06  Thierry Emery  <Thierry.Emery@nmu.alcatel.fr>
 
 	* timezone.el (timezone-parse-date): Corrected regexp for
 	style (5) date format so that tenths of seconds are optional.
@@ -5738,7 +5738,7 @@
 	* font-lock.el (c-font-lock-keywords-2): Added "complex" type.
 	(java-font-lock-keywords-2): Added "strictfp" keyword.
 
-1999-03-17  Jason Rumney <jasonr@altavista.net>
+1999-03-17  Jason Rumney  <jasonr@altavista.net>
 
 	* w32-fns.el (set-w32-system-coding-system) New function.
 	(w32-system-coding-system) Initialize to 'iso-latin-1.
@@ -5772,7 +5772,7 @@
 
 	* font-lock.el (c-font-lock-keywords-2): Added "restrict" keyword.
 
-1999-03-14  Milan Zamazal <pdm@pvt.net>
+1999-03-14  Milan Zamazal  <pdm@pvt.net>
 
 	* abbrev.el (inverse-add-abbrev): Inherit the current input method.
 
@@ -5868,7 +5868,7 @@
 
 	* mail/smtpmail.el (smtpmail-do-bcc): Fix regexp.
 
-1999-03-08  Jason Rumney <jasonr@altavista.net>
+1999-03-08  Jason Rumney  <jasonr@altavista.net>
 
 	* international/codepage.el (cp1250-decode-table)
 	(cp1251-decode-table, cp1253-decode-table)
@@ -6594,7 +6594,7 @@
 	* font-lock.el (font-lock-default-unfontify-region):
 	If not font-lock-syntactic-keywords, don't remove syntax-table prop.
 
-1999-01-27  Jason Rumney <jasonr@altavista.net>
+1999-01-27  Jason Rumney  <jasonr@altavista.net>
 
 	* term/w32-win.el (w32-standard-fontset-spec): Remove wildcard
 	from FAMILY field.
@@ -6769,7 +6769,7 @@
 	* midnight.el (clean-buffer-list): Do not kill a buffer if it has
 	a process associated with it.
 
-1999-01-22  Jason Rumney <jasonr@altavista.net>
+1999-01-22  Jason Rumney  <jasonr@altavista.net>
 
 	* term/w32-win.el (w32-standard-fontset-spec): Simplified.
 
@@ -6803,7 +6803,7 @@
 	* wid-edit.el (widget-alist-convert-option): Delete spurious comma.
 	(widget-plist-convert-option): Delete spurious comma.
 
-1999-01-19  Jason Rumney <jasonr@altavista.net>
+1999-01-19  Jason Rumney  <jasonr@altavista.net>
 
 	* term/w32-win.el (w32-standard-fontspec-spec): Change
 	iso8859-5 to koi8-r.  Add iso8859-9.
@@ -7324,7 +7324,7 @@
 	argument requires specific EOL conversion type, make the default
 	coding systems use that.
 
-1998-12-30  Drew Csillag <drew_csillag@geocities.com>
+1998-12-30  Drew Csillag  <drew_csillag@geocities.com>
 
 	* progmodes/m4-mode.el (m4-m4-region, m4-m4-buffer):
 	Use shell-command-on-region.
@@ -8493,7 +8493,7 @@
 	set-minibuffer-window to set minibuffer window of the current
 	frame correctly.
 
-1998-11-03  Theodore Jump <tjump@tertius.com>
+1998-11-03  Theodore Jump  <tjump@tertius.com>
 
 	* term/w32-win.el: Require fontset.
 
@@ -8687,7 +8687,7 @@
 	(ps-mule-initialize, ps-mule-begin, ps-face-bold-p, ps-do-despool):
 	Programming style normalization.
 
-1998-10-26  Kenichi Handa <handa@etl.go.jp>
+1998-10-26  Kenichi Handa  <handa@etl.go.jp>
 
 	* ps-print.el: To make it work also on Emacs 20.2 and the earlier
 	version, check the value of mule-version.
@@ -9870,7 +9870,7 @@
 	* gnus/gnus-start.el (gnus-save-newsrc-file): Bind
 	coding-system-for-write before saving.
 
-1998-08-26  Kevin Rodgers <kevinr@ihs.com>
+1998-08-26  Kevin Rodgers  <kevinr@ihs.com>
 
 	* isearch.el (isearch-forward): Doc fix.
 
diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9
index 7976756f1e6..ceb67da9447 100644
--- a/lisp/ChangeLog.9
+++ b/lisp/ChangeLog.9
@@ -294,7 +294,7 @@
 	that &rest VAR is the last element, and that variables aren't doubled.
 	(byte-compile-lambda): Use it.
 
-2001-10-12  Eli Barzilay <eli@barzilay.org>
+2001-10-12  Eli Barzilay  <eli@barzilay.org>
 
 	* calculator.el (calculator-eng-display): Don't call concat
 	with an integer argument.
@@ -1242,7 +1242,7 @@
 	(quail-activate): Mention the hooks these functions run in their
 	doc strings.
 
-2001-09-05  Edward M. Reingold <reingold@iit.edu>
+2001-09-05  Edward M. Reingold  <reingold@iit.edu>
 
 	* cal-menu.el (calendar-mouse-view-other-diary-entries): Fix name
 	of file in header of menu.
@@ -1629,7 +1629,7 @@
 	window-scroll-functions are run with a window start that's
 	temporarily outside of the restriction.
 
-2001-08-16  Robert J. Chassell <bug-texinfo@gnu.org>
+2001-08-16  Robert J. Chassell  <bug-texinfo@gnu.org>
 
 	* textmodes/texnfo-upd.el: Update copyright notice, fix minor typos.
 	(texinfo-find-lower-level-node, texinfo-find-higher-level-node)
@@ -3835,7 +3835,7 @@
 	final computational form, which was unnecessary; corrected a
 	parsing problem when timeclock-relative was nil.
 
-2001-04-23  Kahlil Hodgson <kahlil@discus.anu.edu.au>
+2001-04-23  Kahlil Hodgson  <kahlil@discus.anu.edu.au>
 
 	* calendar/timeclock.el (timeclock-modeline-display): Check if
 	`list-entry' is null.
@@ -4060,7 +4060,7 @@
 	(ps-fonts, ps-font-number, ps-rgb-color, ps-end-page, ps-next-page)
 	(ps-skip-newline): Replace defun by defsubst.
 
-2001-04-10  Colin Walters <walters@cis.ohio-state.edu>
+2001-04-10  Colin Walters  <walters@cis.ohio-state.edu>
 
 	* eshell/eshell.el (eshell-command): Needed a "%s" format
 	specifier, in case the buffer contains percent characters.
@@ -5538,7 +5538,7 @@
 
 	* international/mule-cmds.el (set-input-method): Another doc fix.
 
-2001-02-13  David M. Koppelman <koppel@ee.lsu.edu>
+2001-02-13  David M. Koppelman  <koppel@ee.lsu.edu>
 
 	* hi-lock.el (hi-lock-find-patterns): Don't activate font-lock-mode.
 
@@ -5702,7 +5702,7 @@
 	* makefile.w32-in (EMACS): Use $(THISDIR) to make emacs.exe path
 	absolute.
 
-2001-02-06  David M. Koppelman <koppel@ee.lsu.edu>
+2001-02-06  David M. Koppelman  <koppel@ee.lsu.edu>
 
 	* hi-lock.el (hi-lock-mode): Toggling hi-lock-mode now affects all
 	buffers.  When hi-lock turned on rather than only checking current
@@ -6253,7 +6253,7 @@
 
 	* ediff-vers.el: Fix for 8+3 DOS file systems.
 
-2001-01-19  Colin Walters <walters@cis.ohio-state.edu>
+2001-01-19  Colin Walters  <walters@cis.ohio-state.edu>
 
 	* ediff-util.el (ediff-compare-custom-diffs-maybe): Put diff in
 	diff mode, if available.
@@ -8108,7 +8108,7 @@
 
 	* select.el (x-get-selection): Docstring fix.
 
-2000-11-27  Dave Pearson <davep@hagbard.demon.co.uk>
+2000-11-27  Dave Pearson  <davep@hagbard.demon.co.uk>
 
 	* play/5x5.el (5x5-play-solution): Bind hinhibit-quit to t.
 
@@ -8251,7 +8251,7 @@
 	(iswitchb-entryfn-p): If minibuffer-depth returns the same value
 	as recorded in iswitchb-minibuf-depth, return non-nil.
 
-2000-11-23  Eli Zaretskii <eliz@is.elta.co.il>
+2000-11-23  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* hscroll.el (turn-on-hscroll, hscroll-mode, hscroll-global-mode)
 	(hscroll-window-maybe): Docstring fix.
@@ -8513,7 +8513,7 @@
 
 	* Makefile.in (DONTCOMPILE): Omit bindings.el.
 
-2000-11-20  Eli Barzilay <eli@www.barzilay.org>
+2000-11-20  Eli Barzilay  <eli@www.barzilay.org>
 
 	* calculator.el (calculator-paste): Use `if' instead of `and'
 	and `or'.
@@ -8554,7 +8554,7 @@
 	(mode-line-toggle-modified, mode-line-widen)
 	(mode-line-abbrev-mode, mode-line-auto-fill-mode): Fix typos.
 
-2000-11-17  Vinicius Jose Latorre <vinicius@cpqd.com.br>
+2000-11-17  Vinicius Jose Latorre  <vinicius@cpqd.com.br>
 
 	* ps-print.el (toplevel): Test for find-coding-system being
 	fboundp before calling ps-x-find-coding-system.
@@ -14379,7 +14379,7 @@
 	* progmodes/icon.el (icon-indent-line)
 	(icon-is-continuation-line): Handle comments specially.
 
-2000-08-17  Ken Stevens <k.stevens@ieee.org>
+2000-08-17  Ken Stevens  <k.stevens@ieee.org>
 
 	* ispell.el: Set to standard author/maintainer/keyword fields.
 	Fine tuning to menu map appearance and operation, and added help.
@@ -15769,7 +15769,7 @@
 
 	* gnus/parse-time.el: Correct author's mail address.
 
-2000-07-19  Colin Walters <walters@cis.ohio-state.edu>
+2000-07-19  Colin Walters  <walters@cis.ohio-state.edu>
 
 	* comint.el (comint-highlight-input, comint-highlight-face):
 	New user options.
@@ -16628,7 +16628,7 @@
 	* info.el: Doc fixes.
 	(Info-build-node-completions): Match Ref tags.
 
-2000-06-13  Eli Zaretskii <eliz@is.elta.co.il>
+2000-06-13  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* frame.el (display-multi-frame-p, display-multi-font-p): New
 	defaliases for display-graphic-p.
@@ -17175,7 +17175,7 @@
 	* simple.el (newline): Don't bind before-change-function,
 	after-change-function.
 
-2000-05-31  Rajesh Vaidheeswarran <rv@gnu.org>
+2000-05-31  Rajesh Vaidheeswarran  <rv@gnu.org>
 
 	* whitespace.el (whitespace-rescan-timer-time): Update interval
 	set to 600 seconds (10 minutes) instead of 60 seconds since
@@ -18218,7 +18218,7 @@
 	* gud.el (gud-gdb-find-file): Call find-file-noselect with NOWARN
 	argument.
 
-2000-04-27  Sen Nagata <sen@eccosys.com>
+2000-04-27  Sen Nagata  <sen@eccosys.com>
 
 	* emacs-lisp/crm.el (crm-completion-table): New variable.
 	(crm-collection-fn, crm-test-completion)
@@ -19191,7 +19191,7 @@
 
 	* emacs-lisp/re-builder.el: Remove RCS Id, remove history comment.
 
-2000-03-12  Detlev Zundel <detlev.zundel@stud.uni-karlsruhe.de>
+2000-03-12  Detlev Zundel  <detlev.zundel@stud.uni-karlsruhe.de>
 
 	* emacs-lisp/re-builder.el (reb-re-syntax): Fix typo in `:type'.
 	Fix comment.
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 8c06ad65227..3d22b901bb8 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -248,7 +248,7 @@ compile-always: $(lisp)/subdirs.el doit
 	  fi \
 	done
 
-compile-calc: 
+compile-calc:
 	for el in `find $(lisp)/calc -name '*.el'`; do \
 	  echo Compiling $$el; \
 	  $(emacs) -f batch-byte-compile $$el || exit 1; \
diff --git a/lisp/indent.el b/lisp/indent.el
index ed5ff8729fc..2231b478418 100644
--- a/lisp/indent.el
+++ b/lisp/indent.el
@@ -303,16 +303,16 @@ If `auto-fill-mode' is active, re-fills region to fit in new margin."
 With optional argument, move forward N-1 lines first.
 From the beginning of the line, moves past the left-margin indentation, the
 fill-prefix, and any indentation used for centering or right-justifying the
-line, but does not move past any whitespace that was explicitly inserted 
+line, but does not move past any whitespace that was explicitly inserted
 \(such as a tab used to indent the first line of a paragraph)."
   (interactive "p")
   (beginning-of-line n)
   (skip-chars-forward " \t")
   ;; Skip over fill-prefix.
-  (if (and fill-prefix 
+  (if (and fill-prefix
 	   (not (string-equal fill-prefix "")))
       (if (equal fill-prefix
-		 (buffer-substring 
+		 (buffer-substring
 		  (point) (min (point-max) (+ (length fill-prefix) (point)))))
 	  (forward-char (length fill-prefix)))
     (if (and adaptive-fill-mode adaptive-fill-regexp
diff --git a/lisp/informat.el b/lisp/informat.el
index baec500ec78..1b07792fa66 100644
--- a/lisp/informat.el
+++ b/lisp/informat.el
@@ -57,7 +57,7 @@
         (let (tag-list
               refillp
               (case-fold-search t)
-              (regexp 
+              (regexp
                (concat
                 "\\("
 
@@ -116,7 +116,7 @@
                   (delete-region  (match-beginning 0) (match-end 0))))
               ;; else this is a Node
               (setq tag-list
-                    (cons (list 
+                    (cons (list
                            (concat "Node: " (match-string-no-properties 13))
                            (1+ (match-beginning 10)))
                           tag-list))))
@@ -453,7 +453,7 @@ For example, invoke \"emacs -batch -f batch-info-validate $info/ ~/*.info\""
 	(cond ((not (file-exists-p file))
 	       (message ">> %s does not exist!" file)
 	       (setq error 1
-		     command-line-args-left (cdr command-line-args-left))) 
+		     command-line-args-left (cdr command-line-args-left)))
 	      ((file-directory-p file)
 	       (setq command-line-args-left (nconc (directory-files file)
 					      (cdr command-line-args-left))))
diff --git a/lisp/iswitchb.el b/lisp/iswitchb.el
index d24f737851b..ac384a3a874 100644
--- a/lisp/iswitchb.el
+++ b/lisp/iswitchb.el
@@ -183,7 +183,7 @@
 ;; Using iswitchb for other completion tasks.
 
 ;; Kin Cho (kin@neoscale.com) sent the following suggestion to use
-;; iswitchb for other completion tasks.  
+;; iswitchb for other completion tasks.
 ;;
 ;; (defun my-icompleting-read (prompt choices)
 ;;   "Use iswitch as a completing-read replacement to choose from
@@ -209,8 +209,8 @@
 ;;    (delete-minibuffer-contents))
 ;;
 ;; (add-hook 'iswitchb-define-mode-map-hook
-;; 	  '(lambda () (define-key 
-;; 			iswitchb-mode-map "\C-o" 
+;; 	  '(lambda () (define-key
+;; 			iswitchb-mode-map "\C-o"
 ;; 			'iswitchb-exclude-nonmatching)))
 
 ;; Other lisp packages extend iswitchb behaviour to other tasks.  See
@@ -518,7 +518,7 @@ variable `iswitchb-mode'."
     (define-key map "\C-m" 'iswitchb-exit-minibuffer)
     (setq iswitchb-mode-map map)
     (run-hooks 'iswitchb-define-mode-map-hook)))
-  
+
 ;;; MAIN FUNCTION
 (defun iswitchb ()
   "Switch to buffer matching a substring.
@@ -547,7 +547,7 @@ in a separate window.
 \\[iswitchb-kill-buffer] Kill buffer at head of buffer list."
   ;;\\[iswitchb-toggle-ignore] Toggle ignoring certain buffers (see \
   ;;`iswitchb-buffer-ignore')
-  	
+
   (let* ((prompt "iswitch ")
 	 (buf (iswitchb-read-buffer prompt)))
 
@@ -626,7 +626,7 @@ If REQUIRE-MATCH is non-nil, an existing-buffer must be selected."
 	(setq buf-sel iswitchb-final-text)
       ;; else take head of list
       (setq buf-sel (car iswitchb-matches)))
-    
+
     ;; Or possibly choose the default buffer
     (if  (equal iswitchb-final-text "")
 	(setq buf-sel
@@ -661,11 +661,11 @@ The result is stored in `iswitchb-common-match-string'."
   (let (res)
     (cond ((not  iswitchb-matches)
 	   (run-hooks 'iswitchb-cannot-complete-hook))
-	  
+
 	  ((= 1 (length iswitchb-matches))
 	   ;; only one choice, so select it.
 	   (exit-minibuffer))
-	  
+
 	  (t
 	   ;; else there could be some completions
 	   (setq res iswitchb-common-match-string)
@@ -847,16 +847,16 @@ BUFFER-LIST can be list of buffers or list of strings."
          ret)
     (mapcar
      (lambda (x)
-       
+
        (if do-string
 	   (setq name x)               ;We already have the name
 	 (setq name (buffer-name x)))
-       
+
        (cond
 	((and (or (and string-format (string-match regexp name))
 		  (and (null string-format)
 		       (string-match (regexp-quote regexp) name)))
-	      
+
 	      (not (iswitchb-ignore-buffername-p name)))
 	 (setq ret (cons name ret))
           )))
@@ -954,10 +954,10 @@ Return the modified list with the last element prepended to it."
 	      (set-window-start win (point-min))
 	    (scroll-other-window))
 	  (set-buffer buf))
-      
+
       (with-output-to-temp-buffer temp-buf
 	(if iswitchb-xemacs
-	    
+
 	    ;; XEmacs extents are put on by default, doesn't seem to be
 	    ;; any way of switching them off.
 	    (display-completion-list (if iswitchb-matches
@@ -1043,7 +1043,7 @@ Return the modified list with the last element prepended to it."
     (if (and iswitchb-newbuffer
 	     (or
 	      (not iswitchb-prompt-newbuffer)
-	      
+
 	      (and iswitchb-prompt-newbuffer
 		   (y-or-n-p
 		    (format
@@ -1187,7 +1187,7 @@ Copied from `icomplete-exhibit' with two changes:
 	  (iswitchb-set-common-completion)
 
 	  ;; Insert the match-status information:
-	  (insert (iswitchb-completions 
+	  (insert (iswitchb-completions
 		   contents
 		   minibuffer-completion-table
 		   minibuffer-completion-predicate
@@ -1196,7 +1196,7 @@ Copied from `icomplete-exhibit' with two changes:
 (defun iswitchb-completions (name candidates predicate require-match)
   "Return the string that is displayed after the user's text.
 Modified from `icomplete-completions'."
-  
+
   (let ((comps iswitchb-matches)
                                         ; "-determined" - only one candidate
         (open-bracket-determined (if require-match "(" "["))
@@ -1273,7 +1273,7 @@ Modified from `icomplete-completions'."
 		   (concat open-bracket-determined
 			   (substring most (length name))
 			   close-bracket-determined))
-	      
+
 	      ;; list all alternatives
 	      open-bracket-prospects
 	      (if most-is-exact
@@ -1304,13 +1304,13 @@ Copied from `icomplete-tidy'."
 
   (if (and (boundp 'iswitchb-eoinput)
 	   iswitchb-eoinput)
-      
+
       (if (> iswitchb-eoinput (point-max))
 	  ;; Oops, got rug pulled out from under us - reinit:
 	  (setq iswitchb-eoinput (point-max))
 	(let ((buffer-undo-list buffer-undo-list )) ; prevent entry
 	  (delete-region iswitchb-eoinput (point-max))))
-    
+
     ;; Reestablish the local variable 'cause minibuffer-setup is weird:
     (make-local-variable 'iswitchb-eoinput)
     (setq iswitchb-eoinput 1)))
diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el
index 2f832bf3dad..b143393c867 100644
--- a/lisp/jit-lock.el
+++ b/lisp/jit-lock.el
@@ -38,7 +38,7 @@
 	     (progn ,@body)
 	   (unless ,modified
 	     (restore-buffer-modified-p nil))))))
-  
+
   (defmacro with-buffer-prepared-for-jit-lock (&rest body)
     "Execute BODY in current buffer, overriding several variables.
 Preserves the `buffer-modified-p' state of the current buffer."
@@ -52,7 +52,7 @@ Preserves the `buffer-modified-p' state of the current buffer."
 	    buffer-file-truename)
 	,@body))))
 
-  
+
 
 ;;; Customization.
 
@@ -82,9 +82,9 @@ To reduce machine load during stealth fontification, at the cost of stealth
 taking longer to fontify, you could increase the value of this variable.
 See also `jit-lock-stealth-load'."
   :type '(choice (const :tag "never" nil)
-		 (number :tag "seconds"))	  
+		 (number :tag "seconds"))
   :group 'jit-lock)
- 
+
 
 (defcustom jit-lock-stealth-load
   (if (condition-case nil (load-average) (error)) 200)
@@ -325,7 +325,7 @@ Defaults to the whole buffer.  END can be out of bounds."
 	   ;; stop at the start of the line following NEXT.
 	   (goto-char next)  (setq next (line-beginning-position 2))
 	   (goto-char start) (setq start (line-beginning-position))
-	     
+
 	   ;; Fontify the chunk, and mark it as fontified.
 	   ;; We mark it first, to make sure that we don't indefinitely
 	   ;; re-execute this fontification if an error occurs.
@@ -378,7 +378,7 @@ Value is nil if there is nothing more to fontify."
 			   ((< (- around start) (- next around)) start)
 			   (t next))))
 	result))))
-	
+
 
 (defun jit-lock-stealth-fontify ()
   "Fontify buffers stealthily.
@@ -393,7 +393,7 @@ This functions is called after Emacs has been idle for
       (while (and buffers (not (input-pending-p)))
 	(let ((buffer (car buffers)))
 	  (setq buffers (cdr buffers))
-	  
+
 	  (with-current-buffer buffer
 	    (when jit-lock-mode
 	      ;; This is funny.  Calling sit-for with 3rd arg non-nil
@@ -447,14 +447,14 @@ This functions is called after Emacs has been idle for
 		  (while (and (setq start
 				    (jit-lock-stealth-chunk-start point))
 			      (sit-for nice))
-		    
+
 		    ;; fontify a block.
 		    (jit-lock-fontify-now start (+ start jit-lock-chunk-size))
 		    ;; If stealth jit-locking is done backwards, this leads to
 		    ;; excessive O(n^2) refontification.   -stef
 		    ;; (when (>= jit-lock-first-unfontify-pos start)
 		    ;;   (setq jit-lock-first-unfontify-pos end))
-		    
+
 		    ;; Wait a little if load is too high.
 		    (when (and jit-lock-stealth-load
 			       (> (car (load-average)) jit-lock-stealth-load))
@@ -489,7 +489,7 @@ This functions is called after Emacs has been idle for
       (sit-for 0)
       ;; (message "Jit-Defer Done")
       )))
-      
+
 
 (defun jit-lock-after-change (start end old-len)
   "Mark the rest of the buffer as not fontified after a change.
@@ -508,7 +508,7 @@ will take place when text is fontified stealthily."
        ;; be inconsistent with the buffer's content.
        (goto-char start)
        (setq start (line-beginning-position))
-       
+
        ;; If we're in text that matches a multi-line font-lock pattern,
        ;; make sure the whole text will be redisplayed.
        ;; I'm not sure this is ever necessary and/or sufficient.  -stef
@@ -516,7 +516,7 @@ will take place when text is fontified stealthily."
 	 (setq start (or (previous-single-property-change
 			  start 'font-lock-multiline)
 			 (point-min))))
-       
+
        ;; Make sure we change at least one char (in case of deletions).
        (setq end (min (max end (1+ start)) (point-max)))
        ;; Request refontification.
@@ -525,7 +525,7 @@ will take place when text is fontified stealthily."
       (when jit-lock-first-unfontify-pos
 	(setq jit-lock-first-unfontify-pos
 	      (min jit-lock-first-unfontify-pos start))))))
-  
+
 (provide 'jit-lock)
 
 ;;; jit-lock.el ends here
diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el
index e1780b33296..7a51e961ed0 100644
--- a/lisp/jka-compr.el
+++ b/lisp/jka-compr.el
@@ -77,9 +77,9 @@
 
 
 ;; ACKNOWLEDGMENTS
-;; 
+;;
 ;; jka-compr is a V19 adaptation of jka-compr for V18 of Emacs.  Many people
-;; have made helpful suggestions, reported bugs, and even fixed bugs in 
+;; have made helpful suggestions, reported bugs, and even fixed bugs in
 ;; jka-compr.  I recall the following people as being particularly helpful.
 ;;
 ;;   Jean-loup Gailly
@@ -117,7 +117,7 @@ for `jka-compr-compression-info-list')."
   :type 'string
   :group 'jka-compr)
 
-(defvar jka-compr-use-shell 
+(defvar jka-compr-use-shell
   (not (memq system-type '(ms-dos windows-nt))))
 
 ;;; I have this defined so that .Z files are assumed to be in unix
@@ -270,8 +270,8 @@ based on the filename itself and `jka-compr-compression-info-list'."
 
   (signal 'compression-error
 	  (list "Opening input file" (format "error %s" message) infile)))
-			
-   
+
+
 (defcustom jka-compr-dd-program "/bin/dd"
   "How to invoke `dd'."
   :type 'string
@@ -447,7 +447,7 @@ There should be no more than seven characters after the final `/'."
 
 	    (setq temp-file (jka-compr-make-temp-name)))
 
-	  (and 
+	  (and
 	   compress-message
 	   (message "%s %s..." compress-message base-name))
 
@@ -502,7 +502,7 @@ There should be no more than seven characters after the final `/'."
 	  (setq last-coding-system-used coding-system-used)
 
 	  nil)
-	      
+
       (jka-compr-run-real-handler 'write-region
 				  (list start end filename append visit)))))
 
@@ -538,7 +538,7 @@ There should be no more than seven characters after the final `/'."
 	  (unwind-protect		; to make sure local-copy gets deleted
 
 	      (progn
-		  
+
 		(and
 		 uncompress-message
 		 (message "%s %s..." uncompress-message base-name))
@@ -583,7 +583,7 @@ There should be no more than seven characters after the final `/'."
 			    (eq (nth 3 error-code) local-file))
 		       (if visit
 			   (setq notfound error-code)
-			 (signal 'file-error 
+			 (signal 'file-error
 				 (cons "Opening input file"
 				       (nthcdr 2 error-code))))
 		     (signal (car error-code) (cdr error-code))))))
@@ -594,7 +594,7 @@ There should be no more than seven characters after the final `/'."
 	     (delete-file local-copy)))
 
 	  (decode-coding-inserted-region
-	   (point) (+ (point) size) 
+	   (point) (+ (point) size)
 	   (jka-compr-byte-compiler-base-file-name file)
 	   visit beg end replace)
 
@@ -605,7 +605,7 @@ There should be no more than seven characters after the final `/'."
 	     (setq buffer-file-name filename)
 	     (setq jka-compr-really-do-compress t)
 	     (set-visited-file-modtime)))
-	    
+
 	  (and
 	   uncompress-message
 	   (message "%s %s...done" uncompress-message base-name))
@@ -661,11 +661,11 @@ There should be no more than seven characters after the final `/'."
 	  (unwind-protect
 
 	      (with-current-buffer temp-buffer
-		  
+
 		(and
 		 uncompress-message
 		 (message "%s %s..." uncompress-message base-name))
-		  
+
 		;; Here we must read the output of uncompress program
 		;; and write it to TEMP-FILE without any code
 		;; conversion.  An appropriate code conversion (if
@@ -697,7 +697,7 @@ There should be no more than seven characters after the final `/'."
 	    (kill-buffer temp-buffer))
 
 	  temp-file)
-	    
+
       (jka-compr-run-real-handler 'file-local-copy (list filename)))))
 
 
@@ -865,7 +865,7 @@ by `jka-compr-installed'."
 		   (eq (nth 2 entry) 'jka-compr)))
 	  (setcdr last (cdr (cdr last)))
 	(setq last (cdr last))))
-    
+
     (setq auto-mode-alist (cdr ama)))
 
   (let* ((ama (cons nil file-coding-system-alist))
@@ -877,7 +877,7 @@ by `jka-compr-installed'."
       (if (member entry jka-compr-added-to-file-coding-system-alist)
 	  (setcdr last (cdr (cdr last)))
 	(setq last (cdr last))))
-    
+
     (setq file-coding-system-alist (cdr ama)))
 
   ;; Remove the suffixes that were added by jka-compr.
@@ -888,7 +888,7 @@ by `jka-compr-installed'."
 	(push suffix suffixes)))
     (setq load-suffixes (nreverse suffixes))))
 
-      
+
 (defun jka-compr-installed-p ()
   "Return non-nil if jka-compr is installed.
 The return value is the entry in `file-name-handler-alist' for jka-compr."
diff --git a/lisp/kermit.el b/lisp/kermit.el
index ee4f0d54480..a11163133ba 100644
--- a/lisp/kermit.el
+++ b/lisp/kermit.el
@@ -54,7 +54,7 @@
 ;; ^C^Q^C to send an interrupt, and ^C^Q^Z for a stop signal, etc.  (since ^C^C
 ;; just generates a local stop signal, which kermit ignores).
 ;; To connect to a VMS system, I use a shell script to invoke kermit thru the
-;; tr filter, do "M-X kermit-send-cr", and then tell VMS that I'm on a 
+;; tr filter, do "M-X kermit-send-cr", and then tell VMS that I'm on a
 ;; half-duplex terminal.
 
 ;; Some caveats:
@@ -84,14 +84,14 @@
 (defun kermit-esc ()
   "For sending escape sequences to a kermit running in shell mode."
   (interactive)
-  (process-send-string 
+  (process-send-string
    (get-buffer-process (current-buffer))
    (concat kermit-esc-char (char-to-string (read-char)))))
 
 (defun kermit-send-char ()
   "Send an arbitrary character to a program in shell mode."
   (interactive)
-  (process-send-string 
+  (process-send-string
    (get-buffer-process (current-buffer))
    (char-to-string (read-char))))
 
diff --git a/lisp/kmacro.el b/lisp/kmacro.el
index 4b890f206ca..db7b6b1fe9b 100644
--- a/lisp/kmacro.el
+++ b/lisp/kmacro.el
@@ -94,7 +94,7 @@
 ;; and you can set the macro counter format with C-x C-k C-f.
 
 ;; The following key bindings are performed:
-;; 
+;;
 ;;           Normal                         While defining macro
 ;;           ---------------------------    ------------------------------
 ;;  f3       Define macro                   Insert current counter value
@@ -102,13 +102,13 @@
 ;;           counter value (default 0)      (default increment: 1)
 ;;
 ;;  C-u f3   APPENDs to last macro
-;; 
-;;  f4       Call last macro                End macro 
+;;
+;;  f4       Call last macro                End macro
 ;;           Prefix arg specifies number
 ;;           of times to execute macro.
 ;;
 ;;  C-u f4   Swap last and head of macro ring.
-;; 
+;;
 ;;  S-mouse-3  Set point at click and       End macro and execute macro at
 ;;             execute last macro.          click.
 
@@ -339,7 +339,7 @@ Non-nil arg RAW means just return raw first element."
 Non-nil arg RAW means just return raw first element."
   (unless (kmacro-ring-empty-p)
     (kmacro-pop-ring1 raw)))
-      
+
 
 (defun kmacro-ring-length ()
   "Return length of macro ring, including pseudo head."
@@ -368,7 +368,7 @@ Check only `last-kbd-macro' if optional arg NONE is non-nil."
 	     (m (format-kbd-macro macro))
 	     (l (length m))
 	     (z (and nil trunc (> l x))))
-	(message (format "%s: %s%s" (or descr "Macro") 
+	(message (format "%s: %s%s" (or descr "Macro")
 			 (if z (substring m 0 (1- x)) m) (if z "..." ""))))
     (message (or empty "No keyboard macros defined"))))
 
@@ -439,7 +439,7 @@ Check only `last-kbd-macro' if optional arg NONE is non-nil."
     (kmacro-display (car (car kmacro-ring)) "2nd macro")))
 
 
-  
+
 (defun kmacro-cycle-ring-next (&optional arg)
   "Move to next keyboard macro in keyboard macro ring.
 Displays the selected macro in the echo area."
@@ -500,7 +500,7 @@ Displays the selected macro in the echo area."
 
 ;;; Traditional bindings:
 
-  
+
 ;;;###autoload
 (defun kmacro-start-macro (arg)
   "Record subsequent keyboard input, defining a keyboard macro.
@@ -527,7 +527,7 @@ The format of the counter can be modified via \\[kmacro-set-format]."
       (unless append
 	(if last-kbd-macro
 	    (let ((len (length kmacro-ring)))
-	      (setq kmacro-ring 
+	      (setq kmacro-ring
 		    (cons
 		     (list last-kbd-macro kmacro-counter kmacro-counter-format-start)
 		     kmacro-ring))
@@ -538,7 +538,7 @@ The format of the counter can be modified via \\[kmacro-set-format]."
 	      kmacro-last-counter kmacro-counter
 	      kmacro-counter-format-start kmacro-counter-format))
 
-      (start-kbd-macro append 
+      (start-kbd-macro append
 		       (and append
 			    (if kmacro-execute-before-append
 				(> (car arg) 4)
@@ -592,7 +592,7 @@ others, use M-x name-last-kbd-macro."
 		       kmacro-call-repeat-key)))
       (setq repeat-key-str (format-kbd-macro (vector repeat-key) nil))
       (while repeat-key
-	(message "(Type %s to repeat macro%s)" 
+	(message "(Type %s to repeat macro%s)"
 		 repeat-key-str
 		 (if (and kmacro-call-repeat-with-arg
 			  arg (> arg 1))
@@ -640,7 +640,7 @@ The format of the counter can be modified via \\[kmacro-set-format]."
 With numeric prefix ARG, repeat macro that many times.
 With \\[universal-argument], call second macro in macro ring."
   (interactive "P")
-  (cond 
+  (cond
    (defining-kbd-macro
      (if kmacro-call-repeat-key
 	 (kmacro-call-macro arg no-repeat t)
@@ -796,7 +796,7 @@ following additional answers: `insert', `insert-1', `replace', `replace-1',
 	      (format "Macro: %s%s%s%s%s\n"
 		      (format-kbd-macro kmacro-step-edit-new-macro 1)
 		      (if (and kmacro-step-edit-new-macro (> (length kmacro-step-edit-new-macro) 0)) " " "")
-		      (propertize (if keys (format-kbd-macro keys) 
+		      (propertize (if keys (format-kbd-macro keys)
 				    (if kmacro-step-edit-appending "<APPEND>" "<INSERT>")) 'face 'region)
 		      (if future " " "")
 		      (if future (format-kbd-macro future) ""))
@@ -813,7 +813,7 @@ following additional answers: `insert', `insert-1', `replace', `replace-1',
 			curmsg))
 	       (t ""))
 	      (if keys
-		  (format "%s\n%s%s %S [yn iIaArR C-k kq!] " 
+		  (format "%s\n%s%s %S [yn iIaArR C-k kq!] "
 			  (propertize "\
 --------------Step Edit Keyboard Macro  [?: help]---------------" 'face 'mode-line)
 			  (if kmacro-step-edit-help "\
@@ -826,7 +826,7 @@ following additional answers: `insert', `insert-1', `replace', `replace-1',
 " "")
 			  (propertize "Next command:" 'face 'bold)
 			  this-command)
-		(propertize 
+		(propertize
 		 (format "Type key sequence%s to insert and execute%s: "
 			 (if (numberp kmacro-step-edit-inserting) ""  "s")
 			 (if (numberp kmacro-step-edit-inserting) ""  " (end with C-j)"))
@@ -864,7 +864,7 @@ following additional answers: `insert', `insert-1', `replace', `replace-1',
 	  (clear-this-command-keys) ;; recent-keys actually
 	  (let (unread-command-events)
 	    (quoted-insert (prefix-numeric-value current-prefix-arg))
-	    (setq kmacro-step-edit-new-macro 
+	    (setq kmacro-step-edit-new-macro
 		  (vconcat kmacro-step-edit-new-macro (recent-keys)))
 	    (when unread-command-events
 	      (setq kmacro-step-edit-new-macro
@@ -957,7 +957,7 @@ following additional answers: `insert', `insert-1', `replace', `replace-1',
       (if (> executing-macro-index (or kmacro-step-edit-prefix-index kmacro-step-edit-key-index))
 	  (setq kmacro-step-edit-new-macro
 		(vconcat kmacro-step-edit-new-macro
-			 (substring executing-kbd-macro 
+			 (substring executing-kbd-macro
 				    (or kmacro-step-edit-prefix-index kmacro-step-edit-key-index)
 				    (if (eq act t) nil executing-macro-index)))
 		kmacro-step-edit-prefix-index nil))
@@ -1068,7 +1068,7 @@ following additional answers: `insert', `insert-1', `replace', `replace-1',
     (add-hook 'pre-command-hook 'kmacro-step-edit-pre-command nil nil)
     (if kmacro-step-edit-key-index
 	(setq executing-macro-index kmacro-step-edit-key-index)
-      (setq kmacro-step-edit-key-index executing-macro-index))))  
+      (setq kmacro-step-edit-key-index executing-macro-index))))
 
 
 (defun kmacro-step-edit-macro ()
diff --git a/lisp/lazy-lock.el b/lisp/lazy-lock.el
index 11303dfbd92..b335fb84058 100644
--- a/lisp/lazy-lock.el
+++ b/lisp/lazy-lock.el
@@ -38,7 +38,7 @@
 ;; See also the fast-lock package.  (But don't use them at the same time!)
 
 ;; Installation:
-;; 
+;;
 ;; Put in your ~/.emacs:
 ;;
 ;; (setq font-lock-support-mode 'lazy-lock-mode)
@@ -449,7 +449,7 @@ To reduce machine load during stealth fontification, at the cost of stealth
 taking longer to fontify, you could increase the value of this variable.
 See also `lazy-lock-stealth-load'."
   :type '(choice (const :tag "never" nil)
-		 (number :tag "seconds"))	  
+		 (number :tag "seconds"))
   :group 'lazy-lock)
 
 (defcustom lazy-lock-stealth-verbose
diff --git a/lisp/locate.el b/lisp/locate.el
index c467665a8e5..40e8ddc65c3 100644
--- a/lisp/locate.el
+++ b/lisp/locate.el
@@ -200,7 +200,7 @@ With prefix arg, prompt for the locate command to run."
 		       (+ 2 (length (car locate-cmd))))
 	      nil nil 'locate-history-list))
 	 (let* ((default (locate-word-at-point))
-	       (input 
+	       (input
 		(read-from-minibuffer
 		 (if  (> (length default) 0)
 		     (format "Locate (default `%s'): " default)
diff --git a/lisp/log-edit.el b/lisp/log-edit.el
index 54cf34c7be9..f51966ab220 100644
--- a/lisp/log-edit.el
+++ b/lisp/log-edit.el
@@ -4,7 +4,7 @@
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: pcl-cvs cvs commit log
-;; Revision: $Id: log-edit.el,v 1.16 2001/05/11 20:42:58 monnier Exp $
+;; Revision: $Id: log-edit.el,v 1.17 2001/10/30 04:32:58 monnier Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -38,9 +38,9 @@
 (require 'ring)
 (require 'vc)
 
-;;;; 
+;;;;
 ;;;; Global Variables
-;;;; 
+;;;;
 
 (defgroup log-edit nil
   "Major mode for editing RCS and CVS commit messages."
@@ -328,7 +328,7 @@ To select default log text, we:
   (interactive)
   (when (file-readable-p "CVS/Template")
     (insert-file-contents "CVS/Template")))
-  
+
 
 (defun log-edit-add-to-changelog ()
   "Insert this log message into the appropriate ChangeLog file."
@@ -341,10 +341,10 @@ To select default log text, we:
       (save-excursion
 	(vc-comment-to-change-log)))))
 
-;;;; 
+;;;;
 ;;;; functions for getting commit message from ChangeLog a file...
 ;;;; Courtesy Jim Blandy
-;;;; 
+;;;;
 
 (defun log-edit-narrow-changelog ()
   "Narrow to the top page of the current buffer, a ChangeLog file.
@@ -446,7 +446,7 @@ where LOGBUFFER is the name of the ChangeLog buffer, and each
 	(save-restriction
 	  (log-edit-narrow-changelog)
 	  (goto-char (point-min))
-	  
+
 	  ;; Search for the name of FILE relative to the ChangeLog.  If that
 	  ;; doesn't occur anywhere, they're not using full relative
 	  ;; filenames in the ChangeLog, so just look for FILE; we'll accept
diff --git a/lisp/log-view.el b/lisp/log-view.el
index ac854ba5d57..efa31cabdcf 100644
--- a/lisp/log-view.el
+++ b/lisp/log-view.el
@@ -4,7 +4,7 @@
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: rcs sccs cvs log version-control
-;; Revision: $Id: log-view.el,v 1.13 2001/12/31 20:25:41 rms Exp $
+;; Revision: $Id: log-view.el,v 1.14 2003/01/14 21:46:13 monnier Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -181,7 +181,7 @@
   (interactive "d")
   (save-excursion
     (goto-char pos)
-    (switch-to-buffer (vc-find-version (log-view-current-file) 
+    (switch-to-buffer (vc-find-version (log-view-current-file)
                                        (log-view-current-tag)))))
 
 ;;
diff --git a/lisp/lpr.el b/lisp/lpr.el
index 21e82208e6a..4d1ec5d77e7 100644
--- a/lisp/lpr.el
+++ b/lisp/lpr.el
@@ -164,7 +164,7 @@ If it is nil (the default), we run the `pr' program (or whatever program
 
 Otherwise, the switches in `lpr-headers-switches' are used
 in the print command itself; we expect them to request pagination.
- 
+
 See the variables `lpr-switches' and `lpr-command'
 for further customization of the printer command."
   (interactive)
@@ -189,7 +189,7 @@ If it is nil (the default), we run the `pr' program (or whatever program
 
 Otherwise, the switches in `lpr-headers-switches' are used
 in the print command itself; we expect them to request pagination.
- 
+
 See the variables `lpr-switches' and `lpr-command'
 for further customization of the printer command."
   (interactive "r")
diff --git a/lisp/macros.el b/lisp/macros.el
index 11fa2223a4e..ee3b16f7764 100644
--- a/lisp/macros.el
+++ b/lisp/macros.el
@@ -258,7 +258,7 @@ and mark at opposite ends of the quoted section, and use
 Suppose you wanted to build a keyword table in C where each entry
 looked like this:
 
-    { \"foo\", foo_data, foo_function }, 
+    { \"foo\", foo_data, foo_function },
     { \"bar\", bar_data, bar_function },
     { \"baz\", baz_data, baz_function },
 
diff --git a/lisp/makefile.nt b/lisp/makefile.nt
index ac47c64c0b2..2b6b435a263 100644
--- a/lisp/makefile.nt
+++ b/lisp/makefile.nt
@@ -3,17 +3,17 @@
 #  Copyright (c) 1994 Free Software Foundation, Inc.
 #
 #  This file is part of GNU Emacs.
-#  
+#
 #  GNU Emacs is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation; either version 2, or (at your option)
 #  any later version.
-#  
+#
 #  GNU Emacs is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #  GNU General Public License for more details.
-#  
+#
 #  You should have received a copy of the GNU General Public License
 #  along with GNU Emacs; see the file COPYING.  If not, write to the
 #  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -265,7 +265,7 @@ install:
 
 #
 # Maintenance
-# 
+#
 clean:
 	- $(DEL) *~ term\*~
 	- $(DEL) *.orig *.rej *.crlf
diff --git a/lisp/man.el b/lisp/man.el
index 855565242e2..ed3fbf5d66b 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -618,7 +618,7 @@ all sections related to a subject, put something appropriate into the
 	     (start-process manual-program buffer "sh" "-c"
 			    (format (Man-build-man-command) man-args))
 	     'Man-bgproc-sentinel)
-	  (let ((process-environment 
+	  (let ((process-environment
 		 (cons "GROFF_NO_SGR=1" process-environment)))
 
 	    (let ((exit-status
diff --git a/lisp/master.el b/lisp/master.el
index 115823e3087..2ef728cdcdf 100644
--- a/lisp/master.el
+++ b/lisp/master.el
@@ -51,14 +51,14 @@
 ;; Rob Riepel <networking.stanford.edu>
 
 ;;; History:
-;; 
+;;
 
 ;;; Code:
 
 (require 'easy-mmode)
 
 ;; Variables that don't need initialization.
-  
+
 (defvar master-of nil
   "Slave buffer of the current buffer.  See `master-mode'.
 You can set this variable using `master-set-slave'.")
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 9698cd4de91..3c93983b939 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -1299,7 +1299,7 @@ key (or menu-item)"))
 
 (defun help-with-tutorial-spec-language ()
   "Use the Emacs tutorial, specifying which language you want."
-  (interactive) 
+  (interactive)
   (help-with-tutorial t))
 
 (define-key menu-bar-help-menu [emacs-tutorial-language-specific]
diff --git a/lisp/minibuf-eldef.el b/lisp/minibuf-eldef.el
index 339fc38c096..a9fa32d1273 100644
--- a/lisp/minibuf-eldef.el
+++ b/lisp/minibuf-eldef.el
@@ -51,7 +51,7 @@ regexp subexpression that matched.")
 
 ;; A list of minibuffers to which we've added a post-command-hook.
 (defvar minibuf-eldef-frobbed-minibufs nil)
-      
+
 ;;; The following are all local variables in the minibuffer
 
 ;; Input pre-inserted into the minibuffer before the user can edit it.
diff --git a/lisp/mouse-copy.el b/lisp/mouse-copy.el
index 70a5b14e7b6..259eb629568 100644
--- a/lisp/mouse-copy.el
+++ b/lisp/mouse-copy.el
@@ -151,7 +151,7 @@ If you have the bug (or the real fix :-), please let me know."
       (set-buffer end-buffer)
       (x-set-selection 'SECONDARY (buffer-substring beg end)))))
 
-    
+
 (defun mouse-drag-secondary-pasting (start-event)
   "Drag out a secondary selection, then paste it at the current point.
 
@@ -182,7 +182,7 @@ put the point at one place, then click and drag over some other region."
 	(insert (x-get-selection 'SECONDARY))
 	(setq mouse-copy-last-paste-end (point)))
     (setq mouse-copy-last-paste-start nil)))
-  
+
 
 (defun mouse-kill-preserving-secondary ()
   "Kill the text in the secondary selection, but leave the selection set.
diff --git a/lisp/msb.el b/lisp/msb.el
index 5c318420376..453dcb71995 100644
--- a/lisp/msb.el
+++ b/lisp/msb.el
@@ -41,11 +41,11 @@
 ;;   There are some constants for you to try here:
 ;;   msb--few-menus
 ;;   msb--very-many-menus (default)
-;;   
+;;
 ;;   Look at the variable `msb-item-handling-function' for customization
 ;;   of the appearance of every menu item.  Try for instance setting
 ;;   it to `msb-alon-item-handler'.
-;;  
+;;
 ;;   Look at the variable `msb-item-sort-function' for customization
 ;;   of sorting the menus.  Set it to t for instance, which means no
 ;;   sorting - you will get latest used buffer first.
@@ -320,7 +320,7 @@ No buffers at all if less than 1 or nil (or any non-number)."
   :type 'string
   :set 'msb-custom-set
   :group 'msb)
- 
+
 (defvar msb-horizontal-shift-function '(lambda () 0)
   "*Function that specifies how many pixels to shift the top menu leftwards.")
 
@@ -362,7 +362,7 @@ Set this to nil or t if you don't want any sorting (faster)."
 		 (const :tag "Oldest first" nil))
   :set 'msb-custom-set
   :group 'msb)
-		
+
 (defcustom msb-files-by-directory nil
   "*Non-nil means that files should be sorted by directory.
 This is instead of the groups in `msb-menu-cond'."
@@ -729,7 +729,7 @@ to the buffer-list variable in function-info."
 			      max-buffer-name-length)
 		     buffer)
 	       (eval list-symbol)))))
- 
+
 (defsubst msb--choose-menu (buffer function-info-vector max-buffer-name-length)
   "Select the appropriate menu for BUFFER."
   ;; This is all side-effects, folks!
diff --git a/lisp/mwheel.el b/lisp/mwheel.el
index 546d27dd345..97bed138b84 100644
--- a/lisp/mwheel.el
+++ b/lisp/mwheel.el
@@ -204,7 +204,7 @@ This should only be bound to mouse buttons 4 and 5."
     (if mwheel-inhibit-click-event-timer
 	(cancel-timer mwheel-inhibit-click-event-timer)
       (add-hook 'pre-command-hook 'mwheel-filter-click-events))
-    (setq mwheel-inhibit-click-event-timer 
+    (setq mwheel-inhibit-click-event-timer
 	  (run-with-timer mouse-wheel-inhibit-click-time nil
 			  'mwheel-inhibit-click-timeout))))
 
diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index 52f9544a7fd..e108264903c 100644
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -262,7 +262,7 @@ This is obsolete because you might as well use \\[newline-and-indent]."
 		     (if (and comment-quote-nested (<= (length ce) 1)) "" "+")
 		     (regexp-quote (substring ce 1))
 		     "\\)"))))))
- 
+
 (defun comment-quote-re (str unp)
   (concat (regexp-quote (substring str 0 1))
 	  "\\\\" (if unp "+" "*")
@@ -789,7 +789,7 @@ rather than at left margin."
     (unless block (setq cce nil))
     ;; Continuation defaults to the same as CS and CE.
     (unless ccs (setq ccs cs cce ce))
-    
+
     (save-excursion
       (goto-char end)
       ;; If the end is not at the end of a line and the comment-end
@@ -811,7 +811,7 @@ rather than at left margin."
 		(end-of-line)
 		(setq max-indent (max max-indent (current-column)))
 		(not (or (eobp) (progn (forward-line) nil)))))
-	  
+
 	  ;; Inserting ccs can change max-indent by (1- tab-width).
 	  (setq max-indent
 		(+ max-indent (max (length cs) (length ccs)) tab-width -1))
@@ -824,7 +824,7 @@ rather than at left margin."
 		    cs ce ccs cce min-indent max-indent block)))
 	      (setq cs (car csce))
 	      (setq ce (cdr csce))))
-	  
+
 	  (goto-char (point-min))
 	  ;; Loop over all lines from BEG to END.
 	  (while
diff --git a/lisp/options.el b/lisp/options.el
index b7684034695..53a67516b2f 100644
--- a/lisp/options.el
+++ b/lisp/options.el
@@ -52,7 +52,7 @@ It is now better to use Customize instead."
 	    (princ ":\n\t")
 	    (prin1 (symbol-value sym))
 	    (terpri)
-	    (princ (substitute-command-keys 
+	    (princ (substitute-command-keys
 		    (documentation-property sym 'variable-documentation)))
 	    (princ "\n;;\n"))
 	  (setq vars (cdr vars))))
diff --git a/lisp/paren.el b/lisp/paren.el
index a88c1f39857..60c9aef0f39 100644
--- a/lisp/paren.el
+++ b/lisp/paren.el
@@ -64,13 +64,13 @@ otherwise)."
   :type 'integer
   :group 'paren-showing
   :version "21.1")
-  
+
 (defcustom show-paren-ring-bell-on-mismatch nil
   "*If non-nil, beep if mismatched paren is detected."
   :type 'boolean
   :group 'paren-showing
   :version "20.3")
-  
+
 (defface show-paren-match-face
   '((((class color) (background light))
      :background "turquoise")		; looks OK on tty (becomes cyan)
diff --git a/lisp/paths.el b/lisp/paths.el
index b4e18c5e01f..f0d5a8d5cd9 100644
--- a/lisp/paths.el
+++ b/lisp/paths.el
@@ -139,7 +139,7 @@ The `ORGANIZATION' environment variable is used instead if defined.")
 (defconst rmail-spool-directory
   (cond ((string-match "^[^-]+-[^-]+-sco3.2v4" system-configuration)
 	 "/usr/spool/mail/")
-	;; On The Bull DPX/2 /usr/spool/mail is used although 
+	;; On The Bull DPX/2 /usr/spool/mail is used although
 	;; it is usg-unix-v.
 	((string-match "^m68k-bull-sysv3" system-configuration)
 	 "/usr/spool/mail/")
@@ -193,7 +193,7 @@ If non-nil, Emacs startup does (load (concat term-file-prefix (getenv \"TERM\"))
 You may set this variable to nil in your `.emacs' file if you do not wish
 the terminal-initialization file to be loaded.")
 
-(defconst abbrev-file-name 
+(defconst abbrev-file-name
   (if (eq system-type 'vax-vms)
       "~/abbrev.def"
     (convert-standard-filename "~/.abbrev_defs"))
diff --git a/lisp/pcvs-info.el b/lisp/pcvs-info.el
index 2c78dd38f66..2f0e92a1668 100644
--- a/lisp/pcvs-info.el
+++ b/lisp/pcvs-info.el
@@ -4,7 +4,7 @@
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: pcl-cvs
-;; Revision: $Id: pcvs-info.el,v 1.13 2002/09/11 01:56:47 rms Exp $
+;; Revision: $Id: pcvs-info.el,v 1.14 2003/01/14 21:53:39 monnier Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -170,7 +170,7 @@ to confuse some users sometimes."
                 ;; untouched version resides.
 
   ;; The meaning of the type field:
-  
+
   ;; Value	      ---Used by---	Explanation
   ;; 		      update status
   ;; NEED-UPDATE		x	file needs update
@@ -269,9 +269,9 @@ to confuse some users sometimes."
       (error "Invalid :%s in cvs-fileinfo %s" check fi))))
 
 
-;;;; 
+;;;;
 ;;;; State table to indicate what you can do when.
-;;;; 
+;;;;
 
 (defconst cvs-states
   `((NEED-UPDATE	update diff)
diff --git a/lisp/pcvs-parse.el b/lisp/pcvs-parse.el
index 4e008877da6..1b2db2eb18a 100644
--- a/lisp/pcvs-parse.el
+++ b/lisp/pcvs-parse.el
@@ -5,7 +5,7 @@
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: pcl-cvs
-;; Revision: $Id: pcvs-parse.el,v 1.12 2002/06/24 22:49:06 monnier Exp $
+;; Revision: $Id: pcvs-parse.el,v 1.13 2002/09/03 01:23:15 monnier Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -202,7 +202,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'."
   "Table of message objects for `cvs-parse-process'."
   (let (c file dir path type base-rev subtype)
     (cvs-or
-     
+
      (cvs-parse-status)
      (cvs-parse-merge)
      (cvs-parse-commit)
@@ -211,7 +211,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'."
      ;; such duplicate info and luckily the second info is the one we want.
      ;; (and (cvs-match "M \\(.*\\)$" (path 1))
      ;;      (cvs-parse-merge path))
-     
+
      ;; Normal file state indicator.
      (and
       (cvs-match "\\([MARCUPNJ?]\\) \\(.*\\)$" (c 1) (path 2))
@@ -311,7 +311,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'."
 				 'MISSING
 			       '(UP-TO-DATE . UPDATED))
 			     path))
-     
+
        ;; Mode conflicts (rather than contents)
        (and
 	(cvs-match "conflict: ")
@@ -333,7 +333,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'."
 	 (cvs-match "sticky tag .* for file `\\(.*\\)' is not a branch$"
 		    (file 1)))
 	(cvs-parsed-fileinfo 'MESSAGE file))
-     
+
        ;; File unknown.
        (and (cvs-match "use `.+ add' to create an entry for \\(.*\\)$" (path 1))
 	    (cvs-parsed-fileinfo 'UNKNOWN path))
@@ -351,7 +351,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'."
 	     'MESSAGE "" " "
 	     "*** Add (setq cvs-execute-single-dir t) to your .emacs ***
 	See the FAQ file or the variable's documentation for more info."))
-       
+
        ;; Cvs waits for a lock.  Ignored: already handled by the process filter
        (cvs-match "\\[..:..:..\\] \\(waiting for\\|obtained\\) .*lock in .*$")
        ;; File you removed still exists.  Ignore (will be noted as removed).
@@ -368,7 +368,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'."
        (cvs-match "Rebuilding administrative file database$")
        ;; ???
        (cvs-match "--> Using per-directory sticky tag `.*'")
-     
+
        ;; CVS is running a *info program.
        (and
 	(cvs-match "Executing.*$")
@@ -380,7 +380,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'."
      (and
       (cvs-match "cvs[.ex]* \\[[a-z]+ aborted\\]:.*$")
       (cvs-parsed-fileinfo 'MESSAGE ""))
-     
+
      ;; sadly you can't do much with these since the path is in the repository
      (cvs-match "Directory .* added to the repository$")
      )))
@@ -502,7 +502,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'."
 	;; a `current-dir' set to something different from ""
 	(cvs-parsed-fileinfo (cons 'UP-TO-DATE subtype) path 'trust
 			     :base-rev base-rev)))
-     
+
      ;; useless message added before the actual addition: ignored
      (cvs-match "RCS file: .*\ndone$"))))
 
diff --git a/lisp/pcvs-util.el b/lisp/pcvs-util.el
index 849bbd69f4f..78e420babc7 100644
--- a/lisp/pcvs-util.el
+++ b/lisp/pcvs-util.el
@@ -5,7 +5,7 @@
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: pcl-cvs
-;; Revision: $Id: pcvs-util.el,v 1.16 2001/12/02 07:41:47 monnier Exp $
+;; Revision: $Id: pcvs-util.el,v 1.17 2001/12/20 18:43:07 pj Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -50,7 +50,7 @@
   (let ((zs ys))
     (dolist (x xs zs)
       (unless (member x ys) (push x zs)))))
-      
+
 
 (defun cvs-map (-cvs-map-f &rest -cvs-map-ls)
   (unless (cvs-every 'null -cvs-map-ls)
@@ -135,7 +135,7 @@ BUF is assumed to be a temporary buffer used from the buffer MAINBUF."
       (let ((mainwin (or (get-buffer-window mainbuf)
 			 (get-buffer-window mainbuf 'visible))))
 	(when mainwin (select-window mainwin))))))
-	      
+
 (defun cvs-get-buffer-create (name &optional noreuse)
   "Create a buffer NAME unless such a buffer already exists.
 If the NAME looks like an absolute file name, the buffer will be created
@@ -231,9 +231,9 @@ The SEPARATOR regexp defaults to \"\\s-+\"."
 		      (cvs-string->strings (substring string (cdr rfs))
 					   sep)))))))
 
-;;;; 
+;;;;
 ;;;; file names
-;;;; 
+;;;;
 
 (defsubst cvs-expand-dir-name (d)
   (file-name-as-directory (expand-file-name d)))
@@ -273,9 +273,9 @@ The SEPARATOR regexp defaults to \"\\s-+\"."
 				initval hist-sym))
 	      (t initval)))))
 
-;;;; 
+;;;;
 ;;;; Flags handling
-;;;; 
+;;;;
 
 (defstruct (cvs-flags
 	    (:constructor nil)
@@ -335,9 +335,9 @@ If it is \\[universal-argument] \\[universal-argument], behave just
   "Set SYM's INDEX'th setting to VALUE."
   (setf (nth index (cvs-flags-defaults (symbol-value sym))) value))
 
-;;;; 
+;;;;
 ;;;; Prefix keys
-;;;; 
+;;;;
 
 (defconst cvs-prefix-number 10)
 
diff --git a/lisp/pcvs.el b/lisp/pcvs.el
index 32631c09da9..cc3fedaf62a 100644
--- a/lisp/pcvs.el
+++ b/lisp/pcvs.el
@@ -14,7 +14,7 @@
 ;;	(Jari Aalto+mail.emacs) jari.aalto@poboxes.com
 ;; Maintainer: (Stefan Monnier) monnier+lists/cvs/pcl@flint.cs.yale.edu
 ;; Keywords: CVS, version control, release management
-;; Revision: $Id: pcvs.el,v 1.45 2002/11/18 20:53:24 rost Exp $
+;; Revision: $Id: pcvs.el,v 1.46 2002/12/05 15:23:37 monnier Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -60,7 +60,7 @@
 ;;; Todo:
 
 ;; ******** FIX THE DOCUMENTATION *********
-;; 
+;;
 ;; - rework the displaying of error messages.
 ;; - allow to flush messages only
 ;; - allow to protect files like ChangeLog from flushing
@@ -72,7 +72,7 @@
 ;; - allow cvs-confirm-removals to force always confirmation.
 ;; - cvs-checkout should ask for a revision (with completion).
 ;; - removal confirmation should allow specifying another file name.
-;; 
+;;
 ;; - hide fileinfos without getting rid of them (will require ewok work).
 ;; - add toolbar entries
 ;; - marking
diff --git a/lisp/ps-bdf.el b/lisp/ps-bdf.el
index 3f98e527bd7..00d5e1e15f4 100644
--- a/lisp/ps-bdf.el
+++ b/lisp/ps-bdf.el
@@ -224,7 +224,7 @@ CODE, where N and CODE are in the following relation:
 	 (relative-compose 'false)
 	 (baseline-offset 0)
 	 size
-	 font-bounding-box 
+	 font-bounding-box
 	 default-char
 	 code-range
 	 offset-vector)
diff --git a/lisp/rect.el b/lisp/rect.el
index 1fa5900b2c9..c6b83995b73 100644
--- a/lisp/rect.el
+++ b/lisp/rect.el
@@ -187,7 +187,7 @@ the function is called."
 	(setq val (concat "        " val)
 	      n (- n 8)))
       (concat val (aref spaces-strings n)))))
-    
+
 ;;;###autoload
 (defun delete-rectangle (start end &optional fill)
   "Delete (don't save) text in the region-rectangle.
diff --git a/lisp/register.el b/lisp/register.el
index ad65d4b7401..17c804afbd9 100644
--- a/lisp/register.el
+++ b/lisp/register.el
@@ -233,7 +233,7 @@ The Lisp value REGISTER is a character."
 	  (progn
 	    (princ "the text:\n")
 	    (princ val))
-	(cond 
+	(cond
 	 ;; Extract first N characters starting with first non-whitespace.
 	 ((string-match (format "[^ \t\n].\\{,%d\\}"
 				;; Deduct 6 for the spaces inserted below.
diff --git a/lisp/repeat.el b/lisp/repeat.el
index 667303076dd..ae2cc97498a 100644
--- a/lisp/repeat.el
+++ b/lisp/repeat.el
@@ -126,7 +126,7 @@ only occurs if the final character by which `repeat' was invoked is a
 member of that sequence.  If this variable is nil, no re-execution occurs."
   :group 'convenience
   :type 'boolean)
-  
+
 ;;;;; ****************** HACKS TO THE REST OF EMACS ******************* ;;;;;
 
 ;; The basic strategy is to use last-command, a variable built in to Emacs.
@@ -262,7 +262,7 @@ can be modified by the global variable `repeat-on-final-keystroke'."
                          (setq repeat-last-self-insert
                                (buffer-substring (car range)
                                                  (cdr range)))
-                       (error (error "%s %s %s" ;Danger, Will Robinson! 
+                       (error (error "%s %s %s" ;Danger, Will Robinson!
                                      "repeat can't intuit what you"
                                      "inserted before auto-fill"
                                      "clobbered it, sorry")))))))
diff --git a/lisp/replace.el b/lisp/replace.el
index 18817d39fc0..14bbb6fb9ad 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -678,7 +678,7 @@ This function acts on multiple buffers; otherwise, it is exactly like
 	   (buf nil)
 	   (ido-ignore-item-temp-list bufs))
       (while (not (string-equal
-		   (setq buf (read-buffer 
+		   (setq buf (read-buffer
 			      (if (eq read-buffer-function 'ido-read-buffer)
 				  "Next buffer to search (C-j to end): "
 				"Next buffer to search (RET to end): ")
diff --git a/lisp/resume.el b/lisp/resume.el
index 5e14679974d..36d35ac13a7 100644
--- a/lisp/resume.el
+++ b/lisp/resume.el
@@ -84,7 +84,7 @@
 	    ;; arguments are now in reverse order
 	    (setq args (nreverse args))
 	    ;; make sure they're not read again
-	    (erase-buffer))		
+	    (erase-buffer))
 	  (resume-write-buffer-to-file (current-buffer) resume-emacs-args-file)
 	  ;; if nothing was in buffer, args will be null
 	  (or (null args)
diff --git a/lisp/rot13.el b/lisp/rot13.el
index 2c82a82c226..c427ef3af86 100644
--- a/lisp/rot13.el
+++ b/lisp/rot13.el
@@ -25,7 +25,7 @@
 ;;; Commentary:
 
 ;; The entry point, `rot13-other-window', performs a Caesar cipher
-;; encrypt/decrypt on the current buffer and displays the result in another 
+;; encrypt/decrypt on the current buffer and displays the result in another
 ;; window.  Rot13 encryption is sometimes used on USENET as a read-at-your-
 ;; own-risk wrapper for material some might consider offensive, such as
 ;; ethnic humor.
diff --git a/lisp/ruler-mode.el b/lisp/ruler-mode.el
index 10d7a411ba1..4727af23da6 100644
--- a/lisp/ruler-mode.el
+++ b/lisp/ruler-mode.el
@@ -179,7 +179,7 @@ or remove a tab stop.  \\[ruler-mode-toggle-show-tab-stops] or
           (integer :tag "Integer char value"
                    :validate ruler-mode-character-validate)))
 
-(defcustom ruler-mode-margins-char ?\ 
+(defcustom ruler-mode-margins-char ?\
   "*Character used in margin areas."
   :group 'ruler-mode
   :type '(choice
diff --git a/lisp/s-region.el b/lisp/s-region.el
index f7cabf012b7..2b53bfa7f5c 100644
--- a/lisp/s-region.el
+++ b/lisp/s-region.el
@@ -32,7 +32,7 @@
 
 ;; Currently, s-region-move may be bound only to events that are vectors
 ;; of length one and whose last element is a symbol.  Also, the functions
-;; that are given this kind of overlay should be (interactive "p") 
+;; that are given this kind of overlay should be (interactive "p")
 ;; functions.
 
 ;; If the following keys are not already bound then...
diff --git a/lisp/saveplace.el b/lisp/saveplace.el
index f3b99e6cdd8..3211a055335 100644
--- a/lisp/saveplace.el
+++ b/lisp/saveplace.el
@@ -172,7 +172,7 @@ To save places automatically in all files, put this in your `.emacs' file:
                 (delete-region (point-min) (point-max))
                 (insert-file-contents file)
                 (goto-char (point-min))
-                (setq save-place-alist 
+                (setq save-place-alist
                       (car (read-from-string
                             (buffer-substring (point-min) (point-max)))))
 
@@ -192,7 +192,7 @@ To save places automatically in all files, put this in your `.emacs' file:
                               (setcdr s nil)
                             (setq count (1+ count)))
                           (setq s (cdr s))))))
-                  
+
                 (kill-buffer (current-buffer))
                 (message "Loading places from %s...done" file)))
           nil))))
diff --git a/lisp/scroll-all.el b/lisp/scroll-all.el
index c17b251353f..f3bd3d334ff 100644
--- a/lisp/scroll-all.el
+++ b/lisp/scroll-all.el
@@ -99,7 +99,7 @@
 	 (call-interactively 'scroll-all-beginning-of-buffer-all))
 	((eq this-command 'end-of-buffer)
 	 (call-interactively 'scroll-all-end-of-buffer-all))))
- 
+
 
 ;;;###autoload
 (define-minor-mode scroll-all-mode
diff --git a/lisp/shadowfile.el b/lisp/shadowfile.el
index 56479c0399f..6b7eb8744c4 100644
--- a/lisp/shadowfile.el
+++ b/lisp/shadowfile.el
@@ -406,7 +406,7 @@ expansion or contraction, you must do that yourself first."
 	(if regexp
 	    (string-match (nth 2 pattern-sup) (nth 2 file-sup))
 	  (string-equal (nth 2 pattern-sup) (nth 2 file-sup))))))
- 
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; User-level Commands
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -497,7 +497,7 @@ Each site can be either a hostname or the name of a cluster \(see
 	  (cons (shadow-make-group regexp sites usernames)
 		shadow-regexp-groups))
     (shadow-write-info-file)))
-    
+
 (defun shadow-shadows ()
   ;; Mostly for debugging.
   "Interactive function to display shadows of a buffer."
diff --git a/lisp/simple.el b/lisp/simple.el
index 27f301b4261..90ebd908dfb 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -955,7 +955,7 @@ as an argument limits undo to changes within the current region."
   (let ((modified (buffer-modified-p))
 	(recent-save (recent-auto-save-p)))
     (or (eq (selected-window) (minibuffer-window))
-	(message (if (and transient-mark-mode mark-active) 
+	(message (if (and transient-mark-mode mark-active)
 		     "Undo in region!"
 		   "Undo!")))
     (unless (eq last-command 'undo)
@@ -1004,8 +1004,8 @@ Some change-hooks test this variable to do something different.")
 Call `undo-start' to get ready to undo recent changes,
 then call `undo-more' one or more times to undo them."
   (or pending-undo-list
-      (error (format "No further undo information%s" 
-		     (if (and transient-mark-mode mark-active) 
+      (error (format "No further undo information%s"
+		     (if (and transient-mark-mode mark-active)
 			 " for region" ""))))
   (let ((undo-in-progress t))
     (setq pending-undo-list (primitive-undo count pending-undo-list))))
@@ -1528,7 +1528,7 @@ specifies the value of ERROR-BUFFER."
 					 nil shell-command-switch command)))
 	  ;; Report the output.
 	  (with-current-buffer buffer
-	    (setq mode-line-process 
+	    (setq mode-line-process
 		  (cond ((null exit-status)
 			 " - Error")
 			((stringp exit-status)
@@ -1765,7 +1765,7 @@ Optional second argument REPLACE non-nil means that STRING will replace
 the front of the kill ring, rather than being added to the list.
 
 Optional third arguments YANK-HANDLER controls how the STRING is later
-inserted into a buffer; see `insert-for-yank' for details.  
+inserted into a buffer; see `insert-for-yank' for details.
 When a yank handler is specified, STRING must be non-empty (the yank
 handler is stored as a `yank-handler'text property on STRING).
 
@@ -1774,11 +1774,11 @@ argument is not used by `insert-for-yank'.  However, since Lisp code
 may access and use elements from the kill-ring directly, the STRING
 argument should still be a \"useful\" string for such uses."
   (if (> (length string) 0)
-      (if yank-handler 
+      (if yank-handler
 	  (put-text-property 0 1 'yank-handler yank-handler string)
 	(remove-list-of-text-properties 0 1 '(yank-handler) string))
     (if yank-handler
-	(signal 'args-out-of-range 
+	(signal 'args-out-of-range
 		(list string "yank-handler specified for empty string"))))
   (if (fboundp 'menu-bar-update-yank-menu)
       (menu-bar-update-yank-menu string (and replace (car kill-ring))))
@@ -1798,7 +1798,7 @@ Optional third argument YANK-HANDLER specifies the yank-handler text
 property to be set on the combined kill ring string.  If the specified
 yank-handler arg differs from the yank-handler property of the latest
 kill string, STRING is added as a new kill ring element instead of
-being appending to the last kill. 
+being appending to the last kill.
 If `interprogram-cut-function' is set, pass the resulting kill to it."
   (let* ((cur (car kill-ring)))
     (kill-new (if before-p (concat string cur) (concat cur string))
@@ -1868,7 +1868,7 @@ the text killed this time appends to the text killed last time
 to make one entry in the kill ring.
 
 In Lisp code, optional third arg YANK-HANDLER specifies the yank-handler
-text property to be set on the killed text.  See `insert-for-yank'." 
+text property to be set on the killed text.  See `insert-for-yank'."
   (interactive "r")
   (condition-case nil
       (let ((string (delete-and-extract-region beg end)))
@@ -2537,7 +2537,7 @@ and it reactivates the mark.
 With prefix arg, `transient-mark-mode' is enabled temporarily."
   (interactive "P")
   (if arg
-      (if mark-active 
+      (if mark-active
 	  (if (null transient-mark-mode)
 	      (setq transient-mark-mode 'lambda))
 	(setq arg nil)))
@@ -3152,7 +3152,7 @@ Setting this variable automatically makes it local to the current buffer.")
 	       (not (and fill-indent-according-to-mode
 			 (string-match "\\`[ \t]*\\'" prefix)))
 	       (setq fill-prefix prefix))))
-      
+
       (while (and (not give-up) (> (current-column) fc))
 	;; Determine where to split the line.
 	(let* (after-prefix
@@ -3740,7 +3740,7 @@ With a prefix argument, set VARIABLE to VALUE buffer-locally."
 
   (if make-local
       (make-local-variable var))
-	
+
   (set var val)
 
   ;; Force a thorough redisplay for the case that the variable
@@ -3908,7 +3908,7 @@ to decide what to delete."
 		 (not (equal buffer
 			     (window-buffer (active-minibuffer-window))))))
 	(error "Minibuffer is not active for completion")
-      (unless (run-hook-with-args-until-success 
+      (unless (run-hook-with-args-until-success
 	       'choose-completion-string-functions
 	       choice buffer mini-p base-size)
 	;; Insert the completion into the buffer where it was requested.
@@ -4405,10 +4405,10 @@ See also `normal-erase-is-backspace'."
 ;    (message "You cannot modify the prompt")))
 ;
 ;
-;(setq minibuffer-prompt-properties 
+;(setq minibuffer-prompt-properties
 ;  (list 'modification-hooks '(minibuffer-prompt-modification)
 ;	'insert-in-front-hooks '(minibuffer-prompt-insertion)))
-;  
+;
 
 (provide 'simple)
 ;;; simple.el ends here
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el
index b8fad744afb..108eff07759 100644
--- a/lisp/smerge-mode.el
+++ b/lisp/smerge-mode.el
@@ -4,7 +4,7 @@
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: merge diff3 cvs conflict
-;; Revision: $Id: smerge-mode.el,v 1.19 2002/10/10 13:01:14 monnier Exp $
+;; Revision: $Id: smerge-mode.el,v 1.20 2002/10/10 17:30:20 monnier Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -203,7 +203,7 @@ Can be nil if the style is undecided, or else:
 	     (save-excursion (goto-char (point-min))
 			     (not (re-search-forward smerge-begin-re nil t))))
     (smerge-mode -1)))
-    
+
 
 (defun smerge-keep-all ()
   "Keep all three versions.
@@ -337,7 +337,7 @@ An error is raised if not inside a conflict."
 
 	       (_ (re-search-forward smerge-end-re))
 	       (_ (assert (< orig-point (match-end 0))))
-	       
+
 	       (other-end (match-beginning 0))
 	       (end (match-end 0))
 
@@ -370,7 +370,7 @@ An error is raised if not inside a conflict."
 	   (setq base-end   mine-end)
 	   (setq mine-start other-start)
 	   (setq mine-end   other-end)))
-	       
+
 	  (store-match-data (list start end
 				  mine-start mine-end
 				  base-start base-end
@@ -469,7 +469,7 @@ buffer names."
       (buffer-enable-undo)
       (set-buffer-modified-p nil)
       (funcall mode))
-    
+
     (when base
       (setq base (generate-new-buffer
 		  (or name-base (concat "*" filename " BASE*"))))
@@ -482,7 +482,7 @@ buffer names."
 	(buffer-enable-undo)
 	(set-buffer-modified-p nil)
 	(funcall mode)))
-    
+
     ;; the rest of the code is inspired from vc.el
     ;; Fire up ediff.
     (set-buffer
@@ -491,7 +491,7 @@ buffer names."
 	  ;; nil 'ediff-merge-revisions-with-ancestor buffer-file-name)
        (ediff-merge-buffers mine other)))
         ;; nil 'ediff-merge-revisions buffer-file-name)))
-    
+
     ;; Ediff is now set up, and we are in the control buffer.
     ;; Do a few further adjustments and take precautions for exit.
     (set (make-local-variable 'smerge-ediff-windows) config)
diff --git a/lisp/sort.el b/lisp/sort.el
index 09123f42ab7..e7390aed512 100644
--- a/lisp/sort.el
+++ b/lisp/sort.el
@@ -97,7 +97,7 @@ same as ENDRECFUN."
 				   ((consp (car (car sort-lists)))
 				    (function
 				     (lambda (a b)
-				       (> 0 (compare-buffer-substrings 
+				       (> 0 (compare-buffer-substrings
 					     nil (car a) (cdr a)
 					     nil (car b) (cdr b))))))
 				   (t
@@ -108,7 +108,7 @@ same as ENDRECFUN."
 			      ((consp (car (car sort-lists)))
 			       (function
 				(lambda (a b)
-				  (> 0 (compare-buffer-substrings 
+				  (> 0 (compare-buffer-substrings
 					nil (car (car a)) (cdr (car a))
 					nil (car (car b)) (cdr (car b)))))))
 			      (t
@@ -205,7 +205,7 @@ same as ENDRECFUN."
 	(delete-region min (1+ min))))))
 
 ;;;###autoload
-(defun sort-lines (reverse beg end) 
+(defun sort-lines (reverse beg end)
   "Sort lines in region alphabetically; argument means descending order.
 Called from a program, there are three arguments:
 REVERSE (non-nil means reverse order), BEG and END (region to sort).
@@ -429,7 +429,7 @@ For example: to sort lines in the region by the first word on each line
   ;; using negative prefix arg to mean "reverse" is now inconsistent with
   ;; other sort-.*fields functions but then again this was before, since it
   ;; didn't use the magnitude of the arg to specify anything.
-  (interactive "P\nsRegexp specifying records to sort: 
+  (interactive "P\nsRegexp specifying records to sort:
 sRegexp specifying key within record: \nr")
   (cond ((or (equal key-regexp "") (equal key-regexp "\\&"))
 	 (setq key-regexp 0))
diff --git a/lisp/soundex.el b/lisp/soundex.el
index 89094e326e4..f0c5445817a 100644
--- a/lisp/soundex.el
+++ b/lisp/soundex.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1993 Free Software Foundation, Inc.
 
 ;; Author: Christian Plaunt <chris@bliss.berkeley.edu>
-;; Maintainer: FSF 
+;; Maintainer: FSF
 ;; Keywords: matching
 ;; Created: Sat May 15 14:48:18 1993
 
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index 9af94658f0b..992571e9c15 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -932,7 +932,7 @@ This basically creates a sparse keymap, and makes it's parent be
 		     (looking-at "[0-9]+: *\\[[+-]\\] [^ \n]+ \\*?[!#]$"))]
     )
   "Additional menu items while in file-mode.")
- 
+
 (defvar speedbar-easymenu-definition-trailer
   (append
    (if (and (featurep 'custom) (fboundp 'custom-declare-variable))
@@ -981,7 +981,7 @@ directories.")
 (if (fboundp 'frame-parameter)
 
     (defalias 'speedbar-frame-parameter 'frame-parameter)
-  
+
   (defun speedbar-frame-parameter (frame parameter)
     "Return FRAME's PARAMETER value."
     (cdr (assoc parameter (frame-parameters frame)))))
@@ -2325,7 +2325,7 @@ position to insert a new item, and that the new item will end with a CR."
 			    (if tag-button-function 'speedbar-highlight-face nil)
 			    tag-button-function tag-button-data))
     ))
-  
+
 (defun speedbar-change-expand-button-char (char)
   "Change the expansion button character to CHAR for the current line."
   (save-excursion
@@ -2639,7 +2639,7 @@ name will have the function FIND-FUN and not token."
   (speedbar-insert-generic-list indent lst
 				'speedbar-tag-expand
 				'speedbar-tag-find))
-				
+
 (defun speedbar-insert-etags-list (indent lst)
   "At level INDENT, insert the etags generated LST."
   (speedbar-insert-generic-list indent lst
@@ -3343,7 +3343,7 @@ directory with these items.  This function is replaceable in
 `speedbar-mode-functions-list' as `speedbar-line-path'."
   (let ((rf (speedbar-fetch-replacement-function 'speedbar-line-path)))
     (if rf (funcall rf depth) default-directory)))
-      
+
 (defun speedbar-files-line-path (&optional depth)
   "Retrieve the pathname associated with the current line.
 This may require traversing backwards from DEPTH and combining the default
@@ -3427,12 +3427,12 @@ With universal argument ARG, flush cached data."
 	  (forward-char -2)
 	  (speedbar-do-function-pointer))
       (error (speedbar-position-cursor-on-line)))))
-  
+
 (defun speedbar-flush-expand-line ()
   "Expand the line under the cursor and flush any cached information."
   (interactive)
   (speedbar-expand-line 1))
-  
+
 (defun speedbar-contract-line ()
   "Contract the line under the cursor."
   (interactive)
@@ -4194,7 +4194,7 @@ TEXT is the buffer's name, TOKEN and INDENT are unused."
     (defalias 'defimage-speedbar 'defimage)
 
   (if (not (fboundp 'make-glyph))
-      
+
 (defmacro defimage-speedbar (variable imagespec docstring)
   "Don't bother loading up an image...
 Argument VARIABLE is the variable to define.
diff --git a/lisp/startup.el b/lisp/startup.el
index 4ec30fd26b3..fcc69704d40 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -366,7 +366,7 @@ from being initialized."
 More precisely, this uses only the subdirectories whose names
 start with letters or digits; it excludes any subdirectory named `RCS'
 or `CVS', and any subdirectory that contains a file named `.nosearch'."
-  (let (dirs 
+  (let (dirs
 	attrs
 	(pending (list default-directory)))
     ;; This loop does a breadth-first tree walk on DIR's subtree,
@@ -485,7 +485,7 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
 			      (make-directory
 			       (file-name-directory auto-save-list-file-prefix)
 			       t)
-			      (concat 
+			      (concat
 			       (make-temp-name
 				(expand-file-name
 				 auto-save-list-file-prefix))
@@ -880,7 +880,7 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
     ;; Run the site-start library if it exists.  The point of this file is
     ;; that it is run before .emacs.  There is no point in doing this after
     ;; .emacs; that is useless.
-    (if site-run-file 
+    (if site-run-file
 	(load site-run-file t t))
 
     ;; Sites should not disable this.  Only individuals should disable
@@ -907,7 +907,7 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
 			     (if (directory-files "~" nil "^\\.emacs\\(\\.elc?\\)?$")
 				 "~/.emacs"
 			       "~/_emacs"))
-			    ((eq system-type 'vax-vms) 
+			    ((eq system-type 'vax-vms)
 			     "sys$login:.emacs")
 			    (t
 			     (concat "~" init-file-user "/.emacs")))))
@@ -915,7 +915,7 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
 		      ;; into user-init-file.
 		      (setq user-init-file t)
 		      (load user-init-file-1 t t)
-		      
+
 		      (when (eq user-init-file t)
 			;; If we did not find ~/.emacs, try
 			;; ~/.emacs.d/.emacs.
@@ -933,7 +933,7 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
 			  ;; Don't let it be set from default.el.
 			  (when (eq user-init-file t)
 			    (setq user-init-file user-init-file-1))))
-		      
+
 		      ;; If we loaded a compiled file, set
 		      ;; `user-init-file' to the source version if that
 		      ;; exists.
@@ -951,13 +951,13 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
 				       source user-init-file)
 			      (sit-for 1))
 			    (setq user-init-file source))))
-		      
+
 		      (when (and (stringp custom-file)
 				 (not (assoc custom-file load-history)))
 			;; If the .emacs file has set `custom-file' but hasn't
 			;; loaded the file yet, let's load it.
 			(load custom-file t t))
-		      
+
 		      (or inhibit-default-init
 			  (let ((inhibit-startup-message nil))
 			    ;; Users are supposed to be told their rights.
@@ -1025,7 +1025,7 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
 	;; originally done before unibyte was set and is sensitive to
 	;; unibyte (display table, terminal coding system &c).
 	(set-language-environment current-language-environment)))
-    
+
     ;; Do this here in case the init file sets mail-host-address.
     (if (equal user-mail-address "")
 	(setq user-mail-address (concat (user-login-name) "@"
@@ -1039,7 +1039,7 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
 		 (eq font-list-limit old-font-list-limit)
 		 (eq face-ignored-fonts old-face-ignored-fonts))
       (clear-face-cache)))
-    
+
   (run-hooks 'after-init-hook)
 
   ;; If *scratch* exists and init file didn't change its mode, initialize it.
@@ -1047,7 +1047,7 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
       (with-current-buffer "*scratch*"
 	(if (eq major-mode 'fundamental-mode)
 	    (funcall initial-major-mode))))
-  
+
   ;; Load library for our terminal type.
   ;; User init file can set term-file-prefix to nil to prevent this.
   (and term-file-prefix (not noninteractive) (not window-system)
@@ -1310,7 +1310,7 @@ where FACE is a valid face specification, as it can be used with
 		    display-hourglass nil
 		    minor-mode-map-alist nil
 		    buffer-undo-list t
-		    mode-line-format (propertize "---- %b %-" 
+		    mode-line-format (propertize "---- %b %-"
 						 'face '(:weight bold))
 		    fancy-splash-stop-time (+ (float-time)
 					      (max 60 fancy-splash-max-time))
@@ -1357,7 +1357,7 @@ we put it on this frame."
     (unwind-protect
 	(with-current-buffer (get-buffer-create "GNU Emacs")
 	  (let ((tab-width 8)
-		(mode-line-format (propertize "---- %b %-" 
+		(mode-line-format (propertize "---- %b %-"
 					      'face '(:weight bold))))
 
 	    ;; The convention for this piece of code is that
@@ -1448,7 +1448,7 @@ Copyright (C) 2002 Free Software Foundation, Inc.")
 	      (if (and (eq (key-binding "\C-h\C-c") 'describe-copying)
 		       (eq (key-binding "\C-h\C-d") 'describe-distribution)
 		       (eq (key-binding "\C-h\C-w") 'describe-no-warranty))
-		  (insert 
+		  (insert
 		   "\n
 GNU Emacs comes with ABSOLUTELY NO WARRANTY; type C-h C-w for full details.
 Emacs is Free Software--Free as in Freedom--so you can redistribute copies
diff --git a/lisp/strokes.el b/lisp/strokes.el
index 1aa04d74524..b230bfdeb6b 100644
--- a/lisp/strokes.el
+++ b/lisp/strokes.el
@@ -1498,11 +1498,11 @@ Encode/decode your strokes with \\[strokes-encode-buffer],
 (defsubst strokes-xpm-encode-length-as-string (length)
   "Given some LENGTH in [0,62) do a fast lookup of its encoding."
   (aref strokes-base64-chars length))
-		   
+
 (defsubst strokes-xpm-decode-char (character)
   "Given a CHARACTER, do a fast lookup to find its corresponding integer value."
   (aref strokes-char-table character))
-		   
+
 (defun strokes-xpm-to-compressed-string (&optional xpm-buffer)
   "Convert XPM in XPM-BUFFER to compressed string representing the stroke.
 XPM-BUFFER defaults to ` *strokes-xpm*'."
diff --git a/lisp/subr.el b/lisp/subr.el
index 8b0005a644f..01d317238de 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1058,7 +1058,7 @@ This is the last value stored with `(process-put PROCESS PROPNAME VALUE)'."
 (defun process-put (process propname value)
   "Change PROCESS' PROPNAME property to VALUE.
 It can be retrieved with `(process-get PROCESS PROPNAME)'."
-  (set-process-plist process 
+  (set-process-plist process
 		     (plist-put (process-plist process) propname value)))
 
 
@@ -1480,7 +1480,7 @@ If NOEXCLUDE is present and non-nil, the normal removal of the
  if FUNCTION adjusts point before or after inserting the object.
 If UNDO is present and non-nil, it is a function that will be called
  by `yank-pop' to undo the insertion of the current object.  It is
- called with two arguments, the start and end of the current region. 
+ called with two arguments, the start and end of the current region.
  FUNCTION may set `yank-undo-function' to override the UNDO value."
   (let* ((handler (and (stringp string)
 		       (get-text-property 0 'yank-handler string)))
@@ -1496,7 +1496,7 @@ If UNDO is present and non-nil, it is a function that will be called
 	(setq yank-undo-function (nth 3 handler))) ;; UNDO
     (if (nth 4 handler) ;; COMMAND
 	(setq this-command (nth 4 handler)))))
-    
+
 (defun insert-buffer-substring-no-properties (buf &optional start end)
   "Insert before point a substring of buffer BUFFER, without text properties.
 BUFFER may be a buffer or a buffer name.
diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el
index 2c755fd176e..b83e168ff57 100644
--- a/lisp/tar-mode.el
+++ b/lisp/tar-mode.el
@@ -41,7 +41,7 @@
 ;; This code now understands the extra fields that GNU tar adds to tar files.
 
 ;; This interacts correctly with "uncompress.el" in the Emacs library,
-;; which you get with 
+;; which you get with
 ;;
 ;;  (autoload 'uncompress-while-visiting "uncompress")
 ;;  (setq auto-mode-alist (cons '("\\.Z$" . uncompress-while-visiting)
@@ -49,11 +49,11 @@
 ;;
 ;; Do not attempt to use tar-mode.el with crypt.el, you will lose.
 
-;;    ***************   TO DO   *************** 
+;;    ***************   TO DO   ***************
 ;;
 ;; o  chmod should understand "a+x,og-w".
 ;;
-;; o  It's not possible to add a NEW file to a tar archive; not that 
+;; o  It's not possible to add a NEW file to a tar archive; not that
 ;;    important, but still...
 ;;
 ;; o  The code is less efficient that it could be - in a lot of places, I
@@ -64,7 +64,7 @@
 ;;    of an archive, where <esc> would leave you in a subfile-edit buffer.
 ;;    (Like the Meta-R command of the Zmacs mail reader.)
 ;;
-;; o  Sometimes (but not always) reverting the tar-file buffer does not 
+;; o  Sometimes (but not always) reverting the tar-file buffer does not
 ;;    re-grind the listing, and you are staring at the binary tar data.
 ;;    Typing 'g' again immediately after that will always revert and re-grind
 ;;    it, though.  I have no idea why this happens.
@@ -76,7 +76,7 @@
 ;;    might be a problem if the tar write-file-hook does not come *first* on
 ;;    the list.
 ;;
-;; o  Block files, sparse files, continuation files, and the various header 
+;; o  Block files, sparse files, continuation files, and the various header
 ;;    types aren't editable.  Actually I don't know that they work at all.
 
 ;; Rationale:
@@ -103,7 +103,7 @@
 (defcustom tar-anal-blocksize 20
   "*The blocksize of tar files written by Emacs, or nil, meaning don't care.
 The blocksize of a tar file is not really the size of the blocks; rather, it is
-the number of blocks written with one system call.  When tarring to a tape, 
+the number of blocks written with one system call.  When tarring to a tape,
 this is the size of the *tape* blocks, but when writing to a file, it doesn't
 matter much.  The only noticeable difference is that if a tar file does not
 have a blocksize of 20, tar will tell you that; all this really controls is
@@ -117,7 +117,7 @@ If this is true, then editing and saving a tar file entry back into its
 tar file will update its datestamp.  If false, the datestamp is unchanged.
 You may or may not want this - it is good in that you can tell when a file
 in a tar archive has been changed, but it is bad for the same reason that
-editing a file in the tar archive at all is bad - the changed version of 
+editing a file in the tar archive at all is bad - the changed version of
 the file never exists on disk."
   :type 'boolean
   :group 'tar)
@@ -201,7 +201,7 @@ This information is useful, but it takes screen space away from file names."
 
 (defun tar-header-block-tokenize (string)
   "Return a `tar-header' structure.
-This is a list of name, mode, uid, gid, size, 
+This is a list of name, mode, uid, gid, size,
 write-date, checksum, link-type, and link-name."
   (cond ((< (length string) 512) nil)
 	(;(some 'plusp string)		 ; <-- oops, massive cycle hog!
@@ -555,15 +555,15 @@ is visible (and the real data of the buffer is hidden)."
 ;;;###autoload
 (define-derived-mode tar-mode nil "Tar"
   "Major mode for viewing a tar file as a dired-like listing of its contents.
-You can move around using the usual cursor motion commands. 
+You can move around using the usual cursor motion commands.
 Letters no longer insert themselves.
 Type `e' to pull a file out of the tar file and into its own buffer;
 or click mouse-2 on the file's line in the Tar mode buffer.
 Type `c' to copy an entry from the tar file into another file on disk.
 
-If you edit a sub-file of this archive (as with the `e' command) and 
-save it with Control-x Control-s, the contents of that buffer will be 
-saved back into the tar-file buffer; in this way you can edit a file 
+If you edit a sub-file of this archive (as with the `e' command) and
+save it with Control-x Control-s, the contents of that buffer will be
+saved back into the tar-file buffer; in this way you can edit a file
 inside of a tar archive without extracting it and re-archiving it.
 
 See also: variables `tar-update-datestamp' and `tar-anal-blocksize'.
@@ -764,7 +764,7 @@ appear on disk when you save the tar-file's buffer."
 		  (decode-coding-region (point-min) (point-max) coding)
 		  (set-buffer-file-coding-system coding))
 		;; Set the default-directory to the dir of the
-		;; superior buffer. 
+		;; superior buffer.
 		(setq default-directory
 		      (save-excursion
 			(set-buffer tar-buffer)
@@ -775,7 +775,7 @@ appear on disk when you save the tar-file's buffer."
 		(make-local-variable 'tar-superior-descriptor)
 		(setq tar-superior-buffer tar-buffer)
 		(setq tar-superior-descriptor descriptor)
-		(setq buffer-read-only read-only-p)		
+		(setq buffer-read-only read-only-p)
 		(set-buffer-modified-p nil)
 		(tar-subfile-mode 1))
 	      (set-buffer tar-buffer))
@@ -1064,7 +1064,7 @@ for this to be permanent."
 	    (delete-region p (point))
 	    (insert (tar-header-block-summarize tokens) "\n")
 	    (setq tar-header-offset (position-bytes (point-max))))
-	  
+
 	  (widen)
 	  (set-buffer-multibyte nil)
 	  (let* ((start (+ (tar-desc-data-start descriptor) tar-header-offset -513)))
diff --git a/lisp/tempo.el b/lisp/tempo.el
index 4c58a4bca9a..f5a592f5ad5 100644
--- a/lisp/tempo.el
+++ b/lisp/tempo.el
@@ -279,7 +279,7 @@ The elements in ELEMENTS can be of several types:
 	 (command-name template-name))
     (set template-name elements)
     (fset command-name (list 'lambda (list '&optional 'arg)
-			     (or documentation 
+			     (or documentation
 				 (concat "Insert a " name "."))
 			     (list 'interactive "*P")
 			     (list 'tempo-insert-template (list 'quote
@@ -540,7 +540,7 @@ and insert the results."
 	       (setq lp (cdr lp)))
 	     (if (not (= mark (car lp)))
 		 (setcdr lp (cons mark (cdr lp))))))))
-	  
+
 ;;;
 ;;; tempo-forward-mark
 
@@ -577,7 +577,7 @@ and insert the results."
 		       last))))
     (if prev-mark
 	(goto-char prev-mark))))
-	
+
 ;;;
 ;;; tempo-add-tag
 
diff --git a/lisp/term.el b/lisp/term.el
index bb3c9cb9e53..9f49ee96045 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -2688,7 +2688,7 @@ See `term-prompt-regexp'."
 				(term-move-columns columns)
 				(delete-region pos (point))))
 			    (setq term-current-column nil)
-							 
+
 			    (put-text-property old-point (point)
 					       'face term-current-face)
 			    ;; If the last char was written in last column,
@@ -3739,7 +3739,7 @@ See `term-dynamic-complete-filename'.  Returns t if successful."
 			  (t (car term-completion-addsuffix))))
 	 (filesuffix (cond ((not term-completion-addsuffix) "")
 			   ((not (consp term-completion-addsuffix)) " ")
-			   (t (cdr term-completion-addsuffix))))	 
+			   (t (cdr term-completion-addsuffix))))
 	 (filename (or (term-match-partial-filename) ""))
 	 (pathdir (file-name-directory filename))
 	 (pathnondir (file-name-nondirectory filename))
diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el
index 70f25da673a..4dd56862913 100644
--- a/lisp/thingatpt.el
+++ b/lisp/thingatpt.el
@@ -32,11 +32,11 @@
 ;; forward-"thing" operator (eg. forward-word, forward-line).
 ;;
 ;; Special cases are allowed for using properties associated with the named
-;; "thing": 
+;; "thing":
 ;;
 ;;   forward-op		Function to call to skip forward over a "thing" (or
 ;;                      with a negative argument, backward).
-;;                      
+;;
 ;;   beginning-op	Function to call to skip to the beginning of a "thing".
 ;;   end-op		Function to call to skip to the end of a "thing".
 ;;
@@ -80,14 +80,14 @@ of the textual entity that was found."
       (condition-case nil
 	  (save-excursion
 	    ;; Try moving forward, then back.
-	    (let ((end (progn 
-			 (funcall 
-			  (or (get thing 'end-op) 
+	    (let ((end (progn
+			 (funcall
+			  (or (get thing 'end-op)
 			      (function (lambda () (forward-thing thing 1)))))
 			 (point)))
-		  (beg (progn 
-			 (funcall 
-			  (or (get thing 'beginning-op) 
+		  (beg (progn
+			 (funcall
+			  (or (get thing 'beginning-op)
 			      (function (lambda () (forward-thing thing -1)))))
 			 (point))))
 	      (if (not (and beg (> beg orig)))
@@ -95,9 +95,9 @@ of the textual entity that was found."
 		  ;; it worked.  But END may not be the real end.
 		  ;; So find the real end that corresponds to BEG.
 		  (let ((real-end
-			 (progn 
-			   (funcall 
-			    (or (get thing 'end-op) 
+			 (progn
+			   (funcall
+			    (or (get thing 'end-op)
 				(function (lambda () (forward-thing thing 1)))))
 			   (point))))
 		    (if (and beg real-end (<= beg orig) (<= orig real-end))
@@ -105,20 +105,20 @@ of the textual entity that was found."
 		(goto-char orig)
 		;; Try a second time, moving backward first and then forward,
 		;; so that we can find a thing that ends at ORIG.
-		(let ((beg (progn 
-			     (funcall 
-			      (or (get thing 'beginning-op) 
+		(let ((beg (progn
+			     (funcall
+			      (or (get thing 'beginning-op)
 				  (function (lambda () (forward-thing thing -1)))))
 			     (point)))
-		      (end (progn 
-			     (funcall 
-			      (or (get thing 'end-op) 
+		      (end (progn
+			     (funcall
+			      (or (get thing 'end-op)
 				  (function (lambda () (forward-thing thing 1)))))
 			     (point)))
 		      (real-beg
-		       (progn 
-			 (funcall 
-			  (or (get thing 'beginning-op) 
+		       (progn
+			 (funcall
+			  (or (get thing 'beginning-op)
 			      (function (lambda () (forward-thing thing -1)))))
 			 (point))))
 		  (if (and real-beg end (<= real-beg orig) (<= orig end))
@@ -137,7 +137,7 @@ a symbol as a valid THING."
   (if (get thing 'thing-at-point)
       (funcall (get thing 'thing-at-point))
     (let ((bounds (bounds-of-thing-at-point thing)))
-      (if bounds 
+      (if bounds
 	  (buffer-substring (car bounds) (cdr bounds))))))
 
 ;; Go to beginning/end
@@ -152,9 +152,9 @@ a symbol as a valid THING."
     (or bounds (error "No %s here" thing))
     (goto-char (cdr bounds))))
 
-;;  Special cases 
+;;  Special cases
 
-;;  Lines 
+;;  Lines
 
 ;; bolp will be false when you click on the last line in the buffer
 ;; and it has no final newline.
@@ -162,7 +162,7 @@ a symbol as a valid THING."
 (put 'line 'beginning-op
      (function (lambda () (if (bolp) (forward-line -1) (beginning-of-line)))))
 
-;;  Sexps 
+;;  Sexps
 
 (defun in-string-p ()
   (let ((orig (point)))
@@ -188,7 +188,7 @@ a symbol as a valid THING."
 
 (put 'sexp 'beginning-op 'beginning-of-sexp)
 
-;;  Lists 
+;;  Lists
 
 (put 'list 'end-op (function (lambda () (up-list 1))))
 (put 'list 'beginning-op 'backward-sexp)
@@ -198,7 +198,7 @@ a symbol as a valid THING."
 (defvar thing-at-point-file-name-chars "-~/[:alnum:]_.${}#%,:"
   "Characters allowable in filenames.")
 
-(put 'filename 'end-op    
+(put 'filename 'end-op
      (lambda ()
        (re-search-forward (concat "\\=[" thing-at-point-file-name-chars "]*")
 			  nil t)))
@@ -339,11 +339,11 @@ point."
 		       (goto-char (car bounds))
 		     (error "No URL here"))))))
 
-;;  Whitespace 
+;;  Whitespace
 
 (defun forward-whitespace (arg)
   (interactive "p")
-  (if (natnump arg) 
+  (if (natnump arg)
       (re-search-forward "[ \t]+\\|\n" nil 'move arg)
     (while (< arg 0)
       (if (re-search-backward "[ \t]+\\|\n" nil 'move)
@@ -351,35 +351,35 @@ point."
 	      (skip-chars-backward " \t")))
       (setq arg (1+ arg)))))
 
-;;  Buffer 
+;;  Buffer
 
 (put 'buffer 'end-op (lambda () (goto-char (point-max))))
 (put 'buffer 'beginning-op (lambda () (goto-char (point-min))))
 
-;;  Symbols 
+;;  Symbols
 
 (defun forward-symbol (arg)
   (interactive "p")
-  (if (natnump arg) 
+  (if (natnump arg)
       (re-search-forward "\\(\\sw\\|\\s_\\)+" nil 'move arg)
     (while (< arg 0)
       (if (re-search-backward "\\(\\sw\\|\\s_\\)+" nil 'move)
 	  (skip-syntax-backward "w_"))
       (setq arg (1+ arg)))))
 
-;;  Syntax blocks 
+;;  Syntax blocks
 
 (defun forward-same-syntax (&optional arg)
   (interactive "p")
   (while (< arg 0)
-    (skip-syntax-backward 
+    (skip-syntax-backward
      (char-to-string (char-syntax (char-after (1- (point))))))
     (setq arg (1+ arg)))
   (while (> arg 0)
     (skip-syntax-forward (char-to-string (char-syntax (char-after (point)))))
     (setq arg (1- arg))))
 
-;;  Aliases 
+;;  Aliases
 
 (defun word-at-point () (thing-at-point 'word))
 (defun sentence-at-point () (thing-at-point 'sentence))
@@ -388,7 +388,7 @@ point."
   "Read a lisp expression from STR.
 Signal an error if the entire string was not used."
   (let* ((read-data (read-from-string str))
-	 (more-left 
+	 (more-left
 	  (condition-case nil
 	      ;; The call to `ignore' suppresses a compiler warning.
 	      (progn (ignore (read-from-string (substring str (cdr read-data))))
@@ -398,8 +398,8 @@ Signal an error if the entire string was not used."
 	(error "Can't read whole string")
       (car read-data))))
 
-(defun form-at-point (&optional thing pred) 
-  (let ((sexp (condition-case nil 
+(defun form-at-point (&optional thing pred)
+  (let ((sexp (condition-case nil
 		  (read-from-whole-string (thing-at-point (or thing 'sexp)))
 		(error nil))))
     (if (or (not pred) (funcall pred sexp)) sexp)))
diff --git a/lisp/timer.el b/lisp/timer.el
index 3131fe3c175..b7db0d01dc1 100644
--- a/lisp/timer.el
+++ b/lisp/timer.el
@@ -261,7 +261,7 @@ TIME is a time-list."
   (let ((high (- (car time) (aref timer 1)))
 	(low (- (nth 1 time) (aref timer 2))))
     (+ low (* high 65536))))
-  
+
 (defun timer-event-handler (timer)
   "Call the handler for the timer TIMER.
 This function is called, by name, directly by the C code."
diff --git a/lisp/tooltip.el b/lisp/tooltip.el
index 363f6f4be97..ea5aaaa87d6 100644
--- a/lisp/tooltip.el
+++ b/lisp/tooltip.el
@@ -286,7 +286,7 @@ ACTIVATEP non-nil means activate mouse motion events."
 
 (defun tooltip-set-param (alist key value)
   "Change the value of KEY in alist ALIST to VALUE.
-If there's no association for KEY in ALIST, add one, otherwise 
+If there's no association for KEY in ALIST, add one, otherwise
 change the existing association.  Value is the resulting alist."
   (let ((param (assq key alist)))
     (if (consp param)
@@ -321,7 +321,7 @@ position."
 		      tooltip-hide-delay
 		      tooltip-x-offset
 		      tooltip-y-offset))
-      (error 
+      (error
        (message "Error while displaying tooltip: %s" error)
        (sit-for 1)
        (message "%s" text)))))
@@ -411,7 +411,7 @@ This event can be examined by forms in TOOLTIP-GUD-DISPLAY.")
     (message "Dereferencing is now %s."
 	     (if tooltip-gud-dereference "on" "off"))))
 
-; This will only display data that comes in one chunk. 
+; This will only display data that comes in one chunk.
 ; Larger arrays (say 400 elements) are displayed in
 ; the tootip incompletely and spill over into the gud buffer.
 ; Switching the process-filter creates timing problems and
@@ -455,16 +455,16 @@ This function must return nil if it doesn't handle EVENT."
 	  (let ((cmd (tooltip-gud-print-command expr)))
 	    (unless (null cmd)	       ; CMD can be nil if unknown debugger
 	      (case gud-minor-mode
-		    (gdba (gdb-enqueue-input 
+		    (gdba (gdb-enqueue-input
 			   (list  (concat cmd "\n") 'gdb-tooltip-print)))
-		    (t 
+		    (t
 		     (setq tooltip-gud-original-filter (process-filter process))
 		       (set-process-filter process 'tooltip-gud-process-output)
 		       (gud-basic-call cmd)))
 		    expr)))))))
 
 (defun gdb-tooltip-print ()
-  (tooltip-show 
+  (tooltip-show
    (with-current-buffer (gdb-get-buffer 'gdb-partial-output-buffer)
      (buffer-string))))
 
@@ -488,7 +488,7 @@ MSG is either a help string to display, or nil to cancel the display."
 	   ;; Keep what we have.
 	   )
 	  (t
-	   ;; A different help.  Remove a previous tooltip, and 
+	   ;; A different help.  Remove a previous tooltip, and
 	   ;; display a new one, with some delay.
 	   (tooltip-hide)
 	   (tooltip-start-delayed-tip)))))
diff --git a/lisp/vc-rcs.el b/lisp/vc-rcs.el
index 23686006ac5..334590700f9 100644
--- a/lisp/vc-rcs.el
+++ b/lisp/vc-rcs.el
@@ -5,7 +5,7 @@
 ;; Author:     FSF (see vc.el for full credits)
 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
 
-;; $Id: vc-rcs.el,v 1.34 2003/01/03 15:27:35 spiegel Exp $
+;; $Id: vc-rcs.el,v 1.35 2003/01/07 08:28:15 spiegel Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -143,9 +143,9 @@ For a description of possible values, see `vc-check-master-templates'."
               (cond
                ((string-match ".rw..-..-." (nth 8 (file-attributes file)))
                 (vc-file-setprop file 'vc-checkout-model 'implicit)
-		(setq state 
-		      (if (vc-rcs-workfile-is-newer file) 
-			  'edited 
+		(setq state
+		      (if (vc-rcs-workfile-is-newer file)
+			  'edited
 			'up-to-date)))
                ((string-match ".r-..-..-." (nth 8 (file-attributes file)))
                 (vc-file-setprop file 'vc-checkout-model 'locking))))
@@ -162,7 +162,7 @@ For a description of possible values, see `vc-check-master-templates'."
 		       (if (file-ownership-preserved-p file)
 			   'edited
 			 (vc-user-login-name owner-uid))
-		     (if (vc-rcs-workfile-is-newer file) 
+		     (if (vc-rcs-workfile-is-newer file)
 			 'edited
 		       'up-to-date)))
                   (t
@@ -243,7 +243,7 @@ expanded if `vc-keep-workfiles' is non-nil, otherwise, delete the workfile."
 		     (if (stringp vc-rcs-register-switches)
 		     (list vc-rcs-register-switches)
 		     vc-rcs-register-switches))))
-      
+
       (and (not (file-exists-p subdir))
 	   (not (directory-files (file-name-directory file)
 				 nil ".*,v$" t))
@@ -305,7 +305,7 @@ whether to remove it."
     (and (string= (file-name-nondirectory (directory-file-name dir)) "RCS")
 	 ;; check whether RCS dir is empty, i.e. it does not
 	 ;; contain any files except "." and ".."
-	 (not (directory-files dir nil 
+	 (not (directory-files dir nil
 			       "^\\([^.]\\|\\.[^.]\\|\\.\\.[^.]\\).*"))
 	 (yes-or-no-p (format "Directory %s is empty; remove it? " dir))
 	 (delete-directory dir))))
@@ -317,7 +317,7 @@ whether to remove it."
 		    vc-checkin-switches)))
     (let ((old-version (vc-workfile-version file)) new-version
 	  (default-branch (vc-file-getprop file 'vc-rcs-default-branch)))
-      ;; Force branch creation if an appropriate 
+      ;; Force branch creation if an appropriate
       ;; default branch has been set.
       (and (not rev)
 	   default-branch
@@ -351,7 +351,7 @@ whether to remove it."
        ((and old-version new-version
 	     (not (string= (vc-branch-part old-version)
 			   (vc-branch-part new-version))))
-	(vc-rcs-set-default-branch file 
+	(vc-rcs-set-default-branch file
 				   (if (vc-trunk-p new-version) nil
 				     (vc-branch-part new-version)))
 	;; If this is an old RCS release, we might have
@@ -407,7 +407,7 @@ whether to remove it."
                        (concat "-r" rev)
                      (let ((workrev (vc-workfile-version file)))
                        (if workrev
-                           (concat "-r" 
+                           (concat "-r"
                                    (if (not rev)
                                        ;; no revision specified:
                                        ;; use current workfile version
@@ -428,7 +428,7 @@ whether to remove it."
 	    (vc-file-setprop file 'vc-workfile-version new-version)
 	    ;; if necessary, adjust the default branch
 	    (and rev (not (string= rev ""))
-		 (vc-rcs-set-default-branch 
+		 (vc-rcs-set-default-branch
 		  file
 		  (if (vc-rcs-latest-on-branch-p file new-version)
 		      (if (vc-trunk-p new-version) nil
@@ -439,7 +439,7 @@ whether to remove it."
 (defun vc-rcs-revert (file &optional contents-done)
   "Revert FILE to the version it was based on."
   (vc-do-command nil 0 "co" (vc-name file) "-f"
-                 (concat (if (eq (vc-state file) 'edited) "-u" "-r") 
+                 (concat (if (eq (vc-state file) 'edited) "-u" "-r")
                          (vc-workfile-version file))))
 
 (defun vc-rcs-cancel-version (file editable)
@@ -483,7 +483,7 @@ The changes are between FIRST-VERSION and SECOND-VERSION."
   "Steal the lock on the current workfile for FILE and revision REV.
 Needs RCS 5.6.2 or later for -M."
   (vc-do-command nil 0 "rcs" (vc-name file) "-M" (concat "-u" rev))
-  ;; Do a real checkout after stealing the lock, so that we see 
+  ;; Do a real checkout after stealing the lock, so that we see
   ;; expanded headers.
   (vc-do-command nil 0 "co" (vc-name file) "-f" (concat "-l" rev)))
 
diff --git a/lisp/vc-sccs.el b/lisp/vc-sccs.el
index 99737ae2c59..ac11190a77f 100644
--- a/lisp/vc-sccs.el
+++ b/lisp/vc-sccs.el
@@ -5,7 +5,7 @@
 ;; Author:     FSF (see vc.el for full credits)
 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
 
-;; $Id: vc-sccs.el,v 1.19 2002/11/13 12:37:58 spiegel Exp $
+;; $Id: vc-sccs.el,v 1.20 2002/12/26 14:07:15 spiegel Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -28,10 +28,10 @@
 
 ;;; Code:
 
-(eval-when-compile 
+(eval-when-compile
   (require 'vc))
 
-;;; 
+;;;
 ;;; Customization options
 ;;;
 
@@ -242,7 +242,7 @@ locked.  REV is the revision to check out."
 	  ;; the file in the right place.
 	  (setq default-directory (file-name-directory file))
 
-	  (and rev (or (string= rev "") 
+	  (and rev (or (string= rev "")
                        (not (stringp rev)))
                (setq rev nil))
 	  (apply 'vc-do-command nil 0 "get" (vc-name file)
@@ -294,7 +294,7 @@ EDITABLE non-nil means previous version should be locked."
   "Get a difference report using SCCS between two versions of FILE."
   (setq oldvers (vc-sccs-lookup-triple file oldvers))
   (setq newvers (vc-sccs-lookup-triple file newvers))
-  (apply 'vc-do-command "*vc-diff*" 1 "vcdiff" (vc-name file) 
+  (apply 'vc-do-command "*vc-diff*" 1 "vcdiff" (vc-name file)
          (append (list "-q"
                        (and oldvers (concat "-r" oldvers))
                        (and newvers (concat "-r" newvers)))
diff --git a/lisp/vc.el b/lisp/vc.el
index 1176d71b41a..3b7074df6a7 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
 ;; Keywords: tools
 
-;; $Id: vc.el,v 1.346 2002/11/03 15:08:29 spiegel Exp $
+;; $Id: vc.el,v 1.347 2002/12/26 14:04:21 spiegel Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -148,7 +148,7 @@
 ;;   contents with those of the master version.  If the backend does not
 ;;   have such a brief-comparison feature, the default implementation of
 ;;   this function can be used, which delegates to a full
-;;   vc-BACKEND-diff.  (Note that vc-BACKEND-diff must not run 
+;;   vc-BACKEND-diff.  (Note that vc-BACKEND-diff must not run
 ;;   asynchronously in this case.)
 ;;
 ;; - mode-line-string (file)
@@ -722,7 +722,7 @@ The keys are \(BUFFER . BACKEND\).  See also `vc-annotate-get-backend'.")
 (defun vc-default-previous-version (backend file rev)
   "Guess the version number immediately preceding REV for FILE.
 This default implementation works for <major>.<minor>-style version numbers
-as used by RCS and CVS."  
+as used by RCS and CVS."
   (let ((branch (vc-branch-part rev))
         (minor-num (string-to-number (vc-minor-part rev))))
     (when branch
@@ -782,7 +782,7 @@ somebody else, signal error."
            (error (format "File not under version control: `%s'" file)))
        (unless (vc-editable-p ,filevar)
          (let ((state (vc-state ,filevar)))
-           (if (stringp state) 
+           (if (stringp state)
                (error (format "`%s' is locking `%s'" state ,filevar))
              (vc-checkout ,filevar t))))
        (save-excursion
@@ -1787,7 +1787,7 @@ versions of all registered files in or below it."
        (setq rel1-default (vc-workfile-version file)))
       ;; if the file is not locked, use last and previous version as default
       (t
-       (setq rel1-default (vc-call previous-version file 
+       (setq rel1-default (vc-call previous-version file
                                    (vc-workfile-version file)))
        (if (string= rel1-default "") (setq rel1-default nil))
        (setq rel2-default (vc-workfile-version file))))
@@ -2187,7 +2187,7 @@ There is a special command, `*l', to mark all files currently locked."
 Replace various columns with version control information, VC-INFO.
 This code, like dired, assumes UNIX -l format."
   (beginning-of-line)
-  (when (re-search-forward  
+  (when (re-search-forward
          ;; Match link count, owner, group, size.  Group may be missing,
          ;; and only the size is present in OS/2 -l format.
          "^..[drwxlts-]+ \\( *[0-9]+\\( [^ ]+ +\\([^ ]+ +\\)?[0-9]+\\)?\\) "
@@ -2514,7 +2514,7 @@ changes found in the master file; use \\[universal-argument] \\[vc-next-action]
   "Update the current buffer's file to the latest version on its branch.
 If the file contains no changes, and is not locked, then this simply replaces
 the working file with the latest version on its branch.  If the file contains
-changes, and the backend supports merging news, then any recent changes from 
+changes, and the backend supports merging news, then any recent changes from
 the current branch are merged into the working file."
   (interactive)
   (vc-ensure-vc-buffer)
@@ -2524,15 +2524,15 @@ the current branch are merged into the working file."
         (vc-checkout file nil "")
       (if (eq (vc-checkout-model file) 'locking)
           (if (eq (vc-state file) 'edited)
-              (error 
-               (substitute-command-keys 
+              (error
+               (substitute-command-keys
            "File is locked--type \\[vc-revert-buffer] to discard changes"))
-            (error 
+            (error
              (substitute-command-keys
-           "Unexpected file state (%s)--type \\[vc-next-action] to correct") 
+           "Unexpected file state (%s)--type \\[vc-next-action] to correct")
                    (vc-state file)))
         (if (not (vc-find-backend-function (vc-backend file) 'merge-news))
-            (error "Sorry, merging news is not implemented for %s" 
+            (error "Sorry, merging news is not implemented for %s"
                    (vc-backend file))
           (vc-call merge-news file)
           (vc-resynch-window file t t))))))
diff --git a/lisp/version.el b/lisp/version.el
index e5c1017a659..ff90d1fd1e8 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -53,13 +53,13 @@ If optional argument HERE is non-nil, insert string at point.
 Don't use this function in programs to choose actions according
 to the system configuration; look at `system-configuration' instead."
   (interactive "P")
-  (let ((version-string 
+  (let ((version-string
          (format (if (not (interactive-p))
 		     "GNU Emacs %s (%s%s%s)\n of %s on %s"
 		   "GNU Emacs %s (%s%s%s) of %s on %s")
                  emacs-version
 		 system-configuration
-		 (cond ((featurep 'motif) 
+		 (cond ((featurep 'motif)
 			(concat ", " (substring motif-version-string 4)))
 		       ((featurep 'x-toolkit) ", X toolkit")
 		       (t ""))
@@ -70,7 +70,7 @@ to the system configuration; look at `system-configuration' instead."
 		   "")
 		 (format-time-string "%Y-%m-%d" emacs-build-time)
                  emacs-build-system)))
-    (if here 
+    (if here
         (insert version-string)
       (if (interactive-p)
           (message "%s" version-string)
diff --git a/lisp/view.el b/lisp/view.el
index 3f328fbaa15..96907371aec 100644
--- a/lisp/view.el
+++ b/lisp/view.el
@@ -700,7 +700,7 @@ Also set the mark at the position where point was."
 ;    (goto-char (point-max))
 ;    (beginning-of-line))
 ;  (view-recenter))
-  
+
 (defun View-goto-line (&optional line)
   "Move to first (or prefix LINE) line in View mode.
 Display is centered at LINE.
@@ -792,7 +792,7 @@ If LINES is more than a window-full, only the last window-full is shown."
 See also `View-scroll-page-forward'."
   (interactive "P")
   (view-scroll-lines lines t view-page-size nil))
-  
+
 (defun View-scroll-page-forward-set-page-size (&optional lines)
   "Scroll forward LINES lines in View mode, setting the \"page size\".
 This is the number of lines which \\[View-scroll-page-forward] and
@@ -866,7 +866,7 @@ invocations return to earlier marks."
   (goto-char (or (mark t) (point-min)))
   (pop-mark)
   (view-recenter))
-	     
+
 (defun View-search-regexp-forward (n regexp)
   "Search forward for first (or prefix Nth) occurrence of REGEXP in View mode.
 
diff --git a/lisp/vms-patch.el b/lisp/vms-patch.el
index 3d8a9c59647..09c44bfa099 100644
--- a/lisp/vms-patch.el
+++ b/lisp/vms-patch.el
@@ -147,7 +147,7 @@ spawned Emacs and doing things like \"emacs -l myfile.el -f doit\""
 			(< 32 (setq this-char (aref args end)))
 			(> 127 this-char))
 	      (setq end (1+ end)))
-	    (setq command-line-args (append 
+	    (setq command-line-args (append
 				     command-line-args
 				     (list (substring args beg end))))
 	    (setq beg (1+ end)))
diff --git a/lisp/which-func.el b/lisp/which-func.el
index aba47b964e4..1d31b3d304a 100644
--- a/lisp/which-func.el
+++ b/lisp/which-func.el
@@ -65,7 +65,7 @@
 
 ;; Variables for customization
 ;; ---------------------------
-;;  
+;;
 (defvar which-func-unknown "???"
   "String to display in the mode line when current function is unknown.")
 
diff --git a/lisp/wid-browse.el b/lisp/wid-browse.el
index b19305e133d..ed904965632 100644
--- a/lisp/wid-browse.el
+++ b/lisp/wid-browse.el
@@ -41,18 +41,18 @@
 
 (defvar widget-browse-mode-map nil
   "Keymap for `widget-browse-mode'.")
-  
+
 (unless widget-browse-mode-map
   (setq widget-browse-mode-map (make-sparse-keymap))
   (set-keymap-parent widget-browse-mode-map widget-keymap)
   (define-key widget-browse-mode-map "q" 'bury-buffer))
 
-(easy-menu-define widget-browse-mode-customize-menu 
+(easy-menu-define widget-browse-mode-customize-menu
     widget-browse-mode-map
   "Menu used in widget browser buffers."
   (customize-menu-create 'widgets))
 
-(easy-menu-define widget-browse-mode-menu 
+(easy-menu-define widget-browse-mode-menu
     widget-browse-mode-map
   "Menu used in widget browser buffers."
   '("Widget"
@@ -109,7 +109,7 @@ if that value is non-nil."
 ;;;###autoload
 (defun widget-browse (widget)
   "Create a widget browser for WIDGET."
-  (interactive (list (completing-read "Widget: " 
+  (interactive (list (completing-read "Widget: "
 				      obarray
 				      (lambda (symbol)
 					(get symbol 'widget-type))
@@ -129,7 +129,7 @@ if that value is non-nil."
     (kill-buffer (get-buffer-create "*Browse Widget*"))
     (switch-to-buffer (get-buffer-create "*Browse Widget*")))
   (widget-browse-mode)
-  
+
   ;; Quick way to get out.
 ;;  (widget-create 'push-button
 ;;		 :action (lambda (widget &optional event)
@@ -192,7 +192,7 @@ The :value of the widget shuld be the widget to be browsed."
   :action 'widget-browse-action)
 
 (defun widget-browse-action (widget &optional event)
-  ;; Create widget browser for WIDGET's :value. 
+  ;; Create widget browser for WIDGET's :value.
   (widget-browse (widget-get widget :value)))
 
 (defun widget-browse-value-create (widget)
@@ -290,7 +290,7 @@ With arg, turn widget mode on if and only if arg is positive."
 
 (add-to-list 'minor-mode-alist '(widget-minor-mode " Widget"))
 
-(add-to-list 'minor-mode-map-alist 
+(add-to-list 'minor-mode-map-alist
 	     (cons 'widget-minor-mode widget-minor-mode-map))
 
 ;;; The End:
diff --git a/lisp/widget.el b/lisp/widget.el
index ffe8682b616..45b72acb279 100644
--- a/lisp/widget.el
+++ b/lisp/widget.el
@@ -25,7 +25,7 @@
 ;; Boston, MA 02111-1307, USA.
 
 ;;; Commentary:
-;; 
+;;
 ;; The widget library is partially documented in the `widget' Info
 ;; file.
 ;;
@@ -50,15 +50,15 @@
 
 ;;;(define-widget-keywords :documentation-indent
 ;;;  :complete-function :complete :button-overlay
-;;;  :field-overlay  
-;;;  :documentation-shown :button-prefix  
-;;;  :button-suffix :mouse-down-action :glyph-up :glyph-down :glyph-inactive  
+;;;  :field-overlay
+;;;  :documentation-shown :button-prefix
+;;;  :button-suffix :mouse-down-action :glyph-up :glyph-down :glyph-inactive
 ;;;  :prompt-internal :prompt-history :prompt-match
-;;;  :prompt-value  :deactivate :active  
+;;;  :prompt-value  :deactivate :active
 ;;;  :inactive :activate :sibling-args :delete-button-args
-;;;  :insert-button-args :append-button-args :button-args 
+;;;  :insert-button-args :append-button-args :button-args
 ;;;  :tag-glyph :off-glyph :on-glyph :valid-regexp
-;;;  :secret :sample-face :sample-face-get :case-fold 
+;;;  :secret :sample-face :sample-face-get :case-fold
 ;;;  :create :convert-widget :format :value-create :offset :extra-offset
 ;;;  :tag :doc :from :to :args :value :action
 ;;;  :value-set :value-delete :match :parent :delete :menu-tag-get
@@ -68,7 +68,7 @@
 ;;;  :indent :size :value-to-external :validate :error :directory
 ;;;  :must-match :type-error :value-inline :inline :match-inline :greedy
 ;;;  :button-face-get :button-face :value-face :keymap :entry-from
-;;;  :entry-to :help-echo :documentation-property :tab-order) 
+;;;  :entry-to :help-echo :documentation-property :tab-order)
 
 (defun define-widget (name class doc &rest args)
   "Define a new widget type named NAME from CLASS.
diff --git a/lisp/window.el b/lisp/window.el
index bacd9161ea5..3f533940a14 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -525,7 +525,7 @@ Return non-nil if the window was shrunk."
 		       (not (eq frame (window-frame mini-window)))
 		       (< (nth 3 edges)
 			  (nth 1 (window-edges mini-window)))
-		       (> (nth 1 edges) 
+		       (> (nth 1 edges)
 			  (frame-parameter frame 'menu-bar-lines))))))
 	(fit-window-to-buffer window (window-height window)))))
 
diff --git a/lisp/winner.el b/lisp/winner.el
index 68c1df9f2b5..7841ad0d1db 100644
--- a/lisp/winner.el
+++ b/lisp/winner.el
@@ -128,11 +128,11 @@ You may want to include buffer names such as *Help*, *Apropos*,
                 while (= a b)
                 finally return (< a b)))))
 
-(defun winner-win-data () 
+(defun winner-win-data ()
   ;; Essential properties of the windows in the selected frame.
   (loop for win in (winner-sorted-window-list)
         collect (cons (winner-edges win) (window-buffer win))))
-        
+
 ;; This variable is updated with the current window configuration
 ;; every time it changes.
 (defvar winner-currents nil)
@@ -262,7 +262,7 @@ You may want to include buffer names such as *Help*, *Apropos*,
      ((window-live-p chosen) (select-window chosen))
      ((window-minibuffer-p (selected-window))
       (other-window 1)))
-    (when (/= minisize (window-height miniwin)) 
+    (when (/= minisize (window-height miniwin))
       (letf (((selected-window) miniwin) )
         (setf (window-height) minisize)))))
 
@@ -279,7 +279,7 @@ You may want to include buffer names such as *Help*, *Apropos*,
   (letf (((current-buffer)))
     (loop with alist
 	  for win in (winner-window-list)
-	  for entry = 
+	  for entry =
           (or (assq (window-buffer win) alist)
               (car (push (list (set-buffer (window-buffer win))
                                (cons (mark t) (winner-active-region)))
@@ -335,7 +335,7 @@ You may want to include buffer names such as *Help*, *Apropos*,
 
       ;; Restore marks
       (letf (((current-buffer)))
-	(loop for buf in buffers 
+	(loop for buf in buffers
 	      for entry = (cadr (assq buf winner-point-alist))
 	      do (progn (set-buffer buf)
 			(set-mark (car entry))
@@ -384,7 +384,7 @@ With arg, turn Winner mode on if and only if arg is positive."
 		(not winner-mode))))
     (cond
      ;; Turn mode on
-     (on-p 
+     (on-p
       (setq winner-mode t)
       (cond
        ((winner-hook-installed-p)
@@ -435,16 +435,16 @@ In other words, \"undo\" changes in window configuration."
  	(message "Winner undo (%d / %d)"
  		 winner-undo-counter
  		 (1- (ring-length winner-pending-undo-ring)))))))
- 
-        
- 
+
+
+
 (defun winner-undo-this ()		; The heart of winner undo.
-  (loop 
+  (loop
    (cond
     ((>= winner-undo-counter (ring-length winner-pending-undo-ring))
      (message "No further window configuration undo information")
      (return nil))
- 
+
     ((and				; If possible configuration
       (winner-set (ring-ref winner-pending-undo-ring
  			    winner-undo-counter))
@@ -455,7 +455,7 @@ In other words, \"undo\" changes in window configuration."
      (return t))			; .. then everything is fine.
     (t ;; Otherwise, discharge it (and try the next one).
      (ring-remove winner-pending-undo-ring winner-undo-counter)))))
- 
+
 
 (defun winner-redo ()			; If you change your mind.
   "Restore a more recent window configuration saved by Winner mode."
diff --git a/lisp/xscheme.el b/lisp/xscheme.el
index 2eddecfb0d2..98803e510ae 100644
--- a/lisp/xscheme.el
+++ b/lisp/xscheme.el
@@ -215,7 +215,7 @@ With argument, asks for a command line."
   (kill-local-variable 'xscheme-buffer-name)
   (kill-local-variable 'xscheme-process-name)
   (kill-local-variable 'xscheme-runlight))
-  
+
 (defun verify-xscheme-buffer (buffer-name localp)
   (if (and localp (xscheme-process-buffer-current-p))
       (error "Cannot change the interaction buffer of an interaction buffer"))
diff --git a/lisp/xt-mouse.el b/lisp/xt-mouse.el
index 179294cc88e..08e1d39a430 100644
--- a/lisp/xt-mouse.el
+++ b/lisp/xt-mouse.el
@@ -65,7 +65,7 @@
 					    (vector down-where down-command)
 					  (vector down-command))))
 	     (is-click (string-match "^mouse" (symbol-name (car down)))))
-	    
+
 	(unless is-click
 	  (unless (and (eq (read-char) ?\e)
 		       (eq (read-char) ?\[)
@@ -140,7 +140,7 @@
 				       (max 0 (1- (window-hscroll)))))
 		    (point))
 		where))
-	 (mouse (intern 
+	 (mouse (intern
 		 ;; For buttons > 3, the release-event looks
 		 ;; differently (see xc/programs/xterm/button.c,
 		 ;; function EditorButton), and there seems to come in