2 files changed, 84 insertions, 75 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 85076fd7f40..cbef856ef40 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2002-04-15  Miles Bader  <miles@gnu.org>
+
+        * faces.el (highlight): Force foreground to be black on a tty, so
+        this face is readable on a dark-background tty.
+        * wid-edit.el (widget-field-face, widget-single-line-field-face): 
+        Likewise.
+
 2002-04-14  Kim F. Storm  <storm@cua.dk>
 
         * simple.el (pop-to-mark-command, push-mark-command): New commands.
@@ -11,7 +18,7 @@
         (exchange-point-and-mark): Temporarily enable transient-mark-mode
         if prefix arg.
 
-2002-04-14  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-04-14  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * speedbar.el (speedbar-tag-hierarchy-method)
         (speedbar-toggle-updates, speedbar-toggle-images): Doc fixes.
@@ -21,7 +28,7 @@
         * textmodes/sgml-mode.el (sgml-parse-tag-backward): Fix to work at
         beginning of buffer.
 
-2002-04-14  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-04-14  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * speedbar.el (speedbar-generic-item-info)
         (speedbar-sort-tags): Doc fix.
@@ -51,7 +58,7 @@
         (gamegrid-add-score): Just dispatch on `system-type' to one of the
         previous two functions.
 
-2002-04-13  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-04-13  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * iswitchb.el: Update commentary to include new function
         iswitchb-exclude-nonmatching.
@@ -117,7 +124,7 @@
         (fill-region-as-paragraph): Compare to `to' rather than eobp.
         (fill-paragraph): Don't rebind fill-paragraph-function.
 
-2002-04-11  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-04-11  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * menu-bar.el (menu-bar-adv-search-menu): Add incremental search.
 
@@ -235,7 +242,7 @@
         Use sgml-parse-tag-backward to find start point.
         (sgml-looking-back-at): Doc fix.
 
-2002-04-09  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-04-09  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * isearch.el (isearch-message-prefix): Use minibuffer-prompt face
         for prompt.
@@ -284,7 +291,7 @@
         * vc-cvs.el (vc-cvs-valid-version-number-p): New function.
         (vc-cvs-checkin): Use it.
 
-2002-04-08  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-04-08  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * files.el (display-time-string): Fix last change.
 
@@ -299,7 +306,7 @@
         default-process-coding-system.
         (coding-system-change-text-conversion): Fix case where CODING is nil.
 
-2002-04-07  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-04-07  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * subr.el (play-sound): Move here from simple.el.
 
@@ -326,7 +333,7 @@
 
         * textmodes/xml-lite.el: Remove.
 
-2002-04-05  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-04-05  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * simple.el (play-sound): New function (uses play-sound-internal).
 
@@ -418,7 +425,7 @@
         (sgml-parse-tag-backward): Extend support for CDATA to include
         conditional sections.
 
-2002-04-03  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-04-03  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * cus-start.el: Rename `autoselect-window' to
         `mouse-autoselect-window'.
@@ -502,7 +509,7 @@
         (inferior-tcl-mode): Doc fix.
         Change not legally significant.
 
-2002-04-01  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-04-01  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * cus-start.el: Rename `x-autoselect-window' to `autoselect-window'.
 
@@ -703,7 +710,7 @@
         for comments.
         (xml-lite-in-string-p): Simplify.
 
-2002-03-27  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-03-27  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * allout.el (outline-layout): Doc fix.
 
@@ -771,7 +778,7 @@
 
         * subr.el (substring-no-properties): Function deleted (now in C).
 
-2002-03-25  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-03-25  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * mwheel.el (mouse-wheel-mode): Use global-set-key and
         global-unset-key.
@@ -812,7 +819,7 @@
         fore- and background colors of the faces we create, since facemenu
         doesn't.
 
