Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 852-856)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 93-96)

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

 * gnus--rel--5.10  (patch 245)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-32

3 files changed, 18 insertions, 1 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 9fd1a50736c..2a09fa9c369 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-14  Glenn Morris  <rgm@gnu.org>
+
+        * NEWS: Mention `bad-packages-alist'.
+
 2007-08-08  Glenn Morris  <rgm@gnu.org>
 
         * TODO: `iff' item is dealt with.
diff --git a/etc/NEWS b/etc/NEWS
index c70f968e41a..f0e00c99eba 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -56,6 +56,10 @@ to a remote display, e.g. because the display is about to become unreachable.
 
 * Startup Changes in Emacs 23.1
 
+** New user option `initial-buffer-choice' specifies what to display
+after starting Emacs: startup screen, *scratch* buffer, visiting a
+file or directory.
+
 
 * Incompatible Editing Changes in Emacs 23.1
 
@@ -171,6 +175,11 @@ supported on other platforms, but not on Windows due to using the winsock
 
 * Lisp Changes in Emacs 23.1
 
++++
+** 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.
+
 ** Non-breaking space now acts as whitespace.
 
 +++
diff --git a/etc/NEWS.22 b/etc/NEWS.22
index 6e227639fed..cdf1ef1dd02 100644
--- a/etc/NEWS.22
+++ b/etc/NEWS.22
@@ -28,7 +28,8 @@ any older versions of these packages to ensure that the Emacs 22
 version is used.  You can use M-x list-load-path-shadows to find such
 older packages.
 
-Some specific packages that are known to cause problems are:
+Some specific packages that are known to cause problems are given
+below.  Emacs tries to warn you about these through `bad-packages-alist'.
 
 ** Semantic (used by CEDET, ECB, JDEE): upgrade to latest version.
 
@@ -40,6 +41,9 @@ Some specific packages that are known to cause problems are:
 
 * Changes in Emacs 22.2
 
+** `bad-packages-alist' will warn about external packages that are known
+to cause problems in this version of Emacs.
+
 ** The values of `dired-recursive-deletes' and `dired-recursive-copies'
 have been changed to `top'.  This means that the user is asked once,
 before deleting/copying the indicated directory recursively.