Merge from trunkpending

1 files changed, 7 insertions, 7 deletions

diff --git a/src/emacsgtkfixed.c b/src/emacsgtkfixed.c
index 0b57e2cdf36..fba672ff74d 100644
--- a/src/emacsgtkfixed.c
+++ b/src/emacsgtkfixed.c
@@ -1,7 +1,7 @@
-/* A Gtk Widget that inherits GtkFixed, but can be shrinked. 
+/* A Gtk Widget that inherits GtkFixed, but can be shrunk.
 This file is only use when compiling with Gtk+ 3.
 
-Copyright (C) 2011  Free Software Foundation, Inc.
+Copyright (C) 2011-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -116,10 +116,10 @@ emacs_fixed_get_preferred_height (GtkWidget *widget,
    (Bug#8919), and so users can resize our frames as they wish.  */
 
 void
-XSetWMSizeHints(Display* d,
-                Window w,
-                XSizeHints* hints,
-                Atom prop)
+XSetWMSizeHints (Display* d,
+                 Window w,
+                 XSizeHints* hints,
+                 Atom prop)
 {
   struct x_display_info *dpyinfo = x_display_info_for_display (d);
   struct frame *f = x_top_window_to_frame (dpyinfo, w);
@@ -158,7 +158,7 @@ XSetWMSizeHints(Display* d,
 /* Override this X11 function.
    This function is in the same X11 file as the one above.  So we must
    provide it also.  */
-   
+
 void
 XSetWMNormalHints (Display *d, Window w, XSizeHints *hints)
 {