Mercurial > hg > xemacs-beta
diff src/gtk-xemacs.c @ 4962:e813cf16c015
merge
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Mon, 01 Feb 2010 05:29:05 -0600 |
parents | 304aebb79cd3 b3ce27ca7647 |
children | d0c14ea98592 |
line wrap: on
line diff
--- a/src/gtk-xemacs.c Sun Jan 31 21:11:44 2010 -0600 +++ b/src/gtk-xemacs.c Mon Feb 01 05:29:05 2010 -0600 @@ -21,22 +21,21 @@ ** along with XEmacs; see the file COPYING. If not, write to ** the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, ** Boston, MA 02111-1301, USA. */ -*/ #include <config.h> #include "lisp.h" -#include "console-gtk.h" -#include "objects-gtk.h" -#include "gtk-xemacs.h" + #include "device.h" +#include "faces.h" #include "glyphs.h" #include "window.h" -#include "faces.h" -#include "event-gtk.h" + #include "frame-impl.h" #include "console-gtk-impl.h" #include "device-impl.h" +#include "gtk-xemacs.h" +#include "objects-gtk.h" extern Lisp_Object Vmodeline_face; extern Lisp_Object Vscrollbar_on_left_p;