-2002-03-24  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-03-24  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * mwheel.el (mouse-wheel-mode): Use the result of
         current-global-map instead of the variable `global-map'.
@@ -867,7 +874,7 @@
         * mail/emacsbug.el (report-emacs-bug-hook): Remove submitter
         directions as the last action.
 
-2002-03-21  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-03-21  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * startup.el (fancy-splash-tail, normal-splash-screen):
         Update copyright.
@@ -1056,7 +1063,7 @@
         <top-level>: Remove the setup for all known codepages: it seems
         to cause crashes in the CCL driver.
 
-2002-03-16  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-03-16  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * textmodes/bibtex.el (bibtex-sort-ignore-string-entries)
         (bibtex-entry-field-alist): Doc fix.
@@ -1074,7 +1081,7 @@
         * files.el (load-completion): New function.
         (load-library): Use it.
 
-2002-03-15  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-03-15  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * calendar/cal-french.el (calendar-goto-french-date): Fix prompt
         to match the actual code.
@@ -1217,7 +1224,7 @@
 
         * comint.el: Remove documentation on setting up pcomplete.
 
-2002-03-11  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-03-11  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * font-lock.el (java-font-lock-extra-types): Add "URL" as separate
         item.  Doc fix.
@@ -1337,7 +1344,7 @@
         (hif-conditional): New function to evaluate a conditional
         expression.
 
-2002-03-06  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-03-06  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * language/czech.el ("Czech"): Fix the documentation.
 
@@ -1400,7 +1407,7 @@
         (mode-line-inactive, header-line): Move the `t' section to the
         beginning so the `:inherit' setting can be shared.
 
-2002-03-04  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-03-04  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * net/snmp-mode.el: Require tempo when compiling to prevent
         warnings.  Update copyright notice.
@@ -1521,7 +1528,7 @@
         * font-lock.el (java-font-lock-extra-types):
         Match java.net.URL, etc.
 
-2002-02-28  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-02-28  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * hexl.el (hexl-options): Doc fix.
         Update Commentary section.
@@ -1801,7 +1808,7 @@
         * progmodes/tcl.el (tcl-do-fill-paragraph): Find and fill on more
         natural paragraph boundaries.  Don't fail at beginning of buffer.
 
-2002-02-20  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-02-20  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * tar-mode.el (tar-next-line, tar-previous-line): Add doc string,
         call the argument "arg" to match plain next-line and
@@ -1905,7 +1912,7 @@
         * cus-start.el: Add automatic-hscroll-margin and
         automatic-hscroll-step.
 
-2002-02-16  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-02-16  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * cus-start.el (x-autoselect-window): Allow customization.
 
@@ -2125,7 +2132,7 @@
         * cus-start.el: Don't warn about "x-*" symbols when building a
         non-GUI version.
 
-2002-02-11  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-02-11  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * strokes.el (strokes-do-stroke, strokes-do-complex-stroke):
         Doc fix.
@@ -2150,7 +2157,7 @@
         (dump-charsets, dump-codings): Deleted (obsolete).
         From Dave Love <fx@gnu.org>.
 
-2002-02-10  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-02-10  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * menu-bar.el (menu-bar-showhide-menu): Rename functions for toggling.
 
@@ -2173,7 +2180,7 @@
 
         * ediff.el: Typo in comment.
 
-2002-02-09  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-02-09  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * menu-bar.el (menu-bar-options-save): Take care of
         line-number-mode and column-number-mode variables.
@@ -2250,7 +2257,7 @@
         * subr.el (global-set-key, local-set-key): Accept a symbol for the
         KEY argument (like define-key).
 
-2002-02-06  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-02-06  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * textmodes/flyspell.el (flyspell-insert-function): Doc fix.
 
@@ -2331,7 +2338,7 @@
         * cus-edit.el (customize-mark-to-save): New function.
         * menu-bar.el (menu-bar-options-save): Rewrote.
 
-2002-02-05  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-02-05  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * cus-start.el (x-use-underline-position-properties):
         Allow customization.
@@ -2364,11 +2371,11 @@
         * window.el (save-selected-window): Move macro before first use.
         (balance-windows): Fix misplaced parenthesis.
 
-2002-02-03  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-02-03  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * calculator.el (calculator-displayers): Doc fixes.
 
-2002-02-03  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-02-03  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * menu-bar.el (menu-bar-help-menu): Use different text for tool-tip.
         (menu-bar-options-save): Save also the value of `display-time-mode'.
