Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 97-100)

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

 * gnus--rel--5.10  (patch 246-247)

   - Update from CVS

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

3 files changed, 38 insertions, 1 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index fdcce7a6f46..94faa99bba5 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -56,7 +56,7 @@
         (\versionyear): update to 2007.
         (\copyrightnotice): modified or unmodified ok.
         (Simple Customization): don't use goto-line, since now it's bound.
-        Also, use now-preferred (kbd ...) syntax.
+^       Also, use now-preferred (kbd ...) syntax.
 
 2007-08-22  Michael Albinus  <michael.albinus@gmx.de>
 
diff --git a/etc/NEWS.22 b/etc/NEWS.22
index cdf1ef1dd02..6009fea7551 100644
--- a/etc/NEWS.22
+++ b/etc/NEWS.22
@@ -41,6 +41,8 @@ below.  Emacs tries to warn you about these through `bad-packages-alist'.
 
 * Changes in Emacs 22.2
 
+** `browse-url-emacs' loads a URL into an Emacs buffer.  Handy for *.el URLs.
+
 ** `bad-packages-alist' will warn about external packages that are known
 to cause problems in this version of Emacs.
 
@@ -79,6 +81,14 @@ in to make it use the scrollbars from the system theme.
 
 * Lisp Changes in Emacs 22.2.
 
+** The function invisible-p returns non-nil if the character
+   after a specified position is invisible.
+
++++
+** inhibit-modification-hooks is bound to t while running modification hooks.
+As a happy consequence, after-change-functions and before-change-functions
+are not bound to nil any more while running an (after|before)-change-function.
+
 ** New function `window-full-width-p' returns t if a window is as wide
 as its frame.
 
diff --git a/etc/README b/etc/README
index e18da7f381a..16e0923487d 100644
--- a/etc/README
+++ b/etc/README
@@ -10,8 +10,35 @@ for Emacs functions and variables.
 
 COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
 
+The files splash.xpm, splash8.xpm contain copyright and license
+information, but it is reproduced here for convenience.
+
+Files: splash.pbm, splash.xpm, splash8.xpm, gnus.pbm, gnus-logo.eps
+  Author: Luis Fernandes <elf@ee.ryerson.ca>
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+    Free Software Foundation, Inc.
+  License: GNU General Public License version 3 or later (see COPYING)
+
 File: emacs.icon
   Author: Sun Microsystems, Inc
   Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007
     Free Software Foundation, Inc.
   License: GNU General Public License version 3 or later (see COPYING)
+
+
+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 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.