Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 615-621)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 197-199)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-166

11 files changed, 190 insertions, 3 deletions

diff --git a/lispintro/ChangeLog b/lispintro/ChangeLog
index 96491b93c08..7d4fae9eba8 100644
--- a/lispintro/ChangeLog
+++ b/lispintro/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-30  Robert J. Chassell  <bob@rattlesnake.com>
+
+        * emacs-lisp-intro.texi (else): Rephrase message of first
+        if-then-else example so it is right both in itself and in the
+        "true" case of the expression, which asks whether 4 is greater
+        than 5.
+
 2006-11-27  Andreas Schwab  <schwab@suse.de>
 
         * Makefile.in (usermanualdir): Define.
diff --git a/lispintro/cons-1.eps b/lispintro/cons-1.eps
index 6ec005c7cb0..ea2c4168956 100644
--- a/lispintro/cons-1.eps
+++ b/lispintro/cons-1.eps
@@ -7,6 +7,26 @@
 %       Due to bugs in Transcript, the 'PS-Adobe-' stuff is omitted from line 1
 %
 
+% Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+%   Free Software Foundation, Inc.
+%
+% This file is part of GNU Emacs.
+%
+% 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 2, 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.
+
 /tgifdict 132 dict def
 tgifdict begin
 
diff --git a/lispintro/cons-2.eps b/lispintro/cons-2.eps
index bad0c75e6e2..b6fb796b452 100644
--- a/lispintro/cons-2.eps
+++ b/lispintro/cons-2.eps
@@ -7,6 +7,26 @@
 %       Due to bugs in Transcript, the 'PS-Adobe-' stuff is omitted from line 1
 %
 
+% Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+%   Free Software Foundation, Inc.
+%
+% This file is part of GNU Emacs.
+%
+% 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 2, 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.
+
 /tgifdict 132 dict def
 tgifdict begin
 
diff --git a/lispintro/cons-3.eps b/lispintro/cons-3.eps
index 64e6e58f4e6..ea3f8d4c80d 100644
--- a/lispintro/cons-3.eps
+++ b/lispintro/cons-3.eps
@@ -7,6 +7,26 @@
 %       Due to bugs in Transcript, the 'PS-Adobe-' stuff is omitted from line 1
 %
 
+% Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+%   Free Software Foundation, Inc.
+%
+% This file is part of GNU Emacs.
+%
+% 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 2, 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.
+
 /tgifdict 132 dict def
 tgifdict begin
 
diff --git a/lispintro/cons-4.eps b/lispintro/cons-4.eps
index 04e9706fb66..80947b45a8e 100644
--- a/lispintro/cons-4.eps
+++ b/lispintro/cons-4.eps
@@ -7,6 +7,26 @@
 %       Due to bugs in Transcript, the 'PS-Adobe-' stuff is omitted from line 1
 %
 
+% Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+%   Free Software Foundation, Inc.
+%
+% This file is part of GNU Emacs.
+%
+% 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 2, 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.
+
 /tgifdict 132 dict def
 tgifdict begin
 
diff --git a/lispintro/cons-5.eps b/lispintro/cons-5.eps
index 83a17d5e3e1..a49bb062c16 100644
--- a/lispintro/cons-5.eps
+++ b/lispintro/cons-5.eps
@@ -7,6 +7,26 @@
 %       Due to bugs in Transcript, the 'PS-Adobe-' stuff is omitted from line 1
 %
 
+% Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+%   Free Software Foundation, Inc.
+%
+% This file is part of GNU Emacs.
+%
+% 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 2, 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.
+
 /tgifdict 132 dict def
 tgifdict begin
 
diff --git a/lispintro/drawers.eps b/lispintro/drawers.eps
index 9bfc5aa8a7e..b0f2f64e0a9 100644
--- a/lispintro/drawers.eps
+++ b/lispintro/drawers.eps
@@ -9,6 +9,26 @@
 %%EndComments
 %%BeginProlog
 
+% Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+%   Free Software Foundation, Inc.
+%
+% This file is part of GNU Emacs.
+%
+% 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 2, 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.
+
 /tgifdict 53 dict def
 tgifdict begin
 
diff --git a/lispintro/emacs-lisp-intro.texi b/lispintro/emacs-lisp-intro.texi
index 6e125989446..0318ac5d361 100644
--- a/lispintro/emacs-lisp-intro.texi
+++ b/lispintro/emacs-lisp-intro.texi
@@ -4112,9 +4112,9 @@ is not greater than 5!} when you evaluate it in the usual way:
 
 @smallexample
 @group
-(if (> 4 5)                             ; @r{if-part}
-    (message "5 is greater than 4!")    ; @r{then-part}
-  (message "4 is not greater than 5!")) ; @r{else-part}
+(if (> 4 5)                               ; @r{if-part}
+    (message "4 falsely greater than 5!") ; @r{then-part}
+  (message "4 is not greater than 5!"))   ; @r{else-part}
 @end group
 @end smallexample
 
diff --git a/lispintro/lambda-1.eps b/lispintro/lambda-1.eps
index ef5dddd91e0..14780fefe76 100644
--- a/lispintro/lambda-1.eps
+++ b/lispintro/lambda-1.eps
@@ -7,6 +7,26 @@
 %       Due to bugs in Transcript, the 'PS-Adobe-' stuff is omitted from line 1
 %
 
+% Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+%   Free Software Foundation, Inc.
+%
+% This file is part of GNU Emacs.
+%
+% 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 2, 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.
+
 /tgifdict 132 dict def
 tgifdict begin
 
diff --git a/lispintro/lambda-2.eps b/lispintro/lambda-2.eps
index 38f7dba9f06..5d2717342ac 100644
--- a/lispintro/lambda-2.eps
+++ b/lispintro/lambda-2.eps
@@ -7,6 +7,26 @@
 %       Due to bugs in Transcript, the 'PS-Adobe-' stuff is omitted from line 1
 %
 
+% Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+%   Free Software Foundation, Inc.
+%
+% This file is part of GNU Emacs.
+%
+% 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 2, 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.
+
 /tgifdict 132 dict def
 tgifdict begin
 
diff --git a/lispintro/lambda-3.eps b/lispintro/lambda-3.eps
index e94af70dec6..4f16e9d9185 100644
--- a/lispintro/lambda-3.eps
+++ b/lispintro/lambda-3.eps
@@ -7,6 +7,26 @@
 %       Due to bugs in Transcript, the 'PS-Adobe-' stuff is omitted from line 1
 %
 
+% Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+%   Free Software Foundation, Inc.
+%
+% This file is part of GNU Emacs.
+%
+% 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 2, 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.
+
 /tgifdict 132 dict def
 tgifdict begin