(save-selected-window): Move macro before first use.

2 files changed, 103 insertions, 99 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 323a776e222..c8119d91d7d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,12 @@
+2002-02-03  Andreas Schwab  <schwab@suse.de>
+
+        * window.el (save-selected-window): Move macro before first use.
+
 2002-02-03  Pavel Janík  <Pavel@Janik.cz>
 
         * calculator.el (calculator-displayers): Doc fixes.
 
-2002-02-03  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-02-03  Pavel Janík  <Pavel@Janik.cz>
 
         * menu-bar.el (menu-bar-help-menu): Use different text for
         tool-tip.
@@ -43,7 +47,7 @@
         looking for X-Coding-System header, and restore the pruned state
         before returning.
 
-2002-02-02  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-02-02  Pavel Janík  <Pavel@Janik.cz>
 
         * cus-edit.el (customize-save-variable): Fix typo in prompt.
 
@@ -133,7 +137,7 @@
         * emulation/pc-select.el (pc-select-save-and-set-mode):
         Properly use MODE-VAR.
 
-2002-01-29  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-01-29  Pavel Janík  <Pavel@Janik.cz>
 
         * menu-bar.el (menu-bar-help-menu): Change menu-item "Show Emacs
         Version" to "About Emacs".
@@ -150,7 +154,7 @@
 
         * calendar/calendar.el (generate-calendar-month): Doc fix.
 
-2002-01-27  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-01-27  Pavel Janík  <Pavel@Janik.cz>
 
         * time.el (display-time-mail-directory): New option.
         (display-time-mail-function): Update doc-string.
