Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987

12 files changed, 12 insertions, 12 deletions

diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index 1dca85fbfc7..ceba747547b 100644
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1357,7 +1357,7 @@
 ;; End:
 
     Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004,
-	2005, 2006, 2007  Free Software Foundation, Inc.
+	2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in
index 18fa3547cf5..a53308c6cf4 100644
--- a/lwlib/Makefile.in
+++ b/lwlib/Makefile.in
@@ -1,6 +1,6 @@
 # Copyright (C) 1992, 1993 Lucid, Inc.
 # Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006,
-#   2007 Free Software Foundation, Inc.
+#   2007, 2008 Free Software Foundation, Inc.
 # 
 # This file is part of the Lucid Widget Library.
 # 
diff --git a/lwlib/lwlib-Xaw.c b/lwlib/lwlib-Xaw.c
index 4ef2d3fcb67..5a2acf2eccf 100644
--- a/lwlib/lwlib-Xaw.c
+++ b/lwlib/lwlib-Xaw.c
@@ -1,7 +1,7 @@
 /* The lwlib interface to Athena widgets.
 Copyright (C) 1993 Chuck Thompson <cthomp@cs.uiuc.edu>
 Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006,
-  2007 Free Software Foundation, Inc.
+  2007, 2008 Free Software Foundation, Inc.
 
 This file is part of the Lucid Widget Library.
 
diff --git a/lwlib/lwlib-Xlw.c b/lwlib/lwlib-Xlw.c
index 7fbf8bd5f07..f2cf68d80a3 100644
--- a/lwlib/lwlib-Xlw.c
+++ b/lwlib/lwlib-Xlw.c
@@ -1,7 +1,7 @@
 /* The lwlib interface to "xlwmenu" menus.
    Copyright (C) 1992 Lucid, Inc.
    Copyright (C) 1994, 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007 Free Software Foundation, Inc.
+                 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This file is part of the Lucid Widget Library.
 
diff --git a/lwlib/lwlib-Xm.c b/lwlib/lwlib-Xm.c
index 2adb1d44ce2..83df050b88e 100644
--- a/lwlib/lwlib-Xm.c
+++ b/lwlib/lwlib-Xm.c
@@ -1,6 +1,6 @@
 /* The lwlib interface to Motif widgets.
    Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003,
-                 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+                 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
    Copyright (C) 1992 Lucid, Inc.
 
 This file is part of the Lucid Widget Library.
diff --git a/lwlib/lwlib-int.h b/lwlib/lwlib-int.h
index edb975ac6cb..aef0ecc8d5e 100644
--- a/lwlib/lwlib-int.h
+++ b/lwlib/lwlib-int.h
@@ -1,7 +1,7 @@
 /*
 Copyright (C) 1992 Lucid, Inc.
 Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-  2007 Free Software Foundation, Inc.
+  2007, 2008 Free Software Foundation, Inc.
 
 This file is part of the Lucid Widget Library.
 
diff --git a/lwlib/lwlib-utils.c b/lwlib/lwlib-utils.c
index 1bec9c69403..0737f3ccff7 100644
--- a/lwlib/lwlib-utils.c
+++ b/lwlib/lwlib-utils.c
@@ -1,7 +1,7 @@
 /* Defines some widget utility functions.
 Copyright (C) 1992 Lucid, Inc.
 Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006,
-  2007 Free Software Foundation, Inc.
+  2007, 2008 Free Software Foundation, Inc.
 
 This file is part of the Lucid Widget Library.
 
diff --git a/lwlib/lwlib.c b/lwlib/lwlib.c
index 542b3ba5a60..7b2752b82e9 100644
--- a/lwlib/lwlib.c
+++ b/lwlib/lwlib.c
@@ -1,7 +1,7 @@
 /* A general interface to the widgets of different toolkits.
 Copyright (C) 1992, 1993 Lucid, Inc.
 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2003, 2004,
-  2005, 2006, 2007  Free Software Foundation, Inc.
+  2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 
 This file is part of the Lucid Widget Library.
 
diff --git a/lwlib/lwlib.h b/lwlib/lwlib.h
index 3b6aa99277c..adefdc82966 100644
--- a/lwlib/lwlib.h
+++ b/lwlib/lwlib.h
@@ -1,7 +1,7 @@
 /*
 Copyright (C) 1992, 1993 Lucid, Inc.
 Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-  2007  Free Software Foundation, Inc.
+  2007, 2008  Free Software Foundation, Inc.
 
 This file is part of the Lucid Widget Library.
 
diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c
index 40a88fcced5..6316b13e5d3 100644
--- a/lwlib/xlwmenu.c
+++ b/lwlib/xlwmenu.c
@@ -1,7 +1,7 @@
 /* Implements a lightweight menubar widget.
 Copyright (C) 1992 Lucid, Inc.
 Copyright (C) 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003, 2004,
-  2005, 2006, 2007  Free Software Foundation, Inc.
+  2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 
 This file is part of the Lucid Widget Library.
 
diff --git a/lwlib/xlwmenu.h b/lwlib/xlwmenu.h
index ce29c6ac510..f6f6c0df791 100644
--- a/lwlib/xlwmenu.h
+++ b/lwlib/xlwmenu.h
@@ -1,6 +1,6 @@
 /* Interface of a lightweight menubar widget.
 Copyright (C) 1992 Lucid, Inc.
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
+Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008
   Free Software Foundation, Inc.
 
 This file is part of the Lucid Widget Library.
diff --git a/lwlib/xlwmenuP.h b/lwlib/xlwmenuP.h
index c067dd1aafe..3774cace7f5 100644
--- a/lwlib/xlwmenuP.h
+++ b/lwlib/xlwmenuP.h
@@ -1,6 +1,6 @@
 /* Internals of a lightweight menubar widget.
 Copyright (C) 1992 Lucid, Inc.
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
+Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008
   Free Software Foundation, Inc.
 
 This file is part of the Lucid Widget Library.