summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2007-11-15 16:43:40 +0000
committerJuanma Barranquero <lekktu@gmail.com>2007-11-15 16:43:40 +0000
commitba0c8532a1a2b0e6d59808ae54622eaddf93340b (patch)
tree89d0e722a12c7d105fc12898c5675feaa3b73e1a /lisp
parent3784ec80cec27405269e1110a8b7af7e730e9cf8 (diff)
downloademacs-ba0c8532a1a2b0e6d59808ae54622eaddf93340b.tar.gz
(ediff-window-setup-function): Fix typo in docstring.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ediff-wind.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el
index 8b72a673d17..4efae0c0519 100644
--- a/lisp/ediff-wind.el
+++ b/lisp/ediff-wind.el
@@ -77,7 +77,7 @@ Ediff provides a choice of three functions: `ediff-setup-windows-plain', for
doing everything in one frame, `ediff-setup-windows-multiframe', which sets
the control panel in a separate frame, and
`ediff-setup-windows-automatic' (the default), which chooses an appropriate
-behaviour based on the current window system. If the multiframe function
+behavior based on the current window system. If the multiframe function
detects that one of the buffers A/B is seen in some other frame, it will try
to keep that buffer in that frame.