diff options
Diffstat (limited to 'lisp/vc/ediff-wind.el')
| -rw-r--r-- | lisp/vc/ediff-wind.el | 4 |
1 files changed, 2 insertions, 2 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) |