@@ -2407,7 +2414,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,Am(Bk  <Pavel@Janik.cz>
 
         * cus-edit.el (customize-save-variable): Fix typo in prompt.
 
@@ -2496,7 +2503,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,Am(Bk  <Pavel@Janik.cz>
 
         * menu-bar.el (menu-bar-help-menu): Change menu-item "Show Emacs
         Version" to "About Emacs".
@@ -2513,7 +2520,7 @@
 
         * calendar/calendar.el (generate-calendar-month): Doc fix.
 
-2002-01-27  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-01-27  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * time.el (display-time-mail-directory): New option.
         (display-time-mail-function): Update doc-string.
@@ -2728,7 +2735,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,Am(Bk  <Pavel@Janik.cz>
 
         * tempo.el (tempo-define-template): Doc fix.
 
@@ -2745,7 +2752,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,Am(Bk  <Pavel@Janik.cz>
 
         * language/tibet-util.el (tibetan-decompose-region)
         (tibetan-decompose-string): Fix typo in docstring.
@@ -2837,7 +2844,7 @@
 
         * mail/feedmail.el (feedmail): Fix :link spec.
 
-2002-01-16  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-01-16  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * net/ldap.el (ldap-ldapsearch-prog): Default to OpenLDAP version
         2 ldapsearch.
@@ -2955,7 +2962,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,Am(Bk  <Pavel@Janik.cz>
 
         * textmodes/flyspell.el (flyspell-check-pre-word-p): Prevent
         delaying when executing keyboard macros.
@@ -3040,7 +3047,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,Am(Bk  <Pavel@Janik.cz>
 
         * progmodes/ada-mode.el (ada-initialize-properties, ada-mode):
         Do not use make-local-hook.
@@ -3056,7 +3063,7 @@
 
         * ediff-hook.el: Add an autoload cookie.
 
-2002-01-08  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2002-01-08  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * net/eudcb-ph.el, net/ldap.el: New maintainer.  New e-mail
         address of the author.
@@ -3168,7 +3175,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,Am(Bk  <Pavel@Janik.cz>
 
         * net/ldap.el (ldap-search-internal): Skip error message from
         ldapsearch.  Allow listing attribute names only.  Do not open
@@ -3192,7 +3199,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,Am(Bk  <Pavel@Janik.cz>
 
         * net/eudc-hotlist.el (eudc-edit-hotlist): Avoid error when
         editing an empty hotlist.
@@ -3254,7 +3261,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,Am(Bk  <Pavel@Janik.cz>
 
         * net/ldap.el (ldap-host-parameters-alist): Remove duplicated
         entry.
@@ -3285,7 +3292,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,Am(Bk  <Pavel@Janik.cz>
 
         * time.el (display-time-load-average-threshold): Fix defcustom
         (add type and group).
@@ -3404,7 +3411,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,Am(Bk  <Pavel@Janik.cz>
 
         * enriched.el (enriched-handle-display-prop): Remove unused
         variables.
@@ -3441,7 +3448,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,Am(Bk  <Pavel@Janik.cz>
 
         * progmodes/octave-mod.el (octave-abbrev-table):
         * progmodes/idlwave.el (idlwave-mode-abbrev-table):
@@ -3571,7 +3578,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,Am(Bk  <Pavel@Janik.cz>
 
         * emulation/tpu-edt.el (tpu-reset-screen-size): Use
         set-frame-height and set-frame-width instead of set-screen-height
@@ -3659,7 +3666,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,Am(Bk  <Pavel@Janik.cz>
 
         * emacs-lisp/elint.el (elint-unknown-builtin-args): Remove
         mocklisp entries.
@@ -3686,7 +3693,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,Am(Bk  <Pavel@Janik.cz>
 
         * time.el (display-time-load-average-threshold): New variable.
         (display-time-update): Use it.
@@ -3829,7 +3836,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,Am(Bk  <Pavel@Janik.cz>
 
         * play/blackbox.el (bb-member): Remove, use member instead.
         (bb-delete): Remove, use delete instead.
@@ -3863,7 +3870,7 @@
 
         * international/fontset.el: Require `ind-util' when compiling.
 
-2001-12-18  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-12-18  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * language/ethio-util.el (ethio-modify-vowel): Use char-to-string
         instead of decompose-composite-char.
@@ -4081,7 +4088,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,Am(Bk  <Pavel@Janik.cz>
 
         * select.el (xselect-convert-to-class, xselect-convert-to-name):
         Document.
@@ -4129,7 +4136,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,Am(Bk  <Pavel@Janik.cz>
 
         * mail/mailabbrev.el (mail-abbrevs-setup): Do not use make-local-hook.
 
@@ -4185,7 +4192,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,Am(Bk  <Pavel@Janik.cz>
 
         * calendar/todo-mode.el: Require time-stamp.
 
@@ -4242,7 +4249,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,Am(Bk  <Pavel@Janik.cz>
 
         * COPYING: Moved back.
 
@@ -4391,7 +4398,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,Am(Bk  <Pavel@Janik.cz>
 
         * textmodes/reftex-index.el (reftex-index-mode):
         Remove make-local-hook.
@@ -4515,7 +4522,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,Am(Bk  <Pavel@Janik.cz>
 
         * COPYING: Removed.
 
@@ -4532,7 +4539,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,Am(Bk  <Pavel@Janik.cz>
 
         * play/blackbox.el (blackbox-mode, blackbox): Doc fix.
 
@@ -4676,7 +4683,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,Am(Bk  <Pavel@Janik.cz>
 
         * hexl.el (hexl-mode, hexl-follow-ascii): Remove make-local-hook.
 
@@ -4740,7 +4747,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,Am(Bk  <Pavel@Janik.cz>
 
         * international/quail.el (quail-help): Require help-mode in
         top-level instead.
@@ -4811,12 +4818,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,Am(Bk  <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,Am(Bk  <Pavel@Janik.cz>
 
         * play/snake.el (snake-mode): Remove make-local-hook.
 
@@ -5301,7 +5308,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,Am(Bk  <Pavel@Janik.cz>
 
         * startup.el (command-line-processed): Doc fix.
 
@@ -5329,7 +5336,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,Am(Bk  <Pavel@Janik.cz>
 
         * derived.el: Fix autoload cookie.
 
@@ -5524,7 +5531,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,Am(Bk  <Pavel@Janik.cz>
 
         * progmodes/cpp.el (cpp-choose-face): Fix typo.
 
@@ -5564,7 +5571,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,Am(Bk  <Pavel@Janik.cz>
 
         * textmodes/flyspell.el (flyspell-default-dictionary):
         Fix previous change.
@@ -5676,7 +5683,7 @@
         (radio-button-choice): Ditto.
         (editable-list): Ditto.
 
-2001-11-09  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+2001-11-09  Pavel Jan,Am(Bk  <Pavel@Janik.cz>
 
         * play/gomoku.el: Move definitions of constants to the beginning
         of file, before their use.
@@ -5952,7 +5959,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,Am(Bk  <Pavel@Janik.cz>
 
         * startup.el: Document command line option --no-window-system
         instead of --no-windows.
@@ -6445,7 +6452,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,Am(Bk  <Pavel@Janik.cz>
 
         * help-mode.el (help-buffer): Remove debugging code.
         From Stefan Monnier <monnier@cs.yale.edu>.
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index ba4ce1131a3..2079a901427 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -124,28 +124,30 @@ This exists as a variable so it can be set locally in certain buffers.")
 ;; the gray colors defined for other displays cause black text on a black
 ;; background, at least on light-background TTYs.
 (defface widget-field-face '((((type tty))
-                              (:background "yellow3"))
+                              :background "yellow3"
+                              :foreground "black")
                              (((class grayscale color)
                                (background light))
-                              (:background "gray85"))
+                              :background "gray85")
                              (((class grayscale color)
                                (background dark))
-                              (:background "dim gray"))
+                              :background "dim gray")
                              (t
-                              (:slant italic)))
+                              :slant italic))
   "Face used for editable fields."
   :group 'widget-faces)
 
 (defface widget-single-line-field-face '((((type tty))
-                                          (:background "green3"))
+                                          :background "green3"
+                                          :foreground "black")
                                          (((class grayscale color)
                                            (background light))
-                                          (:background "gray85"))
+                                          :background "gray85")
                                          (((class grayscale color)
                                            (background dark))
-                                          (:background "dim gray"))
+                                          :background "dim gray")
                                          (t
-                                          (:slant italic)))
+                                          :slant italic))
   "Face used for editable fields spanning only a single line."
   :group 'widget-faces)