@@ -365,7 +369,7 @@
         with `byte-compile-dynamic'.
         (ibuffer-default-directory, toplevel): Doc files.
 
-2002-01-20  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-01-20  Pavel Janík  <Pavel@Janik.cz>
 
         * tempo.el (tempo-define-template): Doc fix.
 
@@ -382,7 +386,7 @@
 
         * term/w32-win.el (mouse-set-font): Use w32-list-proportional-fonts.
 
-2002-01-19  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-01-19  Pavel Janík  <Pavel@Janik.cz>
 
         * language/tibet-util.el (tibetan-decompose-region)
         (tibetan-decompose-string): Fix typo in docstring.
@@ -474,7 +478,7 @@
 
         * mail/feedmail.el (feedmail): Fix :link spec.
 
-2002-01-16  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-01-16  Pavel Janík  <Pavel@Janik.cz>
 
         * net/ldap.el (ldap-ldapsearch-prog): Default to OpenLDAP version
         2 ldapsearch.
@@ -592,7 +596,7 @@
         (comint-send-input): New arg NO-NEWLINE.
         (comint-send-eof): Call comint-send-eof with NO-NEWLINE.
 
-2002-01-12  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-01-12  Pavel Janík  <Pavel@Janik.cz>
 
         * textmodes/flyspell.el (flyspell-check-pre-word-p): Prevent
         delaying when executing keyboard macros.
@@ -677,7 +681,7 @@
 
         * textmodes/flyspell.el (flyspell-mode-line-string): Fix custom type.
 
-2002-01-08  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-01-08  Pavel Janík  <Pavel@Janik.cz>
 
         * progmodes/ada-mode.el (ada-initialize-properties, ada-mode):
         Do not use make-local-hook.
@@ -693,7 +697,7 @@
 
         * ediff-hook.el: Add an autoload cookie.
 
-2002-01-08  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-01-08  Pavel Janík  <Pavel@Janik.cz>
 
         * net/eudcb-ph.el, net/ldap.el: New maintainer.  New e-mail
         address of the author.
@@ -805,7 +809,7 @@
         * help-fns.el (describe-variable, describe-function):
         Do save-excursion.
 
-2002-01-06  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-01-06  Pavel Janík  <Pavel@Janik.cz>
 
         * net/ldap.el (ldap-search-internal): Skip error message from
         ldapsearch.  Allow listing attribute names only.  Do not open
@@ -829,7 +833,7 @@
         * net/eudcb-ldap.el (eudc-attribute-display-method-alist): Use
         proper attribute name labeledUri instead of deprecated labeledUrl.
 
-2002-01-05  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-01-05  Pavel Janík  <Pavel@Janik.cz>
 
         * net/eudc-hotlist.el (eudc-edit-hotlist): Avoid error when
         editing an empty hotlist.
@@ -891,7 +895,7 @@
 
         * mail/sendmail.el (mail-recover-1, mail-recover): Doc fix.
 
-2002-01-04  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-01-04  Pavel Janík  <Pavel@Janik.cz>
 
         * net/ldap.el (ldap-host-parameters-alist): Remove duplicated
         entry.
@@ -922,7 +926,7 @@
         does not exist, call mail-recover-1 to allow recovery from past
         auto-saved drafts.
 
-2002-01-03  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-01-03  Pavel Janík  <Pavel@Janik.cz>
 
         * time.el (display-time-load-average-threshold): Fix defcustom
         (add type and group).
@@ -1041,7 +1045,7 @@
         * bindings.el (function-key-map): Don't bind shifted keypad
         numeric keys.
 
-2002-01-02  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-01-02  Pavel Janík  <Pavel@Janik.cz>
 
         * enriched.el (enriched-handle-display-prop): Remove unused
         variables.
@@ -1078,7 +1082,7 @@
         * cus-edit.el (custom-face-edit-fix-value): New function.
         (custom-face-edit): Use it, to convert :italic and :bold to new forms.
 
-2001-12-30  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-12-30  Pavel Janík  <Pavel@Janik.cz>
 
         * progmodes/octave-mod.el (octave-abbrev-table):
         * progmodes/idlwave.el (idlwave-mode-abbrev-table):
@@ -1208,7 +1212,7 @@
 
         * international/fontset.el: Don't require ind-util when compiling.
 
-2001-12-25  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-12-25  Pavel Janík  <Pavel@Janik.cz>
 
         * emulation/tpu-edt.el (tpu-reset-screen-size): Use
         set-frame-height and set-frame-width instead of set-screen-height
@@ -1296,7 +1300,7 @@
         * play/yow.el (yow): Use an arg to distinguish interactive calls,
         not interactive-p.
 
-2001-12-22  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-12-22  Pavel Janík  <Pavel@Janik.cz>
 
         * emacs-lisp/elint.el (elint-unknown-builtin-args): Remove
         mocklisp entries.
@@ -1323,7 +1327,7 @@
         * textmodes/refill.el (refill-mode): Don't barf when redundantly
         turning refill-mode off.
 
-2001-12-22  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-12-22  Pavel Janík  <Pavel@Janik.cz>
 
         * time.el (display-time-load-average-threshold): New variable.
         (display-time-update): Use it.
@@ -1466,7 +1470,7 @@
         print-coding-system-briefly): Make printed output have a similar
         format as describe-character-set.
 
-2001-12-20  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-12-20  Pavel Janík  <Pavel@Janik.cz>
 
         * play/blackbox.el (bb-member): Remove, use member instead.
         (bb-delete): Remove, use delete instead.
@@ -1500,7 +1504,7 @@
 
         * international/fontset.el: Require `ind-util' when compiling.
 
-2001-12-18  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-12-18  Pavel Janík  <Pavel@Janik.cz>
 
         * language/ethio-util.el (ethio-modify-vowel): Use char-to-string
         instead of decompose-composite-char.
@@ -1718,7 +1722,7 @@
 
         * newcomment.el (comment-indent): Jump to the middle of empty comments.
 
-2001-12-14  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-12-14  Pavel Janík  <Pavel@Janik.cz>
 
         * select.el (xselect-convert-to-class, xselect-convert-to-name):
         Document.
@@ -1766,7 +1770,7 @@
         * international/mule.el (set-auto-coding): Don't search for
         "unibyte:" or "coding:" if set-auto-mode-1 returns nil.
 
