Reindent include directory, reformatting prototypes as necessary.

Exclude include/gssrpc due to its Sun origin and k5-platform.h due to
macros too hairy for emacs c-mode to handle.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23180 dc483132-0cff-0310-8789-dd5450dbe970

11 files changed, 72 insertions, 61 deletions

diff --git a/src/include/kim/kim.h b/src/include/kim/kim.h
index 83248e3d1..7edb2a206 100644
--- a/src/include/kim/kim.h
+++ b/src/include/kim/kim.h
@@ -1,3 +1,4 @@
+/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
  * Copyright 2005-2006 Massachusetts Institute of Technology.
  * All Rights Reserved.
diff --git a/src/include/kim/kim_ccache.h b/src/include/kim/kim_ccache.h
index 88cfeb602..d2d0d1de0 100644
--- a/src/include/kim/kim_ccache.h
+++ b/src/include/kim/kim_ccache.h
@@ -1,3 +1,4 @@
+/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
  * Copyright 2005-2006 Massachusetts Institute of Technology.
  * All Rights Reserved.
@@ -286,7 +287,7 @@ kim_error kim_ccache_iterator_create (kim_ccache_iterator *out_ccache_iterator);
  * \brief Get the next ccache in the cache collection.
  */
 kim_error kim_ccache_iterator_next (kim_ccache_iterator  in_ccache_iterator,
-                                      kim_ccache          *out_ccache);
+                                    kim_ccache          *out_ccache);
 
 /*!
  * \param io_ccache_iterator a ccache iterator object to be freed.  Set to NULL on exit.
@@ -303,7 +304,7 @@ void kim_ccache_iterator_free (kim_ccache_iterator *io_ccache_iterator);
 
 /*!
  * \param out_ccache          on exit, a new cache object for a ccache containing a newly acquired
- *      		      initial credential.  Must be freed with kim_ccache_free().
+ *                            initial credential.  Must be freed with kim_ccache_free().
  * \param in_client_identity  a client identity to obtain a credential for.   Specify KIM_IDENTITY_ANY to
  *                            allow the user to choose.
  * \param in_options          options to control credential acquisition.
@@ -318,7 +319,7 @@ kim_error kim_ccache_create_new (kim_ccache          *out_ccache,
 
 /*!
  * \param out_ccache          on exit, a new cache object for a ccache containing a newly acquired
- *      		      initial credential.  Must be freed with kim_ccache_free().
+ *                            initial credential.  Must be freed with kim_ccache_free().
  * \param in_client_identity  a client identity to obtain a credential for.   Specify KIM_IDENTITY_ANY to
  *                            allow the user to choose.
  * \param in_options          options to control credential acquisition.
@@ -387,10 +388,10 @@ kim_error kim_ccache_create_from_client_identity (kim_ccache   *out_ccache,
 
 /*!
  * \param out_ccache      on exit, a new ccache object containing an initial credential
- *      		  for the client identity \a in_identity obtained using in_keytab.
- *      		  Must be freed with kim_ccache_free().
+ *                        for the client identity \a in_identity obtained using in_keytab.
+ *                        Must be freed with kim_ccache_free().
  * \param in_identity     a client identity to obtain a credential for.  Specify NULL for
- *      		  the first client identity in the keytab.
+ *                        the first client identity in the keytab.
  * \param in_options      options to control credential acquisition.
  * \param in_keytab       a path to a keytab.  Specify NULL for the default keytab location.
  * \return On success, #KIM_NO_ERROR.  On failure, an error code representing the failure.
@@ -436,7 +437,7 @@ kim_error kim_ccache_create_from_type_and_name (kim_ccache  *out_ccache,
 
 /*!
  * \param out_ccache      on exit, a new ccache object which is a copy of in_krb5_ccache.
- *      		  Must be freed with kim_ccache_free().
+ *                        Must be freed with kim_ccache_free().
  * \param in_krb5_context the krb5 context used to create \a in_krb5_ccache.
  * \param in_krb5_ccache  a krb5 ccache object.
  * \return On success, #KIM_NO_ERROR.  On failure, an error code representing the failure.
@@ -448,7 +449,7 @@ kim_error kim_ccache_create_from_krb5_ccache (kim_ccache  *out_ccache,
 
 /*!
  * \param out_ccache on exit, the new ccache object which is a copy of in_ccache.
- *      	     Must be freed with kim_ccache_free().
+ *                   Must be freed with kim_ccache_free().
  * \param in_ccache  a ccache object.
  * \return On success, #KIM_NO_ERROR.  On failure, an error code representing the failure.
  * \brief Copy a ccache.
@@ -473,7 +474,7 @@ kim_error kim_ccache_compare (kim_ccache      in_ccache,
  * \param in_ccache        a ccache object.
  * \param in_krb5_context  a krb5 context which will be used to create out_krb5_ccache.
  * \param out_krb5_ccache  on exit, a new krb5 ccache object which is a copy of in_ccache.
- *      		   Must be freed with krb5_cc_close() or krb5_cc_destroy().
+ *                         Must be freed with krb5_cc_close() or krb5_cc_destroy().
  * \return On success, #KIM_NO_ERROR.  On failure, an error code representing the failure.
  * \brief Get a krb5 ccache for a ccache.
  */
