From: Miles Bader Date: Fri, 27 Jul 2007 10:52:18 +0000 (+0000) Subject: Merge from emacs--devo--0 X-Git-Tag: emacs-pretest-23.0.90~8295^2~363 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e468b87f91f26e66a8cde087c1a9c89c67b96d12;p=emacs.git Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 824-831) - Update from CVS - Merge from emacs--rel--22 * emacs--rel--22 (patch 70-74) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-238 --- e468b87f91f26e66a8cde087c1a9c89c67b96d12 diff --cc etc/vipcard.tex index 6bd0fabdf9f,6bd0fabdf9f..667a8e9d132 --- a/etc/vipcard.tex +++ b/etc/vipcard.tex @@@ -12,20 -12,20 +12,20 @@@ % This file is part of GNU Emacs. --% This file is distributed in the hope that it will be useful, --% but WITHOUT ANY WARRANTY. No author or distributor --% accepts responsibility to anyone for the consequences of using it --% or for whether it serves any particular purpose or describes --% any piece of software unless they say so in writing. Refer to the --% GNU Emacs General Public License for full details. --% --% Permission is granted to copy, modify and redistribute this source --% file provided the copyright notice and permission notices are --% preserved on all copies. --% --% Permission is granted to process this file through TeX and print the --% results, provided the printed document carries copyright and --% permission notices identical to the ones below. ++% GNU Emacs is free software; you can redistribute it and/or modify ++% it under the terms of the GNU General Public License as published by ++% the Free Software Foundation; either version 3, or (at your option) ++% any later version. ++ ++% GNU Emacs is distributed in the hope that it will be useful, ++% but WITHOUT ANY WARRANTY; without even the implied warranty of ++% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++% GNU General Public License for more details. ++ ++% You should have received a copy of the GNU General Public License ++% along with GNU Emacs; see the file COPYING. If not, write to ++% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++% Boston, MA 02110-1301, USA. % This file is intended to be processed by plain TeX (TeX82). % diff --cc etc/viperCard.tex index a4d80fcf668,a4d80fcf668..71996e9d143 --- a/etc/viperCard.tex +++ b/etc/viperCard.tex @@@ -12,20 -12,20 +12,20 @@@ % This file is part of GNU Emacs. --% This file is distributed in the hope that it will be useful, --% but WITHOUT ANY WARRANTY. No author or distributor --% accepts responsibility to anyone for the consequences of using it --% or for whether it serves any particular purpose or describes --% any piece of software unless they say so in writing. Refer to the --% GNU Emacs General Public License for full details. --% --% Permission is granted to copy, modify and redistribute this source --% file provided the copyright notice and permission notices are --% preserved on all copies. --% --% Permission is granted to process this file through TeX and print the --% results, provided the printed document carries copyright and --% permission notices identical to the ones below. ++% GNU Emacs is free software; you can redistribute it and/or modify ++% it under the terms of the GNU General Public License as published by ++% the Free Software Foundation; either version 3, or (at your option) ++% any later version. ++ ++% GNU Emacs is distributed in the hope that it will be useful, ++% but WITHOUT ANY WARRANTY; without even the implied warranty of ++% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++% GNU General Public License for more details. ++ ++% You should have received a copy of the GNU General Public License ++% along with GNU Emacs; see the file COPYING. If not, write to ++% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++% Boston, MA 02110-1301, USA. % This file is intended to be processed by plain TeX (TeX82). % diff --cc oldXMenu/insque.c index 66b442ea29b,66b442ea29b..ec7aa88dbbf --- a/oldXMenu/insque.c +++ b/oldXMenu/insque.c @@@ -3,7 -3,7 +3,7 @@@ 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 --the Free Software Foundation; either version 2, or (at your option) ++the Free Software Foundation; either version 3, or (at your option) any later version. This program is distributed in the hope that it will be useful, diff --cc src/regex.c index 48f0dd92737,1e80b9bbeef..c6d6c36a0bc --- a/src/regex.c +++ b/src/regex.c @@@ -3,11 -3,11 +3,12 @@@ internationalization features.) Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -- 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. ++ 2002, 2003, 2004, 2005, 2006, 2007 ++ 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 -- the Free Software Foundation; either version 2, or (at your option) ++ the Free Software Foundation; either version 3, or (at your option) any later version. This program is distributed in the hope that it will be useful, diff --cc src/regex.h index baf4124401b,dd57ba36f57..69127efa576 --- a/src/regex.h +++ b/src/regex.h @@@ -7,7 -7,7 +7,7 @@@ 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 -- the Free Software Foundation; either version 2, or (at your option) ++ the Free Software Foundation; either version 3, or (at your option) any later version. This program is distributed in the hope that it will be useful,