Remove incorrect uses of "modeline".

* ansi-color.el (ansi-color-faces-vector): Change default faces.

* cus-edit.el (mode-line):
* dframe.el (dframe-mouse-hscroll):
* emacs-lisp/re-builder.el:
* emacs-lisp/easy-mmode.el (define-minor-mode):
* frame.el (set-frame-name):
* help.el (lookup-minor-mode-from-indicator):
* net/rcirc.el (rcirc-activity-string, rcirc-short-buffer-name):
* progmodes/cc-cmds.el (c-toggle-auto-newline)
(c-toggle-hungry-state):
* progmodes/antlr-mode.el (antlr-language-alist):
* progmodes/idlw-shell.el (idlwave-shell-electric-stop-line-face):
* progmodes/vhdl-mode.el (vhdl-mode):
* progmodes/which-func.el (which-func, which-func-cleanup-function):
* term/ns-win.el (ns-face-at-pos):
* term/sup-mouse.el (sup-mouse-report):
* textmodes/flyspell.el (flyspell-mode-line-string):
* textmodes/ispell.el (ispell-highlight-face):
* textmodes/reftex-global.el:
* vc/vc-arch.el (vc-arch-mode-line-string):
* vc/vc-cvs.el (vc-cvs-mode-line-string):
* vc/vc-git.el (vc-git-mode-line-string):
* vc/vc-hooks.el (vc-display-status)
(vc-default-mode-line-string):
* vc/vc-mtn.el (vc-mtn-mode-line-string): Doc fixes.

* dired.el (dired-sort-set-mode-line): Rename from
dired-sort-set-modeline.  All callers changed.

* foldout.el (foldout-mode-line-string): Rename from
foldout-modeline-string.  All callers changed.
(foldout-update-mode-line): Rename from foldout-update-modeline.

* strokes.el (strokes-lighter): Rename from
strokes-modeline-string.

* subr.el (redraw-modeline): Make into obsolete alias.

* calendar/timeclock.el (timeclock-mode-line-display): Rename from
timeclock-modeline-display.  Make old name an alias.
(timeclock-update-mode-line): Likewise.  All callers changed.
(timeclock-mode-line-display): No need to check before using
add-hook.
(timeclock-relative, timeclock-day-over-hook)
(timeclock-use-elapsed, timeclock-mode-string)
(timeclock-mode-line-display): Doc fix, "modeline" -> "mode line".

* emulation/crisp.el (crisp-mode-mode-line-string): Rename from
crisp-mode-modeline-string.

* erc-track.el (erc-track, erc-track-faces-priority-list)
(erc-track-faces-normal-list, erc-track-find-face)
(erc-track-modified-channels): Fix modeline -> mode line in docs.

* eshell/esh-mode.el (eshell-status-in-mode-line): Rename from
eshell-status-in-modeline.

* org-clock.el (org-clock-string-limit)
(org-clock-modeline-total, org-clock-task-overrun-text)
(org-clock-mode-line-entry): Doc fix, "modeline" -> "mode line".

* play/solitaire.el (solitaire-build-mode-line): Rename from
solitaire-build-modeline.  All callers changed.

* play/zone.el (zone-hiding-mode-line): Rename from
zone-hiding-modeline.  All callers changed.
(zone): Remove unusued `modeline-hidden-level' property.

* progmodes/xscheme.el (xscheme-mode-line-initialize): Rename from
xscheme-modeline-initialize.  All callers changed.

* textmodes/sgml-mode.el (html-face-tag-alist)
(html-tag-face-alist): Use mode-line face instead of obsolete
alias modeline.

Fixes: debbugs:10329

2 files changed, 7 insertions, 11 deletions

diff --git a/lisp/play/solitaire.el b/lisp/play/solitaire.el
index f282fa68b2a..f249faa0e15 100644
--- a/lisp/play/solitaire.el
+++ b/lisp/play/solitaire.el
@@ -201,12 +201,12 @@ Pick your favorite shortcuts:
     (setq buffer-read-only t)
     (setq solitaire-stones 32)
     (solitaire-insert-board)
-    (solitaire-build-modeline)
+    (solitaire-build-mode-line)
     (goto-char (point-max))
     (setq solitaire-center (search-backward "."))
     (setq buffer-undo-list (list (point)))))
 
-(defun solitaire-build-modeline ()
+(defun solitaire-build-mode-line ()
   (setq mode-line-format
 	(list "" "---" 'mode-line-buffer-identification
 	      (if (< 1 solitaire-stones)
@@ -353,7 +353,7 @@ which a stone will be taken away) and target."
 	(insert ?o)
 	(goto-char target)
 	(setq solitaire-stones (1- solitaire-stones))
-	(solitaire-build-modeline)
+	(solitaire-build-mode-line)
 	(if solitaire-auto-eval (solitaire-do-check))))))
 
 (defun solitaire-undo (arg)
@@ -372,7 +372,7 @@ which a stone will be taken away) and target."
 		   (<= (solitaire-current-line) solitaire-end-y)
 		   (setq count (1+ count))))
 	    count)))
-  (solitaire-build-modeline)
+  (solitaire-build-mode-line)
   (when solitaire-auto-eval (solitaire-do-check)))
 
 (defun solitaire-check ()
diff --git a/lisp/play/zone.el b/lisp/play/zone.el
index b64099844e2..34e21193437 100644
--- a/lisp/play/zone.el
+++ b/lisp/play/zone.el
@@ -30,9 +30,6 @@
 ;; Bored by the zone pyrotechnics?  Write your own!  Add it to
 ;; `zone-programs'.  See `zone-call' for higher-ordered zoning.
 
-;; WARNING: Not appropriate for Emacs sessions over modems or
-;;          computers as slow as mine.
-
 ;; THANKS: Christopher Mayer, Scott Flinchbaugh,
 ;;         Rachel Kalmar, Max Froumentin, Juri Linkov,
 ;;         Luigi Panzeri, John Paul Wallington.
@@ -78,7 +75,7 @@ If nil, don't interrupt for about 1^26 seconds.")
   `(with-current-buffer (get 'zone 'orig-buffer)
      ,@body))
 
-(defmacro zone-hiding-modeline (&rest body)
+(defmacro zone-hiding-mode-line (&rest body)
   ;; This formerly worked by temporarily altering face `mode-line',
   ;; which did not even work right, it seems.
   `(let (mode-line-format)
@@ -116,7 +113,6 @@ If the element is a function or a list of a function and a number,
           (wp (1+ (- (window-point (selected-window))
                      (window-start)))))
       (put 'zone 'orig-buffer (current-buffer))
-      (put 'zone 'modeline-hidden-level 0)
       (switch-to-buffer outbuf)
       (setq mode-name "Zone")
       (erase-buffer)
@@ -586,7 +582,7 @@ If the element is a function or a list of a function and a number,
         (setq ok (zerop (forward-line 1))
               lines (cons (buffer-substring p (point)) lines))))
     (sit-for 5)
-    (zone-hiding-modeline
+    (zone-hiding-mode-line
      (let ((msg "Zoning... (zone-pgm-stress)"))
        (while (not (string= msg ""))
          (message (setq msg (substring msg 1)))
@@ -603,7 +599,7 @@ If the element is a function or a list of a function and a number,
 
 (defun zone-pgm-stress-destress ()
   (zone-call 'zone-pgm-stress 25)
-  (zone-hiding-modeline
+  (zone-hiding-mode-line
    (sit-for 3)
    (erase-buffer)
    (sit-for 3)