-2001-12-13  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-12-13  Pavel Janík  <Pavel@Janik.cz>
 
         * mail/mailabbrev.el (mail-abbrevs-setup): Do not use make-local-hook.
 
@@ -1822,7 +1826,7 @@
         * language/european.el: Remove autoload cookies.  Fix registration
         of diacritic composition function.
 
-2001-12-11  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-12-11  Pavel Janík  <Pavel@Janik.cz>
 
         * calendar/todo-mode.el: Require time-stamp.
 
@@ -1879,7 +1883,7 @@
         Use `select-frame-set-input-focus'--needed when window manager
         uses "click to focus" policy.
 
-2001-12-09  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-12-09  Pavel Janík  <Pavel@Janik.cz>
 
         * COPYING: Moved back.
 
@@ -2028,7 +2032,7 @@
         * textmodes/picture.el (picture-mode-map): Don't use defconst
         for a variable.
 
-2001-12-02  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-12-02  Pavel Janík  <Pavel@Janik.cz>
 
         * textmodes/reftex-index.el (reftex-index-mode):
         Remove make-local-hook.
@@ -2093,12 +2097,12 @@
 
         * man.el (Man-build-section-alist): Remove last Man-match-substring.
 
-2001-11-30  Kai Gro,A_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-11-30  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
         * textmodes/paragraphs.el (mark-paragraph): Clarify doc.
         Clarify error message.
 
-2001-11-29  Kai Gro,A_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-11-29  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
         * textmodes/paragraphs.el (mark-paragraph): Allow prefix arg.
 
@@ -2152,7 +2156,7 @@
         (Info-index): Use it.  Add completion to the interactive spec.
         (Info-menu-update): Simplify call to `Info-complete-menu-item'.
 
-2001-11-29  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-11-29  Pavel Janík  <Pavel@Janik.cz>
 
         * COPYING: Removed.
 
@@ -2169,7 +2173,7 @@
         (register-char-codings): Use it to cope with generic chars in
         safe-chars.
 
-2001-11-29  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-11-29  Pavel Janík  <Pavel@Janik.cz>
 
         * play/blackbox.el (blackbox-mode, blackbox): Doc fix.
 
@@ -2313,7 +2317,7 @@
         * frame.el (show-trailing-whitespace): Remove :set argument (the
         value was essentially identical to the defalt).
 
-2001-11-26  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-11-26  Pavel Janík  <Pavel@Janik.cz>
 
         * hexl.el (hexl-mode, hexl-follow-ascii): Remove make-local-hook.
 
@@ -2377,7 +2381,7 @@
 
         * help-funs.el (describe-syntax): Put (interactive) after doc string.
 
-2001-11-26  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-11-26  Pavel Janík  <Pavel@Janik.cz>
 
         * international/quail.el (quail-help): Require help-mode in
         top-level instead.
@@ -2448,12 +2452,12 @@
         * language/devan-util.el: Comment out parts of the file
         which apparently are garbled.
 
-2001-11-25  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-11-25  Pavel Janík  <Pavel@Janik.cz>
 
         * mail/smtpmail.el (smtpmail-deduce-address-list): Don't use
         insert-string.
 
-2001-11-25  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-11-25  Pavel Janík  <Pavel@Janik.cz>
 
         * play/snake.el (snake-mode): Remove make-local-hook.
 
@@ -2580,7 +2584,7 @@
 
         * international/encoded-kb.el: Don't alter minor-map-alist.
 
-2001-11-20  Kai Gro,A_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-11-20  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
         * files.el (auto-save-file-name-transforms): Put remote files in
         temporary-file-directory rather than /tmp.
@@ -2938,7 +2942,7 @@
         Don't recognize a "telephone number" at the beginning of the name.
         (mail-extr-leading-garbage): Match non-word characters only.
 
-2001-11-16  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-11-16  Pavel Janík  <Pavel@Janik.cz>
 
         * startup.el (command-line-processed): Doc fix.
 
