From 3726946669effb8c66c37fb5f9996178c9adfc80 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sat, 2 Jun 2012 18:56:09 +0800 Subject: 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 --- lisp/dframe.el | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'lisp/dframe.el') diff --git a/lisp/dframe.el b/lisp/dframe.el index 2cdf4784eb0..59849e98c9e 100644 --- a/lisp/dframe.el +++ b/lisp/dframe.el @@ -516,7 +516,7 @@ LOCATION can be one of 'random, 'left-right, or 'top-bottom." (defun dframe-needed-height (&optional frame) "The needed height for the tool bar FRAME (in characters)." (or frame (setq frame (selected-frame))) - ;; The 1 is the missing modeline/minibuffer + ;; The 1 is the missing mode line or minibuffer (+ 1 (/ (frame-pixel-height frame) ;; This obscure code avoids a byte compiler warning in Emacs. (let ((f 'face-height)) @@ -969,7 +969,7 @@ broken because of the dedicated frame." (switch-to-buffer buffer) (call-interactively 'switch-to-buffer nil nil))) -;; XEmacs: this can be implemented using modeline keymaps, but there +;; XEmacs: this can be implemented using mode line keymaps, but there ;; is no use, as we have horizontal scrollbar (as the docstring ;; hints.) (defun dframe-mouse-hscroll (e) @@ -987,8 +987,7 @@ mode-line. This is only useful for non-XEmacs." ((> click-col (- (window-width) 5)) (scroll-right 2)) (t (dframe-message - "Click on the edge of the modeline to scroll left/right"))) - )) + "Click on the edge of the mode line to scroll left/right"))))) (provide 'dframe) -- cgit v1.2.1