Merge from emacs-23

author: Stefan Monnier 2011-01-14 12:18:41 -0500
committer: Stefan Monnier 2011-01-14 12:18:41 -0500
commit: 77ab81d0545e980c57c0a35510ade29a9e43b4cd (patch)
tree: 258514dac7faab41642d8f319eb113c8a5f09690 /oldXMenu
parent: 8faba62c38f67693535c3471d867e66757b3b04e (diff)
parent: fb724e553757e9d3344be443ab5f329afc9bf91c (diff)
download: emacs-77ab81d0545e980c57c0a35510ade29a9e43b4cd.tar.gz
emacs-77ab81d0545e980c57c0a35510ade29a9e43b4cd.zip
7 files changed, 8 insertions, 8 deletions
diff --git a/oldXMenu/Activate.c b/oldXMenu/Activate.c
index 55bfca510b9..118024170eb 100644
--- a/oldXMenu/Activate.c
+++ b/oldXMenu/Activate.c
@@ -3,7 +3,7 @@
 #include "copyright.h"
 /*
-Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
  Free Software Foundation, Inc.
 This program is free software: you can redistribute it and/or modify
diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog
index 329a4ac9565..c3065524b51 100644
--- a/oldXMenu/ChangeLog
+++ b/oldXMenu/ChangeLog
@@ -573,7 +573,7 @@
 ;; End:
    Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001,
-        2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+        2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
        Free Software Foundation, Inc.
  This file is part of GNU Emacs.
diff --git a/oldXMenu/Create.c b/oldXMenu/Create.c
index f96e077a466..fc979ad948f 100644
--- a/oldXMenu/Create.c
+++ b/oldXMenu/Create.c
@@ -4,7 +4,7 @@
 /*
 Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-  2008, 2009, 2010  Free Software Foundation, Inc.
+  2008, 2009, 2010, 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/oldXMenu/FindSel.c b/oldXMenu/FindSel.c
index 202bbc1b28c..4d143b5f3b9 100644
--- a/oldXMenu/FindSel.c
+++ b/oldXMenu/FindSel.c
@@ -4,7 +4,7 @@
 /*
 Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-  2009, 2010  Free Software Foundation, Inc.
+  2009, 2010, 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/oldXMenu/Internal.c b/oldXMenu/Internal.c
index cb87dd650c7..34615e8ed16 100644
--- a/oldXMenu/Internal.c
+++ b/oldXMenu/Internal.c
@@ -4,7 +4,7 @@
 /*
 Copyright (C) 1993, 1996, 2001, 2002, 2003, 2004, 2005, 2006,
-  2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+  2007, 2008, 2009, 2010, 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/oldXMenu/Makefile.in b/oldXMenu/Makefile.in
index 8acfee07fd0..cf97f740af4 100644
--- a/oldXMenu/Makefile.in
+++ b/oldXMenu/Makefile.in
@@ -15,8 +15,8 @@
 ## without express or implied warranty.
-## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-##   2010  Free Software Foundation, Inc.
+##   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/oldXMenu/insque.c b/oldXMenu/insque.c
index c6f8f6ef1fb..f5c30f28ff4 100644
--- a/oldXMenu/insque.c
+++ b/oldXMenu/insque.c
@@ -1,6 +1,6 @@
 /*
 Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003,
-  2004, 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+  2004, 2005, 2006, 2007, 2008, 2009, 2010, 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
author	Stefan Monnier	2011-01-14 12:18:41 -0500
committer	Stefan Monnier	2011-01-14 12:18:41 -0500
commit	77ab81d0545e980c57c0a35510ade29a9e43b4cd (patch)
tree	258514dac7faab41642d8f319eb113c8a5f09690 /oldXMenu
parent	8faba62c38f67693535c3471d867e66757b3b04e (diff)
parent	fb724e553757e9d3344be443ab5f329afc9bf91c (diff)
download	emacs-77ab81d0545e980c57c0a35510ade29a9e43b4cd.tar.gz emacs-77ab81d0545e980c57c0a35510ade29a9e43b4cd.zip

diff --git a/oldXMenu/Activate.c b/oldXMenu/Activate.c index 55bfca510b9..118024170eb 100644 --- a/oldXMenu/Activate.c +++ b/oldXMenu/Activate.c
@@ -3,7 +3,7 @@
3	#include "copyright.h"	3	#include "copyright.h"
4		4
5	/*	5	/*
6	Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010	6	Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
7	Free Software Foundation, Inc.	7	Free Software Foundation, Inc.
8		8
9	This program is free software: you can redistribute it and/or modify	9	This program is free software: you can redistribute it and/or modify


diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog index 329a4ac9565..c3065524b51 100644 --- a/oldXMenu/ChangeLog +++ b/oldXMenu/ChangeLog
@@ -573,7 +573,7 @@
573	;; End:	573	;; End:
574		574
575	Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001,	575	Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001,
576	2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010	576	2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
577	Free Software Foundation, Inc.	577	Free Software Foundation, Inc.
578		578
579	This file is part of GNU Emacs.	579	This file is part of GNU Emacs.


diff --git a/oldXMenu/Create.c b/oldXMenu/Create.c index f96e077a466..fc979ad948f 100644 --- a/oldXMenu/Create.c +++ b/oldXMenu/Create.c
@@ -4,7 +4,7 @@
4		4
5	/*	5	/*
6	Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007,	6	Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
7	2008, 2009, 2010 Free Software Foundation, Inc.	7	2008, 2009, 2010, 2011 Free Software Foundation, Inc.
8		8
9	This program is free software: you can redistribute it and/or modify	9	This program is free software: you can redistribute it and/or modify
10	it under the terms of the GNU General Public License as published by	10	it under the terms of the GNU General Public License as published by


diff --git a/oldXMenu/FindSel.c b/oldXMenu/FindSel.c index 202bbc1b28c..4d143b5f3b9 100644 --- a/oldXMenu/FindSel.c +++ b/oldXMenu/FindSel.c
@@ -4,7 +4,7 @@
4		4
5	/*	5	/*
6	Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,	6	Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
7	2009, 2010 Free Software Foundation, Inc.	7	2009, 2010, 2011 Free Software Foundation, Inc.
8		8
9	This program is free software: you can redistribute it and/or modify	9	This program is free software: you can redistribute it and/or modify
10	it under the terms of the GNU General Public License as published by	10	it under the terms of the GNU General Public License as published by


diff --git a/oldXMenu/Internal.c b/oldXMenu/Internal.c index cb87dd650c7..34615e8ed16 100644 --- a/oldXMenu/Internal.c +++ b/oldXMenu/Internal.c
@@ -4,7 +4,7 @@
4		4
5	/*	5	/*
6	Copyright (C) 1993, 1996, 2001, 2002, 2003, 2004, 2005, 2006,	6	Copyright (C) 1993, 1996, 2001, 2002, 2003, 2004, 2005, 2006,
7	2007, 2008, 2009, 2010 Free Software Foundation, Inc.	7	2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
8		8
9	This program is free software: you can redistribute it and/or modify	9	This program is free software: you can redistribute it and/or modify
10	it under the terms of the GNU General Public License as published by	10	it under the terms of the GNU General Public License as published by


diff --git a/oldXMenu/Makefile.in b/oldXMenu/Makefile.in index 8acfee07fd0..cf97f740af4 100644 --- a/oldXMenu/Makefile.in +++ b/oldXMenu/Makefile.in
@@ -15,8 +15,8 @@
15	## without express or implied warranty.	15	## without express or implied warranty.
16		16
17		17
18	## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,	18	## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
19	## 2010 Free Software Foundation, Inc.	19	## Free Software Foundation, Inc.
20		20
21	## This program is free software: you can redistribute it and/or modify	21	## This program is free software: you can redistribute it and/or modify
22	## it under the terms of the GNU General Public License as published by	22	## it under the terms of the GNU General Public License as published by


diff --git a/oldXMenu/insque.c b/oldXMenu/insque.c index c6f8f6ef1fb..f5c30f28ff4 100644 --- a/oldXMenu/insque.c +++ b/oldXMenu/insque.c
@@ -1,6 +1,6 @@
1	/*	1	/*
2	Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003,	2	Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003,
3	2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.	3	2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
4		4
5	This program is free software: you can redistribute it and/or modify	5	This program is free software: you can redistribute it and/or modify
6	it under the terms of the GNU General Public License as published by	6	it under the terms of the GNU General Public License as published by