From: Juanma Barranquero <lekktu@gmail.com>
Date: Thu, 15 Nov 2007 16:43:40 +0000 (+0000)
Subject: (ediff-window-setup-function): Fix typo in docstring.
X-Git-Tag: emacs-pretest-23.0.90~9724
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ba0c8532a1a2b0e6d59808ae54622eaddf93340b;p=emacs.git

(ediff-window-setup-function): Fix typo in docstring.
---

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.