Refill some long/short copyright headers.

40 files changed, 94 insertions, 90 deletions

diff --git a/src/ChangeLog.3 b/src/ChangeLog.3
index 0b19d4cdc00..a361142faae 100644
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -16507,8 +16507,7 @@ See ChangeLog.2 for earlier changes.
 ;; coding: utf-8
 ;; End:
 
-    Copyright (C) 1993, 2001-2011
-        Free Software Foundation, Inc.
+  Copyright (C) 1993, 2001-2011  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -16524,4 +16523,3 @@ See ChangeLog.2 for earlier changes.
 
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
diff --git a/src/ChangeLog.4 b/src/ChangeLog.4
index af73b620281..dc8fe23a221 100644
--- a/src/ChangeLog.4
+++ b/src/ChangeLog.4
@@ -6906,8 +6906,7 @@ See ChangeLog.3 for earlier changes.
 ;; coding: utf-8
 ;; End:
 
-    Copyright (C) 1993-1994, 2001-2011
-        Free Software Foundation, Inc.
+  Copyright (C) 1993-1994, 2001-2011  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -6923,4 +6922,3 @@ See ChangeLog.3 for earlier changes.
 
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
diff --git a/src/ChangeLog.5 b/src/ChangeLog.5
index 2338f09d441..1f21e9fb99c 100644
--- a/src/ChangeLog.5
+++ b/src/ChangeLog.5
@@ -7148,8 +7148,7 @@ See ChangeLog.4 for earlier changes.
 ;; coding: utf-8
 ;; End:
 
-    Copyright (C) 1994-1995, 2001-2011
-        Free Software Foundation, Inc.
+  Copyright (C) 1994-1995, 2001-2011  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -7165,4 +7164,3 @@ See ChangeLog.4 for earlier changes.
 
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
diff --git a/src/ChangeLog.6 b/src/ChangeLog.6
index 5544ff5e3aa..d7903568102 100644
--- a/src/ChangeLog.6
+++ b/src/ChangeLog.6
@@ -5354,8 +5354,7 @@
 
 See ChangeLog.5 for earlier changes.
 
-    Copyright (C) 1995-1996, 2001-2011
-        Free Software Foundation, Inc.
+  Copyright (C) 1995-1996, 2001-2011  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -5371,4 +5370,3 @@ See ChangeLog.5 for earlier changes.
 
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
diff --git a/src/ChangeLog.7 b/src/ChangeLog.7
index c21de3ec562..d5bebec660f 100644
--- a/src/ChangeLog.7
+++ b/src/ChangeLog.7
@@ -11092,8 +11092,7 @@ See ChangeLog.6 for earlier changes.
 ;; coding: utf-8
 ;; End:
 
-    Copyright (C) 1997-1998, 2001-2011
-        Free Software Foundation, Inc.
+  Copyright (C) 1997-1998, 2001-2011  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -11109,4 +11108,3 @@ See ChangeLog.6 for earlier changes.
 
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
diff --git a/src/ChangeLog.8 b/src/ChangeLog.8
index e780b74c298..833119c9fcf 100644
--- a/src/ChangeLog.8
+++ b/src/ChangeLog.8
@@ -13979,8 +13979,7 @@
 
 See ChangeLog.7 for earlier changes.
 
-    Copyright (C) 1999, 2001-2011
-        Free Software Foundation, Inc.
+  Copyright (C) 1999, 2001-2011  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -13996,4 +13995,3 @@ See ChangeLog.7 for earlier changes.
 
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
diff --git a/src/ChangeLog.9 b/src/ChangeLog.9
index b235851f082..0c39de74a6a 100644
--- a/src/ChangeLog.9
+++ b/src/ChangeLog.9
@@ -13294,8 +13294,7 @@ See ChangeLog.8 for earlier changes.
 ;; coding: utf-8
 ;; End:
 