@@ -503,7 +504,7 @@ kim_error kim_ccache_get_type (kim_ccache  in_ccache,
  * \param in_ccache        a ccache object.
  * \param out_display_name on exit, the type and name of \a in_ccache in a format appropriate for
  *                         display to the user in command line programs.  (ie: "<type>:<name>")
- *      		   Must be freed with kim_string_free().
+ *                         Must be freed with kim_string_free().
  *                         Note: this string can also be passed to krb5_cc_resolve().
  * \return On success, #KIM_NO_ERROR.  On failure, an error code representing the failure.
  * \brief Get the type and name for a ccache in display format.
@@ -514,7 +515,7 @@ kim_error kim_ccache_get_display_name (kim_ccache  in_ccache,
 /*!
  * \param in_ccache            a ccache object.
  * \param out_client_identity  on exit, an identity object containing the client identity of
- *      		       \a in_ccache. Must be freed with kim_identity_free().
+ *                             \a in_ccache. Must be freed with kim_identity_free().
  * \return On success, #KIM_NO_ERROR.  On failure, an error code representing the failure.
  * \brief Get the client identity for a ccache.
  */
@@ -524,7 +525,7 @@ kim_error kim_ccache_get_client_identity (kim_ccache    in_ccache,
 /*!
  * \param in_ccache       a ccache object.
  * \param out_credential  on exit, the first valid credential in \a in_ccache.
- *      		  Must be freed with kim_credential_free().  Set to NULL
+ *                        Must be freed with kim_credential_free().  Set to NULL
  *                        if you only want return value, not the actual credential.
  * \return On success, #KIM_NO_ERROR.  On failure, an error code representing the failure.
  * \brief Get the first valid credential in a ccache.
diff --git a/src/include/kim/kim_credential.h b/src/include/kim/kim_credential.h
index 634c458f0..bf065a8d2 100644
--- a/src/include/kim/kim_credential.h
+++ b/src/include/kim/kim_credential.h
@@ -1,3 +1,4 @@
+/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
  * Copyright 2005-2006 Massachusetts Institute of Technology.
  * All Rights Reserved.
@@ -498,7 +499,7 @@ kim_error kim_credential_get_options (kim_credential  in_credential,
  * \param in_credential       a credential object.
  * \param in_client_identity  a client identity.
  * \param out_ccache          on exit, a ccache object containing \a in_credential with the client
- *      		      identity \a in_client_identity.  Must be freed with kim_ccache_free().
+ *                            identity \a in_client_identity.  Must be freed with kim_ccache_free().
  *                            Specify NULL if you don't want this return value.
  * \return On success, #KIM_NO_ERROR.  On failure, an error code representing the failure.
  * \brief Store a credential in a ccache in the cache collection.
diff --git a/src/include/kim/kim_identity.h b/src/include/kim/kim_identity.h
index a8540277d..caed0524a 100644
--- a/src/include/kim/kim_identity.h
+++ b/src/include/kim/kim_identity.h
@@ -1,3 +1,4 @@
+/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
  * Copyright 2005-2006 Massachusetts Institute of Technology.
  * All Rights Reserved.
@@ -127,7 +128,7 @@ extern "C" {
  * \brief Create a identity from a string.
  */
 kim_error kim_identity_create_from_string (kim_identity *out_identity,
-                                             kim_string    in_string);
+                                           kim_string    in_string);
 
 /*!
  * \param out_identity     on exit, a new identity object.  Must be freed with kim_identity_free().
@@ -142,9 +143,9 @@ kim_error kim_identity_create_from_string (kim_identity *out_identity,
  * \brief Create a identity from a realm and component strings.
  */
 kim_error kim_identity_create_from_components (kim_identity *out_identity,
-                                                 kim_string    in_realm,
-                                                 kim_string    in_1st_component,
-                                                 ...);
+                                               kim_string    in_realm,
+                                               kim_string    in_1st_component,
+                                               ...);
 
 /*!
  * \param out_identity      on exit, a new identity object which is a copy of \a in_krb5_principal.
@@ -155,8 +156,8 @@ kim_error kim_identity_create_from_components (kim_identity *out_identity,
  * \brief Create an identity object from a krb5_principal.
  */
 kim_error kim_identity_create_from_krb5_principal (kim_identity *out_identity,
-                                                     krb5_context    in_krb5_context,
-                                                     krb5_principal  in_krb5_principal);
+                                                   krb5_context    in_krb5_context,
+                                                   krb5_principal  in_krb5_principal);
 
 /*!
  * \param out_identity  on exit, a new identity object which is a copy of \a in_identity.
@@ -166,7 +167,7 @@ kim_error kim_identity_create_from_krb5_principal (kim_identity *out_identity,
  * \brief Copy an identity object.
  */
 kim_error kim_identity_copy (kim_identity *out_identity,
-                               kim_identity  in_identity);
+                             kim_identity  in_identity);
 
 
 /*!
@@ -180,8 +181,8 @@ kim_error kim_identity_copy (kim_identity *out_identity,
  * \brief Compare identity objects for equivalency.
  */
 kim_error kim_identity_compare (kim_identity    in_identity,
-                                  kim_identity    in_compare_to_identity,
-                                  kim_comparison *out_comparison);
+                                kim_identity    in_compare_to_identity,
+                                kim_comparison *out_comparison);
 /*!
  * \param in_identity  an identity object.
  * \param out_string   on exit, a string representation of \a in_identity.
@@ -191,7 +192,7 @@ kim_error kim_identity_compare (kim_identity    in_identity,
  * \note  Special characters such as '@' and '/' will be escaped with '\'.
  */
 kim_error kim_identity_get_string (kim_identity   in_identity,
-                                     kim_string    *out_string);
+                                   kim_string    *out_string);
 
 
 /*!
@@ -206,7 +207,7 @@ kim_error kim_identity_get_string (kim_identity   in_identity,
  *        The result of this function should \em only be used to display to the user.
  */
 kim_error kim_identity_get_display_string (kim_identity   in_identity,
-                                             kim_string    *out_display_string);
+                                           kim_string    *out_display_string);
 
 /*!
  * \param in_identity     an identity object.
@@ -216,7 +217,7 @@ kim_error kim_identity_get_display_string (kim_identity   in_identity,
  * \brief Get the realm string of an identity.
  */
 kim_error kim_identity_get_realm (kim_identity  in_identity,
-                                    kim_string   *out_realm_string);
+                                  kim_string   *out_realm_string);
 
 /*!
  * \param in_identity             an identity object.
@@ -225,7 +226,7 @@ kim_error kim_identity_get_realm (kim_identity  in_identity,
  * \brief Get the number of components of an identity.
  */
 kim_error kim_identity_get_number_of_components (kim_identity  in_identity,
-                                                   kim_count    *out_number_of_components);
+                                                 kim_count    *out_number_of_components);
 
 /*!
  * \param in_identity          an identity object.
@@ -236,8 +237,8 @@ kim_error kim_identity_get_number_of_components (kim_identity  in_identity,
  * \brief Get the Nth component of an identity.
  */
 kim_error kim_identity_get_component_at_index (kim_identity  in_identity,
-                                                 kim_count     in_index,
-                                                 kim_string   *out_component_string);
+                                               kim_count     in_index,
+                                               kim_string   *out_component_string);
 
 /*!
  * \param in_identity      an identity object.
@@ -259,8 +260,8 @@ kim_error kim_identity_get_components_string (kim_identity  in_identity,
  * \brief Get the krb5_principal representation of an identity.
  */
 kim_error kim_identity_get_krb5_principal (kim_identity  in_identity,
-                                             krb5_context    in_krb5_context,
-                                             krb5_principal *out_krb5_principal);
+                                           krb5_context    in_krb5_context,
+                                           krb5_principal *out_krb5_principal);
 
 /*!
  * \param in_identity  an identity object whose password will be changed.
diff --git a/src/include/kim/kim_library.h b/src/include/kim/kim_library.h
index fe351f7fc..c84063733 100644
--- a/src/include/kim/kim_library.h
+++ b/src/include/kim/kim_library.h
@@ -1,3 +1,4 @@
+/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
  * Copyright 2005-2008 Massachusetts Institute of Technology.
  * All Rights Reserved.
diff --git a/src/include/kim/kim_options.h b/src/include/kim/kim_options.h
index 85facfbbc..2b1343197 100644
--- a/src/include/kim/kim_options.h
+++ b/src/include/kim/kim_options.h
@@ -1,3 +1,4 @@
+/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
  * Copyright 2005-2006 Massachusetts Institute of Technology.
  * All Rights Reserved.
diff --git a/src/include/kim/kim_preferences.h b/src/include/kim/kim_preferences.h
index 77edde462..fd3293319 100644
--- a/src/include/kim/kim_preferences.h
+++ b/src/include/kim/kim_preferences.h
@@ -1,3 +1,4 @@
+/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
  * Copyright 2005-2006 Massachusetts Institute of Technology.
  * All Rights Reserved.
@@ -162,7 +163,7 @@ kim_error kim_preferences_create (kim_preferences *out_preferences);
  * \brief Copy a preferences object.
  */
 kim_error kim_preferences_copy (kim_preferences *out_preferences,
-                                  kim_preferences  in_preferences);
+                                kim_preferences  in_preferences);
 
 /*!
  * \param io_preferences a preferences object to modify.
@@ -172,7 +173,7 @@ kim_error kim_preferences_copy (kim_preferences *out_preferences,
  * \sa kim_preferences_get_options()
  */
 kim_error kim_preferences_set_options (kim_preferences io_preferences,
-                                         kim_options     in_options);
+                                       kim_options     in_options);
 
 /*!
  * \param in_preferences a preferences object.
@@ -184,7 +185,7 @@ kim_error kim_preferences_set_options (kim_preferences io_preferences,
  * \sa kim_preferences_set_options()
  */
 kim_error kim_preferences_get_options (kim_preferences  in_preferences,
-                                         kim_options     *out_options);
+                                       kim_options     *out_options);
 
 /*!
  * \param io_preferences      a preferences object to modify.
@@ -195,7 +196,7 @@ kim_error kim_preferences_get_options (kim_preferences  in_preferences,
  * \sa kim_preferences_get_remember_options()
  */
 kim_error kim_preferences_set_remember_options (kim_preferences io_preferences,
-                                                  kim_boolean     in_remember_options);
+                                                kim_boolean     in_remember_options);
 
 /*!
  * \param in_preferences       a preferences object.
@@ -206,7 +207,7 @@ kim_error kim_preferences_set_remember_options (kim_preferences io_preferences,
  * \sa kim_preferences_set_remember_options()
  */
 kim_error kim_preferences_get_remember_options (kim_preferences  in_preferences,
-                                                  kim_boolean     *out_remember_options);
+                                                kim_boolean     *out_remember_options);
 
 /*!
  * \param io_preferences      a preferences object to modify.
@@ -216,7 +217,7 @@ kim_error kim_preferences_get_remember_options (kim_preferences  in_preferences,
  * \sa kim_preferences_get_client_identity()
  */
 kim_error kim_preferences_set_client_identity (kim_preferences io_preferences,
-                                                 kim_identity    in_client_identity);
+                                               kim_identity    in_client_identity);
 
 /*!
  * \param in_preferences       a preferences object.
@@ -227,7 +228,7 @@ kim_error kim_preferences_set_client_identity (kim_preferences io_preferences,
  * \sa kim_preferences_set_client_identity()
  */
 kim_error kim_preferences_get_client_identity (kim_preferences  in_preferences,
-                                                 kim_identity    *out_client_identity);
+                                               kim_identity    *out_client_identity);
 
 /*!
  * \param io_preferences               a preferences object to modify.
@@ -238,7 +239,7 @@ kim_error kim_preferences_get_client_identity (kim_preferences  in_preferences,
  * \sa kim_preferences_get_remember_client_identity()
  */
 kim_error kim_preferences_set_remember_client_identity (kim_preferences io_preferences,
-                                                          kim_boolean     in_remember_client_identity);
+                                                        kim_boolean     in_remember_client_identity);
 
 /*!
  * \param in_preferences                a preferences object.
@@ -249,7 +250,7 @@ kim_error kim_preferences_set_remember_client_identity (kim_preferences io_prefe
  * \sa kim_preferences_set_remember_client_identity()
  */
 kim_error kim_preferences_get_remember_client_identity (kim_preferences  in_preferences,
-                                                          kim_boolean     *out_remember_client_identity);
+                                                        kim_boolean     *out_remember_client_identity);
 
 /*!
  * \param io_preferences       a preferences object to modify.
@@ -260,7 +261,7 @@ kim_error kim_preferences_get_remember_client_identity (kim_preferences  in_pref
  * \sa kim_preferences_get_minimum_lifetime()
  */
 kim_error kim_preferences_set_minimum_lifetime (kim_preferences io_preferences,
-                                                  kim_lifetime    in_minimum_lifetime);
+                                                kim_lifetime    in_minimum_lifetime);
 
 /*!
  * \param in_preferences        a preferences object.
@@ -271,7 +272,7 @@ kim_error kim_preferences_set_minimum_lifetime (kim_preferences io_preferences,
  * \sa kim_preferences_set_minimum_lifetime()
  */
 kim_error kim_preferences_get_minimum_lifetime (kim_preferences  in_preferences,
-                                                  kim_lifetime    *out_minimum_lifetime);
+                                                kim_lifetime    *out_minimum_lifetime);
 
 /*!
  * \param io_preferences       a preferences object to modify.
@@ -282,7 +283,7 @@ kim_error kim_preferences_get_minimum_lifetime (kim_preferences  in_preferences,
  * \sa kim_preferences_get_maximum_lifetime()
  */
 kim_error kim_preferences_set_maximum_lifetime (kim_preferences io_preferences,
-                                                  kim_lifetime    in_maximum_lifetime);
+                                                kim_lifetime    in_maximum_lifetime);
 
 /*!
  * \param in_preferences        a preferences object.
@@ -293,7 +294,7 @@ kim_error kim_preferences_set_maximum_lifetime (kim_preferences io_preferences,
  * \sa kim_preferences_set_maximum_lifetime()
  */
 kim_error kim_preferences_get_maximum_lifetime (kim_preferences  in_preferences,
-                                                  kim_lifetime    *out_maximum_lifetime);
+                                                kim_lifetime    *out_maximum_lifetime);
 
 /*!
  * \param io_preferences               a preferences object to modify.
@@ -305,7 +306,7 @@ kim_error kim_preferences_get_maximum_lifetime (kim_preferences  in_preferences,
  * \sa kim_preferences_get_minimum_renewal_lifetime()
  */
 kim_error kim_preferences_set_minimum_renewal_lifetime (kim_preferences io_preferences,
-                                                          kim_lifetime    in_minimum_renewal_lifetime);
+                                                        kim_lifetime    in_minimum_renewal_lifetime);
 
 /*!
  * \param in_preferences                a preferences object.
@@ -316,7 +317,7 @@ kim_error kim_preferences_set_minimum_renewal_lifetime (kim_preferences io_prefe
  * \sa kim_preferences_set_minimum_renewal_lifetime()
  */
 kim_error kim_preferences_get_minimum_renewal_lifetime (kim_preferences  in_preferences,
-                                                          kim_lifetime    *out_minimum_renewal_lifetime);
+                                                        kim_lifetime    *out_minimum_renewal_lifetime);
 
 /*!
  * \param io_preferences               a preferences object to modify.
@@ -328,7 +329,7 @@ kim_error kim_preferences_get_minimum_renewal_lifetime (kim_preferences  in_pref
  * \sa kim_preferences_get_minimum_renewal_lifetime()
  */
 kim_error kim_preferences_set_maximum_renewal_lifetime (kim_preferences io_preferences,
-                                                          kim_lifetime    in_maximum_renewal_lifetime);
+                                                        kim_lifetime    in_maximum_renewal_lifetime);
 
 /*!
  * \param in_preferences                a preferences object.
@@ -339,7 +340,7 @@ kim_error kim_preferences_set_maximum_renewal_lifetime (kim_preferences io_prefe
  * \sa kim_preferences_set_minimum_renewal_lifetime()
  */
 kim_error kim_preferences_get_maximum_renewal_lifetime (kim_preferences  in_preferences,
-                                                          kim_lifetime    *out_maximum_renewal_lifetime);
+                                                        kim_lifetime    *out_maximum_renewal_lifetime);
 
 /*!
  * \param in_preferences           a preferences object.
diff --git a/src/include/kim/kim_selection_hints.h b/src/include/kim/kim_selection_hints.h
index 20af083a9..76cd41fc7 100644
--- a/src/include/kim/kim_selection_hints.h
+++ b/src/include/kim/kim_selection_hints.h
@@ -1,3 +1,4 @@
+/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
  * Copyright 2005-2006 Massachusetts Institute of Technology.
  * All Rights Reserved.
@@ -251,7 +252,7 @@ extern "C" {
  * \brief Create a new selection hints object.
  */
 kim_error kim_selection_hints_create (kim_selection_hints *out_selection_hints,
-                                        kim_string           in_application_identifier);
+                                      kim_string           in_application_identifier);
 
 /*!
  * \param out_selection_hints on exit, a new selection hints object which is a copy of in_selection_hints.
@@ -261,7 +262,7 @@ kim_error kim_selection_hints_create (kim_selection_hints *out_selection_hints,
  * \brief Copy a selection hints object.
  */
 kim_error kim_selection_hints_copy (kim_selection_hints *out_selection_hints,
-                                      kim_selection_hints  in_selection_hints);
+                                    kim_selection_hints  in_selection_hints);
 
 /*!
  * \param io_selection_hints    a selection hints object to modify.
@@ -303,7 +304,7 @@ kim_error kim_selection_hints_get_hint (kim_selection_hints  in_selection_hints,
  * \sa kim_selection_hints_get_explanation()
  */
 kim_error kim_selection_hints_set_explanation (kim_selection_hints io_selection_hints,
-                                                 kim_string          in_explanation);
+                                               kim_string          in_explanation);
 
 /*!
  * \param in_selection_hints   a selection hints object.
@@ -315,7 +316,7 @@ kim_error kim_selection_hints_set_explanation (kim_selection_hints io_selection_
  * \sa kim_selection_hints_set_explanation()
  */
 kim_error kim_selection_hints_get_explanation (kim_selection_hints  in_selection_hints,
-                                                 kim_string          *out_explanation);
+                                               kim_string          *out_explanation);
 
 
 /*!
@@ -326,7 +327,7 @@ kim_error kim_selection_hints_get_explanation (kim_selection_hints  in_selection
  * \sa kim_selection_hints_get_options()
  */
 kim_error kim_selection_hints_set_options (kim_selection_hints io_selection_hints,
-                                             kim_options         in_options);
+                                           kim_options         in_options);
 
 /*!
  * \param in_selection_hints a selection hints object.
@@ -338,7 +339,7 @@ kim_error kim_selection_hints_set_options (kim_selection_hints io_selection_hint
  * \sa kim_selection_hints_set_options()
  */
 kim_error kim_selection_hints_get_options (kim_selection_hints  in_selection_hints,
-                                             kim_options         *out_options);
+                                           kim_options         *out_options);
 
 /*!
  * \param in_selection_hints        a selection hints object to modify
@@ -350,7 +351,7 @@ kim_error kim_selection_hints_get_options (kim_selection_hints  in_selection_hin
  * \sa kim_selection_hints_get_allow_user_interaction
  */
 kim_error kim_selection_hints_set_allow_user_interaction (kim_selection_hints in_selection_hints,
-                                                            kim_boolean         in_allow_user_interaction);
+                                                          kim_boolean         in_allow_user_interaction);
 
 /*!
  * \param in_selection_hints         a selection hints object to modify
@@ -363,7 +364,7 @@ kim_error kim_selection_hints_set_allow_user_interaction (kim_selection_hints in
  * \sa kim_selection_hints_set_allow_user_interaction
  */
 kim_error kim_selection_hints_get_allow_user_interaction (kim_selection_hints  in_selection_hints,
-                                                            kim_boolean         *out_allow_user_interaction);
+                                                          kim_boolean         *out_allow_user_interaction);
 
 /*!
  * \param in_selection_hints    a selection hints object to modify
@@ -375,7 +376,7 @@ kim_error kim_selection_hints_get_allow_user_interaction (kim_selection_hints  i
  * \sa kim_selection_hints_get_remember_identity
  */
 kim_error kim_selection_hints_set_remember_identity (kim_selection_hints in_selection_hints,
-                                                       kim_boolean         in_remember_identity);
+                                                     kim_boolean         in_remember_identity);
 
 /*!
  * \param in_selection_hints     a selection hints object to modify
@@ -387,7 +388,7 @@ kim_error kim_selection_hints_set_remember_identity (kim_selection_hints in_sele
  * \sa kim_selection_hints_set_remember_identity
  */
 kim_error kim_selection_hints_get_remember_identity (kim_selection_hints  in_selection_hints,
-                                                       kim_boolean         *out_remember_identity);
+                                                     kim_boolean         *out_remember_identity);
 
 /*!
  * \param in_selection_hints the selection hints to add to the cache.
@@ -401,7 +402,7 @@ kim_error kim_selection_hints_get_remember_identity (kim_selection_hints  in_sel
  */
 
 kim_error kim_selection_hints_get_identity (kim_selection_hints in_selection_hints,
-                                              kim_identity        *out_identity);
+                                            kim_identity        *out_identity);
 
 /*!
  * \param in_selection_hints the selection hints to add to the cache.
@@ -412,7 +413,7 @@ kim_error kim_selection_hints_get_identity (kim_selection_hints in_selection_hin
  */
 
 kim_error kim_selection_hints_remember_identity (kim_selection_hints in_selection_hints,
-                                                   kim_identity        in_identity);
+                                                 kim_identity        in_identity);
 
 /*!
  * \param in_selection_hints the selection hints to remove from the cache.
diff --git a/src/include/kim/kim_string.h b/src/include/kim/kim_string.h
index 283a49742..aaf1975a9 100644
--- a/src/include/kim/kim_string.h
+++ b/src/include/kim/kim_string.h
@@ -1,3 +1,4 @@
+/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
  * Copyright 2005-2006 Massachusetts Institute of Technology.
  * All Rights Reserved.
@@ -87,7 +88,7 @@ kim_error kim_string_create_for_last_error (kim_string *out_string,
 
 /*!
  * \param out_string on exit, a new string object which is a copy of \a in_string.
-                     Must be freed with kim_string_free().
+ Must be freed with kim_string_free().
  * \param in_string  the string to copy.
  * \return On success, #KIM_NO_ERROR.  On failure, an error code representing the failure.
  * \brief Copy a string.
diff --git a/src/include/kim/kim_types.h b/src/include/kim/kim_types.h
index 7723407cf..4778ba527 100644
--- a/src/include/kim/kim_types.h
+++ b/src/include/kim/kim_types.h
@@ -1,3 +1,4 @@
+/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
  * Copyright 2005-2006 Massachusetts Institute of Technology.
  * All Rights Reserved.
diff --git a/src/include/kim/kim_ui_plugin.h b/src/include/kim/kim_ui_plugin.h
index d5a08a87d..579be7359 100644
--- a/src/include/kim/kim_ui_plugin.h
+++ b/src/include/kim/kim_ui_plugin.h
@@ -1,3 +1,4 @@
+/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
  * Copyright 2008 Massachusetts Institute of Technology.
  * All Rights Reserved.
@@ -60,7 +61,7 @@ enum kim_prompt_type_enum {
 
 
 typedef struct kim_ui_plugin_ftable_v0 {
-    int minor_version;		/* currently 0 */
+    int minor_version;          /* currently 0 */
 
     /* Called before other calls to allow the UI to initialize.
      * Return an error if you can't display your UI in this environment.