@@ -2966,7 +2970,7 @@
         (multiple-value-apply, nth-value): Use defsubst rather than defalias
         to get better doc strings.
 
-2001-11-15  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-11-15  Pavel Janík  <Pavel@Janik.cz>
 
         * derived.el: Fix autoload cookie.
 
@@ -3161,7 +3165,7 @@
         (log-view-current-tag): Take an optional `where' arg.
         (log-view-diff): New user command.
 
-2001-11-12  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-11-12  Pavel Janík  <Pavel@Janik.cz>
 
         * progmodes/cpp.el (cpp-choose-face): Fix typo.
 
@@ -3201,7 +3205,7 @@
         * calc/calc-ext.el (calc-init-extensions): Update autoload names
         to match files renamed on initial calc import.
 
-2001-11-12  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-11-12  Pavel Janík  <Pavel@Janik.cz>
 
         * textmodes/flyspell.el (flyspell-default-dictionary):
         Fix previous change.
@@ -3244,7 +3248,7 @@
 2001-11-11  Colin Walters  <walters@verbum.org>
 
         The following changes are based on patches from
-        Eli Zaretskii <eliz@is.elta.co.il>, Kai Gro,A_(Bjohann
+        Eli Zaretskii <eliz@is.elta.co.il>, Kai Großjohann
         <Kai.Grossjohann@CS.Uni-Dortmund.DE>, and others.
 
         * calc/calc.el (toplevel): Require calc-macs.
@@ -3313,7 +3317,7 @@
         (radio-button-choice): Ditto.
         (editable-list): Ditto.
 
-2001-11-09  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-11-09  Pavel Janík  <Pavel@Janik.cz>
 
         * play/gomoku.el: Move definitions of constants to the beginning
         of file, before their use.
@@ -3589,7 +3593,7 @@
         (debugger-setup-buffer): Call it.
         (debugger-mode-map): Bind RET and mouse-2.
 
-2001-10-31  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-10-31  Pavel Janík  <Pavel@Janik.cz>
 
         * startup.el: Document command line option --no-window-system
         instead of --no-windows.
@@ -3732,7 +3736,7 @@
         Report numbers of files skipped and failed too.
         (byte-compile-file): Return 'no-byte-compile for skipped files.
 
-2001-10-29  Kai Gro,A_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-10-29  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
         * log-view.el (log-view-mode-map): Bind `M-n' and `M-p', not `M n'
         and `M p'.
@@ -4082,7 +4086,7 @@
         * progmodes/compile.el (compilation-set-window-height):
         Select old window only if it's still live.
 
-2001-10-22  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-10-22  Pavel Janík  <Pavel@Janik.cz>
 
         * help-mode.el (help-buffer): Remove debugging code.
         From Stefan Monnier <monnier@cs.yale.edu>.
@@ -4358,7 +4362,7 @@
 
         * version.el (emacs-version): Bump to 21.1.50.
 
-2001-10-13  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-10-13  Pavel Janík  <Pavel@Janik.cz>
 
         * mail/mailalias.el (mail-directory-stream): Do not double
         variables in the lambda-list.
@@ -4655,7 +4659,7 @@
 
         * startup.el (command-line-1): Bind tab-width to 8.
 
-2001-10-10  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-10-10  Pavel Janík  <Pavel@Janik.cz>
 
         * emulation/tpu-edt.el: Use defalias instead of fset for
         user-visible commands.  From Rob Riepel
@@ -5016,7 +5020,7 @@
 
         * pcvs-util.el (cvs-prefix-define): Typo cons->concat.
 
-2001-10-03  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-10-03  Pavel Janík  <Pavel@Janik.cz>
 
         * emulation/tpu-edt.el: Make messages match original TPU/edt
         editor.  From riepel@Stanford.EDU (Rob Riepel).
@@ -5259,7 +5263,7 @@
 2001-09-17  Andre Spiegel  <spiegel@gnu.org>
 
         * vc.el (vc-annotate): Use current workfile version explicitly as