-    Copyright (C) 2001-2011
-        Free Software Foundation, Inc.
+  Copyright (C) 2001-2011  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -13311,4 +13310,3 @@ See ChangeLog.8 for earlier changes.
 
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
diff --git a/src/casefiddle.c b/src/casefiddle.c
index 319793bb6b1..6f82f99bd26 100644
--- a/src/casefiddle.c
+++ b/src/casefiddle.c
@@ -1,5 +1,6 @@
 /* GNU Emacs case conversion functions.
-   Copyright (C) 1985, 1994, 1997-1999, 2001-2011 Free Software Foundation, Inc.
+
+Copyright (C) 1985, 1994, 1997-1999, 2001-2011 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/category.c b/src/category.c
index a0e370c5b61..06046959b6f 100644
--- a/src/category.c
+++ b/src/category.c
@@ -1,13 +1,13 @@
 /* GNU Emacs routines to deal with category tables.
-   Copyright (C) 1998, 2001-2011
-     Free Software Foundation, Inc.
-   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-     2005, 2006, 2007, 2008, 2009, 2010, 2011
-     National Institute of Advanced Industrial Science and Technology (AIST)
-     Registration Number H14PRO021
-   Copyright (C) 2003
-     National Institute of Advanced Industrial Science and Technology (AIST)
-     Registration Number H13PRO009
+
+Copyright (C) 1998, 2001-2011  Free Software Foundation, Inc.
+Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+  2005, 2006, 2007, 2008, 2009, 2010, 2011
+  National Institute of Advanced Industrial Science and Technology (AIST)
+  Registration Number H14PRO021
+Copyright (C) 2003
+  National Institute of Advanced Industrial Science and Technology (AIST)
+  Registration Number H13PRO009
 
 This file is part of GNU Emacs.
 
diff --git a/src/cmds.c b/src/cmds.c
index 2929a1a758a..ce05b19e1c2 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -1,6 +1,6 @@
 /* Simple built-in editing commands.
-   Copyright (C) 1985, 1993-1998, 2001-2011
-                 Free Software Foundation, Inc.
+
+Copyright (C) 1985, 1993-1998, 2001-2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/dispextern.h b/src/dispextern.h
index 4dd6aba3173..26e0bb61f17 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1,6 +1,6 @@
 /* Interface definitions for display code.
-   Copyright (C) 1985, 1993-1994, 1997-2011
-                 Free Software Foundation, Inc.
+
+Copyright (C) 1985, 1993-1994, 1997-2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/dosfns.h b/src/dosfns.h
index 13205e30a6e..89800598d28 100644
--- a/src/dosfns.h
+++ b/src/dosfns.h
@@ -2,7 +2,8 @@
    Coded by Manabu Higashida, 1991.
    Modified by Morten Welinder, 1993-1994.
 
-   Copyright (C) 1991, 1994-1995, 1997, 1999, 2001-2011  Free Software Foundation, Inc.
+Copyright (C) 1991, 1994-1995, 1997, 1999, 2001-2011
+  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/epaths.in b/src/epaths.in
index 198086b5916..54131f0e179 100644
--- a/src/epaths.in
+++ b/src/epaths.in
@@ -1,5 +1,7 @@
 /* Hey Emacs, this is -*- C -*- code!  */
