diff options
Diffstat (limited to 'lisp/vc')
| -rw-r--r-- | lisp/vc/ediff-wind.el | 4 | ||||
| -rw-r--r-- | lisp/vc/vc-arch.el | 2 | ||||
| -rw-r--r-- | lisp/vc/vc-cvs.el | 2 | ||||
| -rw-r--r-- | lisp/vc/vc-git.el | 2 | ||||
| -rw-r--r-- | lisp/vc/vc-hooks.el | 6 | ||||
| -rw-r--r-- | lisp/vc/vc-mtn.el | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/lisp/vc/ediff-wind.el b/lisp/vc/ediff-wind.el index 50f2be3b8dc..cc8ef4ad5c0 100644 --- a/lisp/vc/ediff-wind.el +++ b/lisp/vc/ediff-wind.el @@ -957,7 +957,7 @@ into icons, regardless of the window manager." (and (eq this-command 'ediff-toggle-help) dont-iconify-ctl-frame)) - ;; 1 more line for the modeline + ;; 1 more line for the mode line (setq lines (1+ (count-lines (point-min) (point-max))) fheight lines fwidth (max (+ (ediff-help-message-line-length) 2) @@ -1141,7 +1141,7 @@ It assumes that it is called from within the control buffer." ;; Revise the mode line to display which difference we have selected -;; Also resets modelines of buffers A/B, since they may be clobbered by +;; Also resets mode lines of buffers A/B, since they may be clobbered by ;; other invocations of Ediff. (defun ediff-refresh-mode-lines () (let (buf-A-state-diff buf-B-state-diff buf-C-state-diff buf-C-state-merge) diff --git a/lisp/vc/vc-arch.el b/lisp/vc/vc-arch.el index 18dfbe1f5fa..afeab878f1e 100644 --- a/lisp/vc/vc-arch.el +++ b/lisp/vc/vc-arch.el @@ -385,7 +385,7 @@ CALLBACK expects (ENTRIES &optional MORE-TO-COME); see :group 'vc-arch) (defun vc-arch-mode-line-string (file) - "Return string for placement in modeline by `vc-mode-line' for FILE." + "Return a string for `vc-mode-line' to put in the mode line for FILE." (let ((rev (vc-working-revision file))) (dolist (rule vc-arch-mode-line-rewrite) (if (string-match (car rule) rev) diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el index 4d06e766a35..300dc463a3c 100644 --- a/lisp/vc/vc-cvs.el +++ b/lisp/vc/vc-cvs.el @@ -256,7 +256,7 @@ See also variable `vc-cvs-sticky-date-format-string'." (vc-file-getprop file 'vc-working-revision)) (defun vc-cvs-mode-line-string (file) - "Return string for placement into the modeline for FILE. + "Return a string for `vc-mode-line' to put in the mode line for FILE. Compared to the default implementation, this function does two things: Handle the special case of a CVS file that is added but not yet committed and support display of sticky tags." diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index ebaec2494ac..63243cdbc20 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -247,7 +247,7 @@ matching the resulting Git log output, and KEYWORDS is a list of (eq 'up-to-date (vc-git-state file))) (defun vc-git-mode-line-string (file) - "Return string for placement into the modeline for FILE." + "Return a string for `vc-mode-line' to put in the mode line for FILE." (let* ((branch (vc-git-working-revision file)) (def-ml (vc-default-mode-line-string 'Git file)) (help-echo (get-text-property 0 'help-echo def-ml))) diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el index b6f07ef1dc4..bba72177050 100644 --- a/lisp/vc/vc-hooks.el +++ b/lisp/vc/vc-hooks.el @@ -102,7 +102,7 @@ visited and a warning displayed." :group 'vc) (defcustom vc-display-status t - "If non-nil, display revision number and lock status in modeline. + "If non-nil, display revision number and lock status in mode line. Otherwise, not displayed." :type 'boolean :group 'vc) @@ -790,7 +790,7 @@ If BACKEND is passed use it as the VC backend when computing the result." backend) (defun vc-default-mode-line-string (backend file) - "Return string for placement in modeline by `vc-mode-line' for FILE. + "Return a string for `vc-mode-line' to put in the mode line for FILE. Format: \"BACKEND-REV\" if the file is up-to-date @@ -866,7 +866,7 @@ current, and kill the buffer that visits the link." (let (backend) (cond ((setq backend (with-demoted-errors (vc-backend buffer-file-name))) - ;; Compute the state and put it in the modeline. + ;; Compute the state and put it in the mode line. (vc-mode-line buffer-file-name backend) (unless vc-make-backup-files ;; Use this variable, not make-backup-files, diff --git a/lisp/vc/vc-mtn.el b/lisp/vc/vc-mtn.el index bd3a6207b73..a3d5f09255e 100644 --- a/lisp/vc/vc-mtn.el +++ b/lisp/vc/vc-mtn.el @@ -161,7 +161,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." :group 'vc-mtn) (defun vc-mtn-mode-line-string (file) - "Return string for placement in modeline by `vc-mode-line' for FILE." + "Return a string for `vc-mode-line' to put in the mode line for FILE." (let ((branch (vc-mtn-workfile-branch file))) (dolist (rule vc-mtn-mode-line-rewrite) (if (string-match (car rule) branch) |