diff src/frame.c @ 5474:4dee0387b9de

Merged with trunk.
author Mats Lidell <matsl@xemacs.org>
date Tue, 29 Mar 2011 00:02:47 +0200
parents 308d34e9f07d 3889ef128488
children 56144c8593a8
line wrap: on
line diff
--- a/src/frame.c	Thu Mar 17 23:42:59 2011 +0100
+++ b/src/frame.c	Tue Mar 29 00:02:47 2011 +0200
@@ -131,7 +131,7 @@
    which in turn contains a menubar widget and an EmacsFrame widget, inside
    of which is the client area. (The division into EmacsShell and
    EmacsManager is due to the complex and screwy geometry-management system
-   in Xt [and X more generally].  The EmacsShell handles negotation with
+   in Xt [and X more generally].  The EmacsShell handles negotiation with
    the window manager; the place of the EmacsManager widget is normally
    assumed by a widget that manages the geometry of its child widgets, but
    the EmacsManager widget just lets the XEmacs redisplay mechanism do the