-/* Copyright (C) 1993, 1995, 1997, 1999, 2001-2011 Free Software Foundation, Inc.
+/*
+Copyright (C) 1993, 1995, 1997, 1999, 2001-2011
+  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/floatfns.c b/src/floatfns.c
index a87e8c012f5..c00923643d1 100644
--- a/src/floatfns.c
+++ b/src/floatfns.c
@@ -1,5 +1,7 @@
 /* Primitive operations on floating point for GNU Emacs Lisp interpreter.
-   Copyright (C) 1988, 1993-1994, 1999, 2001-2011  Free Software Foundation, Inc.
+
+Copyright (C) 1988, 1993-1994, 1999, 2001-2011
+  Free Software Foundation, Inc.
 
 Author: Wolfgang Rupprecht
 (according to ack.texi)
diff --git a/src/font.c b/src/font.c
index 605683e5282..eb217c6f60f 100644
--- a/src/font.c
+++ b/src/font.c
@@ -1,10 +1,9 @@
 /* font.c -- "Font" primitives.
 
-Copyright (C) 2006-2011
-  Free Software Foundation, Inc.
-   Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011
-     National Institute of Advanced Industrial Science and Technology (AIST)
-     Registration Number H13PRO009
+Copyright (C) 2006-2011  Free Software Foundation, Inc.
+Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011
+  National Institute of Advanced Industrial Science and Technology (AIST)
+  Registration Number H13PRO009
 
 This file is part of GNU Emacs.
 
diff --git a/src/fontset.c b/src/fontset.c
index aacef63da2a..f94bc954fa4 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -1,13 +1,13 @@
 /* Fontset handler.
-   Copyright (C) 2001-2011
-     Free Software Foundation, Inc.
-   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-     2005, 2006, 2007, 2008, 2009, 2010, 2011
-     National Institute of Advanced Industrial Science and Technology (AIST)
-     Registration Number H14PRO021
-   Copyright (C) 2003, 2006
-     National Institute of Advanced Industrial Science and Technology (AIST)
-     Registration Number H13PRO009
+
+Copyright (C) 2001-2011  Free Software Foundation, Inc.
+Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+  2005, 2006, 2007, 2008, 2009, 2010, 2011
+  National Institute of Advanced Industrial Science and Technology (AIST)
+  Registration Number H14PRO021
+Copyright (C) 2003, 2006
+  National Institute of Advanced Industrial Science and Technology (AIST)
+  Registration Number H13PRO009
 
 This file is part of GNU Emacs.
 
diff --git a/src/frame.c b/src/frame.c
index ddf1ef59ada..961c42c0976 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1,7 +1,6 @@
 /* Generic frame functions.
 
-   Copyright (C) 1993-1995, 1997, 1999-2011
-  Free Software Foundation, Inc.
+Copyright (C) 1993-1995, 1997, 1999-2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/gtkutil.c b/src/gtkutil.c
index d5d2e82ac89..6367949a649 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1,6 +1,6 @@
 /* Functions for creating and updating GTK widgets.
-   Copyright (C) 2003-2011
-     Free Software Foundation, Inc.
+
+Copyright (C) 2003-2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/gtkutil.h b/src/gtkutil.h
index 9e24e6e0324..3dc0a1dd150 100644
--- a/src/gtkutil.h
+++ b/src/gtkutil.h
@@ -1,6 +1,6 @@
 /* Definitions and headers for GTK widgets.
-   Copyright (C) 2003-2011
-     Free Software Foundation, Inc.
+
+Copyright (C) 2003-2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/keyboard.c b/src/keyboard.c
index 0dace15bb28..8ae6eb9b29a 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1,5 +1,6 @@
 /* Keyboard and mouse input; editor command loop.
-   Copyright (C) 1985-1989, 1993-1997, 1999-2011 Free Software Foundation, Inc.
+
+Copyright (C) 1985-1989, 1993-1997, 1999-2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/menu.c b/src/menu.c
index 9f616f7f6c9..851f1ac804b 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1,5 +1,7 @@
 /* Platform-independent code for terminal communications.
-   Copyright (C) 1986, 1988, 1993-1994, 1996, 1999-2011 Free Software Foundation, Inc.
+
+Copyright (C) 1986, 1988, 1993-1994, 1996, 1999-2011
+  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/msdos.c b/src/msdos.c
index 8417b1da3af..eb73f54838d 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -1,6 +1,6 @@
 /* MS-DOS specific C utilities.          -*- coding: raw-text -*-
-   Copyright (C) 1993-1997, 1999-2011
-                 Free Software Foundation, Inc.
+
+Copyright (C) 1993-1997, 1999-2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/nsfns.m b/src/nsfns.m
index 9652910258a..f1bf8b65727 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -1,6 +1,7 @@
 /* Functions for the NeXT/Open/GNUstep and MacOSX window system.
 
-Copyright (C) 1989, 1992-1994, 2005-2006, 2008-2011  Free Software Foundation, Inc.
+Copyright (C) 1989, 1992-1994, 2005-2006, 2008-2011
+  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/print.c b/src/print.c
index adba4ee9145..79ff8ba314b 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1,5 +1,7 @@
 /* Lisp object printing and output streams.
-   Copyright (C) 1985-1986, 1988, 1993-1995, 1997-2011 Free Software Foundation, Inc.
+
+Copyright (C) 1985-1986, 1988, 1993-1995, 1997-2011
+  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/process.c b/src/process.c
index fc8b45508d1..22446fb7004 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1,5 +1,7 @@
 /* Asynchronous subprocess control for GNU Emacs.
-   Copyright (C) 1985-1988, 1993-1996, 1998-1999, 2001-2011 Free Software Foundation, Inc.
+
+Copyright (C) 1985-1988, 1993-1996, 1998-1999, 2001-2011
+  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/regex.c b/src/regex.c
index aa4b1cc48df..cb6edc2e356 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -2,8 +2,7 @@
    0.12.  (Implements POSIX draft P1003.2/D11.2, except for some of the
    internationalization features.)
 
-   Copyright (C) 1993-2011
-                 Free Software Foundation, Inc.
+   Copyright (C) 1993-2011  Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/src/region-cache.c b/src/region-cache.c
index e4f4c57237a..1f9b62da9fa 100644
--- a/src/region-cache.c
+++ b/src/region-cache.c
@@ -1,5 +1,7 @@
 /* Caching facts about regions of the buffer, for optimization.
-   Copyright (C) 1985-1989, 1993, 1995, 2001-2011  Free Software Foundation, Inc.
+
+Copyright (C) 1985-1989, 1993, 1995, 2001-2011
+  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/region-cache.h b/src/region-cache.h
index 0366c80036a..0da159285e4 100644
--- a/src/region-cache.h
+++ b/src/region-cache.h
@@ -1,5 +1,7 @@
 /* Header file: Caching facts about regions of the buffer, for optimization.
-   Copyright (C) 1985-1986, 1993, 1995, 2001-2011  Free Software Foundation, Inc.
+
+Copyright (C) 1985-1986, 1993, 1995, 2001-2011
+  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/scroll.c b/src/scroll.c
index cc6e4487293..08ae83eeee8 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -1,5 +1,7 @@
-/* Calculate what line insertion or deletion to do, and do it,
-   Copyright (C) 1985-1986, 1990, 1993-1994, 2001-2011  Free Software Foundation, Inc.
+/* Calculate what line insertion or deletion to do, and do it
+
+Copyright (C) 1985-1986, 1990, 1993-1994, 2001-2011
+  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/syntax.h b/src/syntax.h
index e27744c823b..bea66d1fada 100644
--- a/src/syntax.h
+++ b/src/syntax.h
@@ -1,5 +1,7 @@
 /* Declarations having to do with GNU Emacs syntax tables.
-   Copyright (C) 1985, 1993-1994, 1997-1998, 2001-2011  Free Software Foundation, Inc.
+
+Copyright (C) 1985, 1993-1994, 1997-1998, 2001-2011
+  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/termhooks.h b/src/termhooks.h
index 806433fc19e..b147f6ed0a1 100644
--- a/src/termhooks.h
+++ b/src/termhooks.h
@@ -1,5 +1,6 @@
 /* Parameters and display hooks for terminal devices.
-   Copyright (C) 1985-1986, 1993-1994, 2001-2011  Free Software Foundation, Inc.
+
+Copyright (C) 1985-1986, 1993-1994, 2001-2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32fns.c b/src/w32fns.c
index 14c5c5d77a6..b09bb0b5b5f 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -1,7 +1,6 @@
 /* Graphical user interface functions for the Microsoft W32 API.
 
-Copyright (C) 1989, 1992-2011
-                 Free Software Foundation, Inc.
+Copyright (C) 1989, 1992-2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32term.c b/src/w32term.c
index a9181eee129..cd4ee54fd2c 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -1,7 +1,6 @@
 /* Implementation of GUI terminal on the Microsoft W32 API.
 
-Copyright (C) 1989, 1993-2011
-  Free Software Foundation, Inc.
+Copyright (C) 1989, 1993-2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/xfaces.c b/src/xfaces.c
index c41511d20a6..c7467b0fccc 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -1,7 +1,6 @@
 /* xfaces.c -- "Face" primitives.
 
-   Copyright (C) 1993-1994, 1998-2011
-  Free Software Foundation, Inc.
+Copyright (C) 1993-1994, 1998-2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/xgselect.c b/src/xgselect.c
index ff00b9583da..359a8fbc89b 100644
--- a/src/xgselect.c
+++ b/src/xgselect.c
@@ -1,6 +1,6 @@
 /* Function for handling the GLib event loop.
-   Copyright (C) 2009-2011
-     Free Software Foundation, Inc.
+
+Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/xgselect.h b/src/xgselect.h
index 24659ba9a49..1d3a8508b9c 100644
--- a/src/xgselect.h
+++ b/src/xgselect.h
@@ -1,6 +1,6 @@
 /* Header for xg_select.
-   Copyright (C) 2009-2011
-     Free Software Foundation, Inc.
+
+Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/xmenu.c b/src/xmenu.c
index 5276d240aa3..8ab10be8fac 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1,5 +1,7 @@
 /* X Communication module for terminals which understand the X protocol.
-   Copyright (C) 1986, 1988, 1993-1994, 1996, 1999-2011 Free Software Foundation, Inc.
+
+Copyright (C) 1986, 1988, 1993-1994, 1996, 1999-2011
+  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/xsettings.h b/src/xsettings.h
index c5956a54437..5b2fdbf43c5 100644
--- a/src/xsettings.h
+++ b/src/xsettings.h
@@ -1,6 +1,6 @@
 /* Functions for handle font changes dynamically.
-   Copyright (C) 2009-2011
-                 Free Software Foundation, Inc.
+
+Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/xsmfns.c b/src/xsmfns.c
index aae197105bc..15db459e149 100644
--- a/src/xsmfns.c
+++ b/src/xsmfns.c
@@ -1,7 +1,7 @@
 /* Session management module for systems which understand the X Session
    management protocol.
-   Copyright (C) 2002-2011
-     Free Software Foundation, Inc.
+
+Copyright (C) 2002-2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/xterm.c b/src/xterm.c
index b1beabdd31e..4f5563b79da 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -1,7 +1,6 @@
 /* X Communication module for terminals which understand the X protocol.
 
-Copyright (C) 1989, 1993-2011
-                 Free Software Foundation, Inc.
+Copyright (C) 1989, 1993-2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.