-        a default, suggested by Gustav H,Ae(Bllberg <gustav@virtutech.se>.
+        a default, suggested by Gustav HÃ¥llberg <gustav@virtutech.se>.
 
 2001-09-16  Eli Zaretskii  <eliz@is.elta.co.il>
 
@@ -5402,7 +5406,7 @@
         * comint.el (comint-send-input): Handle comint-process-echoes
         differently.
 
-2001-09-07  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-09-07  Pavel Janík  <Pavel@Janik.cz>
 
         * locate.el (locate-insert-header): Remove unnecessary whitespace.
 
@@ -5470,7 +5474,7 @@
 
         * simple.el (backward-word): Doc fix.
 
-2001-09-03  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
+2001-09-03  Pavel Janík  <Pavel@Janik.cz>
 
         * emacs-lisp/levents.el, emacs-lisp/lucid.el, emacs-lisp/pp.el
         * uncompress.el, uniquify.el, vc.el, view.el, window.el
@@ -5513,7 +5517,7 @@
 
         * menu-bar.el (menu-bar-edit-menu) <yank-menu, yank>:
         Mention "yank" in the help-echo text.
-        Suggested by Pavel Jan,Bm(Bk <Pavel@Janik.cz>.
+        Suggested by Pavel Janík <Pavel@Janik.cz>.
 
 2001-09-01  Stefan Monnier  <monnier@cs.yale.edu>
 
@@ -5573,7 +5577,7 @@
         * startup.el (fancy-splash-screens): Temporarily set
         minor-mode-map-alist to nil while displaying splash screens.
 
-2001-08-29  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-08-29  Pavel Janík  <Pavel@Janik.cz>
 
         * buff-menu.el: Add Keywords header.
         Doc fix (C-x C-b is bound to list-buffers).
@@ -5657,19 +5661,19 @@
 2001-08-26  Eli Zaretskii  <eliz@is.elta.co.il>
 
         * textmodes/texnfo-upd.el: Remove dots and exclams at end of error
-        messages.  From Pavel Jan,Bm(Bk <Pavel@Janik.cz>.
+        messages.  From Pavel Janík <Pavel@Janik.cz>.
 
         * emacs-lisp/levents.el: Specify FSF as Maintainer.  From Pavel
-        Jan,Bm(Bk <Pavel@Janik.cz>.
+        Janík <Pavel@Janik.cz>.
 
         * emacs-lisp/lselect.el: Ditto.
 
         * hexl.el (hexl-insert-multibyte-char, hexl-insert-char):
         Remove periods from the end of error message strings.
-        From Pavel Jan,Bm(Bk <Pavel@Janik.cz>.
+        From Pavel Janík <Pavel@Janik.cz>.
 
         * progmodes/antlr-mode.el: Add Keywords header.  From Pavel
-        Jan,Bm(Bk <Pavel@Janik.cz>.
+        Janík <Pavel@Janik.cz>.
 
         * net/telnet.el: Ditto.
 
@@ -5784,12 +5788,12 @@
         TABs anyway.
 
         * whitespace.el (whitespace-version): 3.1. All of the above issues
-        were raised by Fran,Ag(Bois Pinard, which led to the fixes described.
+        were raised by François Pinard, which led to the fixes described.
 
 2001-08-20  Gerd Moellmann  <gerd@gnu.org>
 
         * textmodes/texnfo-upd.el (texinfo-every-node-update): Remove
-        some spaces from a message.  From Pavel Jan,Bm(Bk  <Pavel@Janik.cz>.
+        some spaces from a message.  From Pavel Janík  <Pavel@Janik.cz>.
 
         * whitespace.el (whitespace-global-mode): Add autoload cookie.
 
@@ -5963,7 +5967,7 @@
         text files.
         (image-jpeg-p): Correct calculation of next field offset.
 
-2001-08-08  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-08-08  Pavel Janík  <Pavel@Janik.cz>
 
         * battery.el: Fix typo.
 
@@ -6000,7 +6004,7 @@
         * image.el (image-type-regexps): Use `\`' instead of `^' in
         most regular expressions.
 
-2001-08-06  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-08-06  Pavel Janík  <Pavel@Janik.cz>
 
         * play/animate.el: Re-insert a reference to re-inserted function.
 
@@ -6014,7 +6018,7 @@
         * toolbar/tool-bar.el (tool-bar-add-item-from-menu):
         Handle old-style menu definitions.
 
-2001-08-06  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-08-06  Pavel Janík  <Pavel@Janik.cz>
 
         * textmodes/makeinfo.el, textmodes/page-ext.el, textmodes/page.el,
         * textmodes/text-mode.el, textmodes/two-column.el: Keywords added.
@@ -6023,7 +6027,7 @@
         * emulation/pc-mode.el, diff.el, textmodes/fill.el, abbrev.el,
         * add-log.el, faces.el, mail/sc.el: Specify FSF as Maintainer.
 
-2001-08-05  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-08-05  Pavel Janík  <Pavel@Janik.cz>
 
         * textmodes/tildify.el: Milan Zamazal has new address.
 
@@ -6361,7 +6365,7 @@
         * mail/mh-utils.el (mh-find-progs): Also search in `lib'.
         From Mats Bengtsson <mats.bengtsson@s3.kth.se>,
 
-2001-07-17  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-07-17  Pavel Janík  <Pavel@Janik.cz>
 
         * international/iso-transl.el: Fix typo in the header of the file.
 
@@ -6393,7 +6397,7 @@
         * server.el (server-process-filter, server-visit-files):
         Add support for +LINE:COLUMN style emacsclient calls.
 
-2001-07-16  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-07-16  Pavel Janík  <Pavel@Janik.cz>
 
         * emacs-lisp/easy-mmode.el: Add Keywords header.
 
@@ -6446,7 +6450,7 @@
 
         * progmodes/ada-xref.el (ada-xref-initialize): Fix call to add-hook.
 
-2001-07-16  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-07-16  Pavel Janík  <Pavel@Janik.cz>
 
         * ps-print.el: Fix Author: header.
 
@@ -6459,7 +6463,7 @@
         send-invisible, which is already defined in Comint.
         (eshell-watch-for-password-prompt): Use it.
 
-2001-07-16  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-07-16  Pavel Janík  <Pavel@Janik.cz>
 
         * which-func.el (which-func-mode): Doc fix.
 
@@ -6518,7 +6522,7 @@
         * simple.el (set-variable): Require 'cus-edit' instead of
         `wid-edit', so that the Custom widgets get defined.
 
-2001-07-16  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-07-16  Pavel Janík  <Pavel@Janik.cz>
 
         * allout.el: A fix to follow coding conventions.
 
@@ -6544,7 +6548,7 @@
         * dired.el (dired-insert-set-properties): Fix invalid mouse-face
         property.
 
-2001-07-16  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-07-16  Pavel Janík  <Pavel@Janik.cz>
 
         * play/5x5.el, play/decipher.el, play/dunnet.el, play/fortune.el,
         * play/gamegrid.el, play/handwrite.el, play/landmark.el,
@@ -6566,7 +6570,7 @@
         * mail/reporter.el (reporter-submit-bug-report):
         Don't abuse make-variable-buffer-local.  Fix call to add-hook.
 
-2001-07-15  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-07-15  Pavel Janík  <Pavel@Janik.cz>
 
         * calendar/cal-china.el, calendar/cal-coptic.el,
         * calendar/cal-dst.el, calendar/cal-french.el,
@@ -6693,7 +6697,7 @@
         * vt100-led.el, window.el: Some fixes to follow coding conventions in
         files maintained by FSF.
 
-2001-07-13  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-07-13  Pavel Janík  <Pavel@Janik.cz>
 
         * arc-mode.el: A fix to follow coding conventions.
 
@@ -6724,7 +6728,7 @@
 
         * play/fortune.el: Add types to defcustoms.
 
-2001-07-12  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-07-12  Pavel Janík  <Pavel@Janik.cz>
 
         * language/czech.el: A fix to follow coding conventions.
 
@@ -6753,7 +6757,7 @@
 2001-07-11  Eli Zaretskii  <eliz@is.elta.co.il>
 
         * progmodes/ada-prj.el: Say that the file _is_ part of Emacs.
-        From Pavel Jan,Bm(Bk <Pavel@Janik.cz>
+        From Pavel Janík <Pavel@Janik.cz>
 
         * progmodes/ada-mode.el: Ditto.
 
@@ -6861,10 +6865,10 @@
         * calendar/todo-mode.el (todo-top-priorities): Use delete-region
         instead of kill-line.
 
-        * play/pong.el: Fix first line.  From Pavel Jan,Bm(Bk
+        * play/pong.el: Fix first line.  From Pavel Janík
         <Pavel@Janik.cz>.
 
-        * battery.el (battery-update): Add help-echo.  From Pavel Jan,Bm(Bk
+        * battery.el (battery-update): Add help-echo.  From Pavel Janík
         <Pavel@Janik.cz>.
 
 2001-07-04  Gerd Moellmann  <gerd@gnu.org>
@@ -6902,10 +6906,10 @@
 2001-07-02  Eli Zaretskii  <eliz@is.elta.co.il>
 
         * allout.el: Fix the header line, so that finder.el recognizes it.
-        From Pavel Jan,Bm(Bk <Pavel@Janik.cz>.
+        From Pavel Janík <Pavel@Janik.cz>.
 
         * emacs-lisp/lisp-mnt.el (lm-header-prefix): Doc fix.
-        From Pavel Jan,Bm(Bk <Pavel@Janik.cz>.
+        From Pavel Janík <Pavel@Janik.cz>.
 
 2001-06-29  Eli Zaretskii  <eliz@is.elta.co.il>
 
@@ -7215,7 +7219,7 @@
 2001-06-10  Eli Zaretskii  <eliz@is.elta.co.il>
 
         * server.el (server-process, server-buffer-clients): Doc fix.
-        From Pavel Jan,Bm(Bk <Pavel@Janik.cz>.
+        From Pavel Janík <Pavel@Janik.cz>.
 
 2001-06-09  John Wiegley  <johnw@gnu.org>
 
@@ -7473,16 +7477,16 @@
 2001-05-20  Eli Zaretskii  <eliz@is.elta.co.il>
 
         * international/ccl.el (define-ccl-program): Fix a typo.
-        From Pavel Jan,Bm(Bk <Pavel@Janik.cz>.
+        From Pavel Janík <Pavel@Janik.cz>.
 
         * international/mule.el (decode-char): Fix a typo.  From Pavel
-        Jan,Bm(Bk <Pavel@Janik.cz>.
+        Janík <Pavel@Janik.cz>.
 
         * textmodes/artist.el (artist-mode): Fix a typo.  From Pavel
-        Jan,Bm(Bk <Pavel@Janik.cz>.
+        Janík <Pavel@Janik.cz>.
 
         * frame.el (automatic-hscrolling): Fix a typo.  From Pavel
-        Jan,Bm(Bk <Pavel@Janik.cz>.
+        Janík <Pavel@Janik.cz>.
 
 2001-05-18  Sam Steingold  <sds@gnu.org>
 
@@ -7714,7 +7718,7 @@
         coding-system-for-read, if it is non-nil.
 
         * calendar/holidays.el (holidays): Add an autoload cookie.
-        From Pavel Jan,Bm(Bk <Pavel@Janik.cz>.
+        From Pavel Janík <Pavel@Janik.cz>.
 
 2001-05-08  John Wiegley  <johnw@gnu.org>
 
@@ -8157,7 +8161,7 @@
 2001-04-15  Eli Zaretskii  <eliz@is.elta.co.il>
 
         * info.el (Info-additional-directory-list): Doc fix.  Suggested by
-        Kai Gro,A_(Bjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>.
+        Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>.
 
 2001-04-14  Eli Zaretskii  <eliz@is.elta.co.il>
 
@@ -8234,7 +8238,7 @@
         (toplevel): Add completion-list-mode-finish to temp-buffer-show-hook.
 
         * language/european.el ("Polish"): Change sample text.
-        From jsbien@mimuw.edu.pl (Janusz S. Bie,Bq(B).
+        From jsbien@mimuw.edu.pl (Janusz S. Bie�).
 
         * progmodes/sh-script.el (sh-indent-line): Add optional PREFIX-ARG
         parameter.
@@ -8412,10 +8416,10 @@
         Add an antry for ``converts''.
 
         * language/slovak.el ("Slovak"): Add documentation string.
-        From Pavel@Janik.cz (Pavel Jan,Bm(Bk).
+        From Pavel@Janik.cz (Pavel Janík).
 
         * language/czech.el ("Czech"): Add documentation string.
-        From Pavel@Janik.cz (Pavel Jan,Bm(Bk).
+        From Pavel@Janik.cz (Pavel Janík).
 
         * ps-mule.el (ps-mule-font-info-database-bdf): Change `isci24-etl.bdf'
         to `isci24-mule.bdf'.  From: Kenichi Handa <handa@etl.go.jp>.
@@ -9126,7 +9130,7 @@
 2001-03-15  Gerd Moellmann  <gerd@gnu.org>
 
         * textmodes/ispell.el (ispell-dictionary-alist-6): Add support
-        for Slovak.  From Pavel.Janik@suse.cz (Pavel Jan,Bm(Bk ml.).
+        for Slovak.  From Pavel.Janik@suse.cz (Pavel Janík ml.).
 
 2001-03-14  Gerd Moellmann  <gerd@gnu.org>
 
@@ -18314,7 +18318,7 @@
 2000-08-28  Peter Breton  <pbreton@ne.mediaone.net>
 
         * locate.el (locate): Cleaned up locate command's interactive prompting
-        Thanks to Fran,Ag(Bois_Pinard <pinard@iro.umontreal.ca> for suggestions.
+        Thanks to François_Pinard <pinard@iro.umontreal.ca> for suggestions.
 
         * filecache.el (file-cache-case-fold-search): New variable
         (file-cache-assoc-function): New variable
@@ -22269,7 +22273,7 @@
 
 2000-05-07  Dave Love  <fx@gnu.org>
 
-        * time.el: Small doc fixes from Pavel Jan,Am(Bk ml.
+        * time.el: Small doc fixes from Pavel Janík ml.
 
 2000-05-05  Dave Love  <fx@gnu.org>
 
diff --git a/lisp/window.el b/lisp/window.el
index 02b3fa1ffe3..ad02924a78c 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -29,6 +29,16 @@
 
 ;;; Code:
 
+(defmacro save-selected-window (&rest body)
+  "Execute BODY, then select the window that was selected before BODY.
+However, if that window has become dead, don't get an error,
+just refrain from switching to it."
+  `(let ((save-selected-window-window (selected-window)))
+     (unwind-protect
+         (progn ,@body)
+       (if (window-live-p save-selected-window-window)
+           (select-window save-selected-window-window)))))
+
 (defun window-body-height (&optional window)
   "Return number of lines in window WINDOW for actual buffer text.
 This does not include the mode line (if any) or the header line (if any)."
@@ -136,16 +146,6 @@ Anything else means restrict to the selected frame."
 (defun minibuffer-window-active-p (window)
   "Return t if WINDOW (a minibuffer window) is now active."
   (eq window (active-minibuffer-window)))
-
-(defmacro save-selected-window (&rest body)
-  "Execute BODY, then select the window that was selected before BODY.
-However, if that window has become dead, don't get an error,
-just refrain from switching to it."
-  `(let ((save-selected-window-window (selected-window)))
-     (unwind-protect
-         (progn ,@body)
-       (if (window-live-p save-selected-window-window)
-           (select-window save-selected-window-window)))))
 
 (defun count-windows (&optional minibuf)
    "Return the number of visible windows.