Merge from emacs--rel--22

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

3 files changed, 24 insertions, 13 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 32617c97b20..7685a3ce789 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,11 @@
+2007-11-09  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus.texi, gnus-faq.texi, message.texi: Bump version to 5.10.9.
+
+2007-11-09  Nick Roberts  <nickrob@snap.net.nz>
+
+        * building.texi (Watch Expressions): Remove obscure sentence.
+
 2007-11-06  Kenichi Handa  <handa@ni.aist.go.jp>
 
         * mule.texi (Select Input Method): Describe how to activate an input
@@ -15,11 +23,20 @@
 
         * gnus.texi (Troubleshooting): Adjust Gnus version number.
 
+2007-10-30  Nick Roberts  <nickrob@snap.net.nz>
+
+        * building.texi (Watch Expressions): Describe gdb-delete-out-of-scope.
+
 2007-10-30  Glenn Morris  <rgm@gnu.org>
 
         * misc.texi (Directory Tracking): Explain a bit more about
         dirtrack-mode.
 
+2007-10-29  Richard Stallman  <rms@gnu.org>
+
+        * widget.texi (Introduction): Delete discussion of implementation
+        internals.
+
 2007-10-25  Glenn Morris  <rgm@gnu.org>
 
         * fortran-xtra.texi (Fortran): F90 mode handles F2003.
diff --git a/doc/emacs/building.texi b/doc/emacs/building.texi
index 45210118f77..a8bea90a635 100644
--- a/doc/emacs/building.texi
+++ b/doc/emacs/building.texi
@@ -1121,6 +1121,13 @@ changed and @code{shadow} face to make variables which have gone out of
 scope less noticeable.  When a variable goes out of scope you can't
 edit its value.
 
+@vindex gdb-delete-out-of-scope
+  If the variable @code{gdb-delete-out-of-scope} is non-@code{nil}
+(the default value), Emacs automatically deletes watch expressions
+which go out of scope.  Sometimes, when re-entering the same function,
+it may be useful to set this value to nil so that you don't need to
+recreate the watch expression.
+
 @vindex gdb-use-colon-colon-notation
   If the variable @code{gdb-use-colon-colon-notation} is
 non-@code{nil}, Emacs uses the @samp{@var{function}::@var{variable}}
diff --git a/doc/misc/widget.texi b/doc/misc/widget.texi
index 35f0722406e..49b2976472e 100644
--- a/doc/misc/widget.texi
+++ b/doc/misc/widget.texi
@@ -142,19 +142,6 @@ extended to use the GUI features.  This means that your code using the
 widget library will also use the new graphic features automatically.
 @end enumerate
 
-In order to minimize the code that is loaded by users who do not
-create any widgets, the code has been split in two files:
-
-@cindex widget library, files
-@table @file
-@item widget.el
-This will declare the user variables, define the function
-@code{define-widget}, and autoload the function @code{widget-create}.
-@item wid-edit.el
-Everything else is here, there is no reason to load it explicitly, as
-it will be autoloaded when needed.
-@end table
-
 @node User Interface, Programming Example, Introduction, Top
 @comment  node-name,  next,  previous,  up
 @section User Interface