diff --git a/ChangeLog b/ChangeLog
index 676874c4d..8d4c9e058 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-01  Elijah Newren  <newren gmail com>
+
+	* src/*.[ch]: Stick an emacs comment directive at the beginning of
+	all the code files so that people using emacs will be more likely
+	to get coding style correct in their patches.  We still need a
+	similar vi directive.  #358866
+
 2006-10-01  Elijah Newren  <newren gmail com>
 
 	Patch from Carlo Wood to ensure that maximized and minimized
diff --git a/src/api.c b/src/api.c
index c6e5a74d4..5ce146180 100644
--- a/src/api.c
+++ b/src/api.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity misc. public entry points */
 
 /* 
diff --git a/src/api.h b/src/api.h
index 526af6bc7..6ad938b5b 100644
--- a/src/api.h
+++ b/src/api.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity misc. public entry points */
 
 /* 
diff --git a/src/async-getprop.c b/src/async-getprop.c
index 60d6b3a92..fb5484c1f 100644
--- a/src/async-getprop.c
+++ b/src/async-getprop.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Asynchronous X property getting hack */
 
 /*
diff --git a/src/async-getprop.h b/src/async-getprop.h
index 15ac1feda..e11ca131b 100644
--- a/src/async-getprop.h
+++ b/src/async-getprop.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Asynchronous X property getting hack */
 
 /*
diff --git a/src/bell.c b/src/bell.c
index b73a75279..6e1f701da 100644
--- a/src/bell.c
+++ b/src/bell.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity visual bell */
 
 /* 
diff --git a/src/bell.h b/src/bell.h
index ff29803f3..7c1e3afc6 100644
--- a/src/bell.h
+++ b/src/bell.h
@@ -1,5 +1,6 @@
 /* Metacity visual bell */
 
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /* 
  * Copyright (C) 2002 Sun Microsystems Inc.
  * 
diff --git a/src/boxes.c b/src/boxes.c
index d01d2851c..f40a085ee 100644
--- a/src/boxes.c
+++ b/src/boxes.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Simple box operations */
 
 /* 
diff --git a/src/boxes.h b/src/boxes.h
index 52c366982..5c9552da3 100644
--- a/src/boxes.h
+++ b/src/boxes.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Simple box operations */
 
 /* 
diff --git a/src/c-screen.c b/src/c-screen.c
index 725213b3c..237c51e2e 100644
--- a/src/c-screen.c
+++ b/src/c-screen.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* 
  * Copyright (C) 2006 Red Hat, Inc.
  * 
diff --git a/src/c-screen.h b/src/c-screen.h
index 9cca1addb..7d6c2167b 100644
--- a/src/c-screen.h
+++ b/src/c-screen.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 #include "screen.h"
 #include "c-window.h"
 
diff --git a/src/c-window.c b/src/c-window.c
index 76c1ad9b1..89f7d23cc 100644
--- a/src/c-window.c
+++ b/src/c-window.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* 
  * Copyright (C) 2006 Red Hat, Inc.
  * 
diff --git a/src/c-window.h b/src/c-window.h
index 571497b94..c7a574fb7 100644
--- a/src/c-window.h
+++ b/src/c-window.h
@@ -1,3 +1,4 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /* 
  * Copyright (C) 2006 Red Hat, Inc.
  * 
@@ -27,7 +28,7 @@
 typedef struct _MetaCompWindow MetaCompWindow;
 
 typedef void (* MetaCompWindowDestroy) (MetaCompWindow *window,
-					gpointer        closure);
+                                        gpointer        closure);
 
 MetaCompWindow *meta_comp_window_new (MetaScreen *screen,
 				      WsDrawable *drawable,
diff --git a/src/colors.c b/src/colors.c
index e0b1d69f1..13340d5f6 100644
--- a/src/colors.c
+++ b/src/colors.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity RGB color stuff */
 
 /* 
diff --git a/src/colors.h b/src/colors.h
index 03849adb2..41bde10b7 100644
--- a/src/colors.h
+++ b/src/colors.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity RGB color stuff */
 
 /* 
diff --git a/src/common.h b/src/common.h
index f075c61e5..e5602d821 100644
--- a/src/common.h
+++ b/src/common.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity common types shared by core.h and ui.h */
 
 /* 
diff --git a/src/compositor.c b/src/compositor.c
index 613c703c7..05b4e1fb2 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* 
  * Copyright (C) 2003, 2004, 2005, 2006 Red Hat, Inc.
  * Copyright (C) 2003 Keith Packard
diff --git a/src/compositor.h b/src/compositor.h
index 7358d922f..7340bcc6b 100644
--- a/src/compositor.h
+++ b/src/compositor.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity compositing manager */
 
 /* 
diff --git a/src/constraints.c b/src/constraints.c
index 4c2fbbc8d..96bdf4912 100644
--- a/src/constraints.c
+++ b/src/constraints.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity size/position constraints */
 
 /*
diff --git a/src/constraints.h b/src/constraints.h
index 031b95056..8ce332e71 100644
--- a/src/constraints.h
+++ b/src/constraints.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity size/position constraints */
 
 /* 
diff --git a/src/core.c b/src/core.c
index 8fc033034..32ce97325 100644
--- a/src/core.c
+++ b/src/core.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity interface used by GTK+ UI to talk to core */
 
 /* 
diff --git a/src/core.h b/src/core.h
index d1450a30f..6d6da141e 100644
--- a/src/core.h
+++ b/src/core.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity interface used by GTK+ UI to talk to core */
 
 /* 
diff --git a/src/delete.c b/src/delete.c
index 9462db2f7..30941aee8 100644
--- a/src/delete.c
+++ b/src/delete.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity window deletion */
 
 /* 
diff --git a/src/display.c b/src/display.c
index fd6ebcb31..cc266d728 100644
--- a/src/display.c
+++ b/src/display.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity X display handler */
 
 /* 
diff --git a/src/display.h b/src/display.h
index 528e23271..8973159ac 100644
--- a/src/display.h
+++ b/src/display.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity X display handler */
 
 /* 
diff --git a/src/draw-workspace.c b/src/draw-workspace.c
index a55c10f8f..c5998a1dd 100644
--- a/src/draw-workspace.c
+++ b/src/draw-workspace.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Draw a workspace */
 
 /* This file should not be modified to depend on other files in
diff --git a/src/draw-workspace.h b/src/draw-workspace.h
index 19b203d9e..de60550dc 100644
--- a/src/draw-workspace.h
+++ b/src/draw-workspace.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Draw a workspace */
 
 /* This file should not be modified to depend on other files in
diff --git a/src/edge-resistance.c b/src/edge-resistance.c
index a00612332..25b3ec73a 100644
--- a/src/edge-resistance.c
+++ b/src/edge-resistance.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Edge resistance for move/resize operations */
 
 /* 
diff --git a/src/edge-resistance.h b/src/edge-resistance.h
index f327c83ed..6d0dbe0bf 100644
--- a/src/edge-resistance.h
+++ b/src/edge-resistance.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Edge resistance for move/resize operations */
 
 /* 
diff --git a/src/effects.c b/src/effects.c
index f2ef7d146..45032d9f8 100644
--- a/src/effects.c
+++ b/src/effects.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity animation effects */
 
 /* 
diff --git a/src/effects.h b/src/effects.h
index 23a9c2dac..6fc8bf943 100644
--- a/src/effects.h
+++ b/src/effects.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity animation effects */
 
 /* 
diff --git a/src/errors.c b/src/errors.c
index f7e0bf274..854ef46b6 100644
--- a/src/errors.c
+++ b/src/errors.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity X error handling */
 
 /* 
diff --git a/src/errors.h b/src/errors.h
index 94cf603ac..c18eaa72b 100644
--- a/src/errors.h
+++ b/src/errors.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity X error handling */
 
 /* 
@@ -26,8 +28,8 @@
 #include "display.h"
 
 typedef void (* ErrorHandler) (Display *dpy,
-			       XErrorEvent *error,
-			       gpointer data);
+                               XErrorEvent *error,
+                               gpointer data);
 
 void      meta_errors_init     (void);
 void	  meta_errors_register_foreign_display (Display      *foreign_dpy,
diff --git a/src/eventqueue.c b/src/eventqueue.c
index 1d2576f0d..4ce3e46ad 100644
--- a/src/eventqueue.c
+++ b/src/eventqueue.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity X event source for main loop */
 
 /* 
diff --git a/src/eventqueue.h b/src/eventqueue.h
index 0e256fc07..cd115bdbc 100644
--- a/src/eventqueue.h
+++ b/src/eventqueue.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity X event source for main loop */
 
 /* 
diff --git a/src/fixedtip.c b/src/fixedtip.c
index 313160854..8ea3f3f77 100644
--- a/src/fixedtip.c
+++ b/src/fixedtip.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity fixed tooltip routine */
 
 /* 
diff --git a/src/fixedtip.h b/src/fixedtip.h
index 96f54d580..3b3e6fffe 100644
--- a/src/fixedtip.h
+++ b/src/fixedtip.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity fixed tooltip routine */
 
 /* 
diff --git a/src/frame.c b/src/frame.c
index 445f89c76..467e36b36 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity X window decorations */
 
 /* 
diff --git a/src/frame.h b/src/frame.h
index 02de0abd5..859e25afc 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity X window decorations */
 
 /* 
diff --git a/src/frames.c b/src/frames.c
index 12b196cf5..c5827dc12 100644
--- a/src/frames.c
+++ b/src/frames.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity window frame manager widget */
 
 /* 
diff --git a/src/frames.h b/src/frames.h
index d7db935e8..1d674eaba 100644
--- a/src/frames.h
+++ b/src/frames.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity window frame manager widget */
 
 /* 
diff --git a/src/gradient.c b/src/gradient.c
index f61d95584..679062317 100644
--- a/src/gradient.c
+++ b/src/gradient.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity gradient rendering */
 
 /* 
diff --git a/src/gradient.h b/src/gradient.h
index d441b16ad..58d6d40e3 100644
--- a/src/gradient.h
+++ b/src/gradient.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity gradient rendering */
 
 /* 
diff --git a/src/group-private.h b/src/group-private.h
index 1ec7a249d..25b05c777 100644
--- a/src/group-private.h
+++ b/src/group-private.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity window group private header */
 
 /* 
diff --git a/src/group-props.c b/src/group-props.c
index ae3a29110..9d5af05ec 100644
--- a/src/group-props.c
+++ b/src/group-props.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* MetaGroup property handling */
 
 /* 
diff --git a/src/group-props.h b/src/group-props.h
index 727c636a4..ffde09014 100644
--- a/src/group-props.h
+++ b/src/group-props.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* MetaGroup property handling */
 
 /* 
diff --git a/src/group.c b/src/group.c
index a2f798196..1e721a958 100644
--- a/src/group.c
+++ b/src/group.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity window groups */
 
 /* 
diff --git a/src/group.h b/src/group.h
index 3f1425b5b..84133827f 100644
--- a/src/group.h
+++ b/src/group.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity window groups */
 
 /* 
diff --git a/src/iconcache.c b/src/iconcache.c
index eca5db07f..5c8ac19ff 100644
--- a/src/iconcache.c
+++ b/src/iconcache.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity window icons */
 
 /*
diff --git a/src/iconcache.h b/src/iconcache.h
index eadf52179..1cb73a65d 100644
--- a/src/iconcache.h
+++ b/src/iconcache.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity window icons */
 
 /* 
diff --git a/src/keybindings.c b/src/keybindings.c
index 2f01d2021..102af63e9 100644
--- a/src/keybindings.c
+++ b/src/keybindings.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity Keybindings */ 
 /* 
  * Copyright (C) 2001 Havoc Pennington
diff --git a/src/keybindings.h b/src/keybindings.h
index 70848f924..0f5e4d580 100644
--- a/src/keybindings.h
+++ b/src/keybindings.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity Keybindings */
 
 /* 
diff --git a/src/main.c b/src/main.c
index 3c4052786..49c30b8f8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity main() */
 
 /* 
diff --git a/src/main.h b/src/main.h
index cda080fec..1eada677c 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity main */
 
 /* 
diff --git a/src/menu.c b/src/menu.c
index 3f6a0ad16..e02dd21e6 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity window menu */
 
 /* 
diff --git a/src/menu.h b/src/menu.h
index 39902fd4c..6bb544a68 100644
--- a/src/menu.h
+++ b/src/menu.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity window menu */
 
 /* 
diff --git a/src/metaaccellabel.c b/src/metaaccellabel.c
index 0d197c5ac..0c2a76d3b 100644
--- a/src/metaaccellabel.c
+++ b/src/metaaccellabel.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity hacked-up GtkAccelLabel */
 /* Copyright (C) 2002 Red Hat, Inc. */
 /* GTK - The GIMP Toolkit
diff --git a/src/metaaccellabel.h b/src/metaaccellabel.h
index abaf7e689..228232761 100644
--- a/src/metaaccellabel.h
+++ b/src/metaaccellabel.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity hacked-up GtkAccelLabel */
 /* Copyright (C) 2002 Red Hat, Inc. */
 /* GTK - The GIMP Toolkit
diff --git a/src/metacity-Xatomtype.h b/src/metacity-Xatomtype.h
index 7ab7e5a04..ff33cbe0e 100644
--- a/src/metacity-Xatomtype.h
+++ b/src/metacity-Xatomtype.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* $Xorg: Xatomtype.h,v 1.4 2001/02/09 02:03:38 xorgcvs Exp $ */
 
 /***********************************************************
diff --git a/src/metacity-dialog.c b/src/metacity-dialog.c
index 28519be3a..7e733254b 100644
--- a/src/metacity-dialog.c
+++ b/src/metacity-dialog.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity dialog process */
 
 /* 
diff --git a/src/place.c b/src/place.c
index 1b86240d1..bf88779f1 100644
--- a/src/place.c
+++ b/src/place.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity window placement */
 
 /* 
diff --git a/src/place.h b/src/place.h
index 6e86ebb1f..2948fe7ac 100644
--- a/src/place.h
+++ b/src/place.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity window placement */
 
 /* 
diff --git a/src/prefs.c b/src/prefs.c
index 86fc9a6c6..c50049114 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity preferences */
 
 /* 
diff --git a/src/prefs.h b/src/prefs.h
index a568ed780..f1e81a8c5 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity preferences */
 
 /* 
diff --git a/src/preview-widget.c b/src/preview-widget.c
index 8038c5fb3..5aa0fa563 100644
--- a/src/preview-widget.c
+++ b/src/preview-widget.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity theme preview widget */
 
 /* 
diff --git a/src/preview-widget.h b/src/preview-widget.h
index f6ae48ab8..bfa964b32 100644
--- a/src/preview-widget.h
+++ b/src/preview-widget.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity theme preview widget */
 
 /* 
diff --git a/src/resizepopup.c b/src/resizepopup.c
index b2e95528a..f68e3c31e 100644
--- a/src/resizepopup.c
+++ b/src/resizepopup.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity resizing-terminal-window feedback */
 
 /* 
diff --git a/src/resizepopup.h b/src/resizepopup.h
index a72067982..a861ff388 100644
--- a/src/resizepopup.h
+++ b/src/resizepopup.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity resizing-terminal-window feedback */
 
 /* 
diff --git a/src/screen.c b/src/screen.c
index 12575a882..dbf3cf982 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity X screen handler */
 
 /* 
diff --git a/src/screen.h b/src/screen.h
index 8f7fb439e..009e22fd3 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity X screen handler */
 
 /* 
diff --git a/src/session.c b/src/session.c
index cc625e298..1031b2420 100644
--- a/src/session.c
+++ b/src/session.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity Session Management */
 
 /* 
diff --git a/src/session.h b/src/session.h
index 1fa09c8f3..cc88fd507 100644
--- a/src/session.h
+++ b/src/session.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity Session Management */
 
 /* 
diff --git a/src/spring-model.c b/src/spring-model.c
index a1dd44639..60e2ad889 100644
--- a/src/spring-model.c
+++ b/src/spring-model.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 #include "spring-model.h"
 #include <math.h>
 
diff --git a/src/spring-model.h b/src/spring-model.h
index b15e61f15..83ee1dadd 100644
--- a/src/spring-model.h
+++ b/src/spring-model.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 #include "window.h"
 
 typedef struct XYPair Point;
diff --git a/src/stack.c b/src/stack.c
index 6202966e0..de3402eaf 100644
--- a/src/stack.c
+++ b/src/stack.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity Window Stack */
 
 /* 
diff --git a/src/stack.h b/src/stack.h
index 831a19bfe..5760de241 100644
--- a/src/stack.h
+++ b/src/stack.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity Window Stack */
 
 /* 
diff --git a/src/tabpopup.c b/src/tabpopup.c
index 2ef1f05fb..af24764a9 100644
--- a/src/tabpopup.c
+++ b/src/tabpopup.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity popup window thing showing windows you can tab to */
 
 /* 
diff --git a/src/tabpopup.h b/src/tabpopup.h
index 6695c9d26..c210a1917 100644
--- a/src/tabpopup.h
+++ b/src/tabpopup.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity tab popup window */
 
 /* 
diff --git a/src/testasyncgetprop.c b/src/testasyncgetprop.c
index 702c1f327..267f16a57 100644
--- a/src/testasyncgetprop.c
+++ b/src/testasyncgetprop.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /*
  * Copyright (C) 2002 Havoc Pennington
  *
diff --git a/src/testboxes.c b/src/testboxes.c
index 797474766..9e958b75a 100644
--- a/src/testboxes.c
+++ b/src/testboxes.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity box operation testing program */
 
 /* 
diff --git a/src/testgradient.c b/src/testgradient.c
index ae7c125c9..6ecc4b8ed 100644
--- a/src/testgradient.c
+++ b/src/testgradient.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity gradient test program */
 
 /* 
diff --git a/src/theme-parser.c b/src/theme-parser.c
index 7e7d47c62..1013c2b8e 100644
--- a/src/theme-parser.c
+++ b/src/theme-parser.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity theme parsing */
 
 /*
diff --git a/src/theme-parser.h b/src/theme-parser.h
index 2ba198e42..035d7005f 100644
--- a/src/theme-parser.h
+++ b/src/theme-parser.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity theme parsing */
 
 /* 
diff --git a/src/theme-viewer.c b/src/theme-viewer.c
index 9d6d7abfe..d4a1106b5 100644
--- a/src/theme-viewer.c
+++ b/src/theme-viewer.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity theme viewer and test app main() */
 
 /*
diff --git a/src/theme.c b/src/theme.c
index b047bf495..0bdd0628e 100644
--- a/src/theme.c
+++ b/src/theme.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity Theme Rendering */
 
 /*
diff --git a/src/theme.h b/src/theme.h
index cda019da7..f817dce4e 100644
--- a/src/theme.h
+++ b/src/theme.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity Theme Rendering */
 
 /* 
diff --git a/src/themewidget.c b/src/themewidget.c
index b3092a567..1cbcb8e2c 100644
--- a/src/themewidget.c
+++ b/src/themewidget.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity theme widget (displays themed draw operations) */
 
 /* 
diff --git a/src/themewidget.h b/src/themewidget.h
index 55161fbcd..5f044ce25 100644
--- a/src/themewidget.h
+++ b/src/themewidget.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity theme widget (displays themed draw operations) */
 
 /* 
diff --git a/src/ui.c b/src/ui.c
index 045767dcd..4a16a5804 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity interface for talking to GTK+ UI module */
 
 /* 
diff --git a/src/ui.h b/src/ui.h
index 52b4bdb9c..bb8122f9a 100644
--- a/src/ui.h
+++ b/src/ui.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity interface for talking to GTK+ UI module */
 
 /* 
diff --git a/src/util.c b/src/util.c
index 9280df131..9fdecd6ff 100644
--- a/src/util.c
+++ b/src/util.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity utilities */
 
 /* 
diff --git a/src/util.h b/src/util.h
index f51cb88d7..d88c7752c 100644
--- a/src/util.h
+++ b/src/util.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity utilities */
 
 /* 
diff --git a/src/window-props.c b/src/window-props.c
index 49df9aeeb..2506e6257 100644
--- a/src/window-props.c
+++ b/src/window-props.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* MetaWindow property handling */
 
 /* 
diff --git a/src/window-props.h b/src/window-props.h
index 232721d0b..815955dae 100644
--- a/src/window-props.h
+++ b/src/window-props.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* MetaWindow property handling */
 
 /* 
diff --git a/src/window.c b/src/window.c
index acccfe66d..815e11438 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity X managed windows */
 
 /* 
diff --git a/src/window.h b/src/window.h
index 2b9dd201a..ff4b944b6 100644
--- a/src/window.h
+++ b/src/window.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity X managed windows */
 
 /* 
diff --git a/src/workspace.c b/src/workspace.c
index 89af6adc1..8ea5e8ebd 100644
--- a/src/workspace.c
+++ b/src/workspace.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity Workspaces */
 
 /* 
diff --git a/src/workspace.h b/src/workspace.h
index 1c1ee919d..61aa8e71e 100644
--- a/src/workspace.h
+++ b/src/workspace.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity Workspaces */
 
 /* 
diff --git a/src/xprops.c b/src/xprops.c
index 7a9158566..7a4282956 100644
--- a/src/xprops.c
+++ b/src/xprops.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity X property convenience routines */
 
 /* 
diff --git a/src/xprops.h b/src/xprops.h
index 646f087f7..e5cb97bb4 100644
--- a/src/xprops.h
+++ b/src/xprops.h
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 /* Metacity X property convenience routines */
 
 /*