Merge from emacs--rel--22, gnus--devo--0

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

2 files changed, 13 insertions, 3 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 50399b0120e..9f98547e590 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-30  Richard Stallman  <rms@gnu.org>
+
+        * commands.texi (Accessing Mouse): Renamed from Accessing Events.
+        (Accessing Scroll): New node broken out of Accessing Mouse.
+
 2007-12-28  Richard Stallman  <rms@gnu.org>
 
         * frames.texi (Size Parameters): Fix typo.
diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi
index cdd627f6b52..aef7e4d9a43 100644
--- a/doc/lispref/commands.texi
+++ b/doc/lispref/commands.texi
@@ -954,7 +954,8 @@ the current Emacs session.  If a symbol has not yet been so used,
 * Event Examples::              Examples of the lists for mouse events.
 * Classifying Events::          Finding the modifier keys in an event symbol.
                                 Event types.
-* Accessing Events::            Functions to extract info from events.
+* Accessing Mouse::             Functions to extract info from mouse events.
+* Accessing Scroll::            Functions to get info from scroll bar events.
 * Strings of Events::           Special considerations for putting
                                   keyboard character events in a string.
 @end menu
@@ -1810,8 +1811,8 @@ must be the last element of the list.  For example,
 @end example
 @end defun
 
-@node Accessing Events
-@subsection Accessing Events
+@node Accessing Mouse
+@subsection Accessing Mouse Events
 @cindex mouse events, data in
 
   This section describes convenient functions for accessing the data in
@@ -1957,6 +1958,10 @@ to the window text area, otherwise they are relative to
 the entire window area including scroll bars, margins and fringes.
 @end defun
 
+@node Accessing Scroll
+@subsection Accessing Scroll Bar Events
+@cindex scroll bar events, data in
+
   These functions are useful for decoding scroll bar events.
 
 @defun scroll-bar-event-ratio event