[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100016: Revert last change.

[Chong Yidong]

------------------------------------------------------------
revno: 100016
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Sat 2010-09-04 14:36:24 -0400
message:
  Revert last change.
modified:
  doc/lispref/ChangeLog
  doc/lispref/frames.texi

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2010-09-04 18:21:48 +0000
+++ b/doc/lispref/ChangeLog     2010-09-04 18:36:24 +0000
@@ -1,7 +1,3 @@
-2010-09-04  Chong Yidong  <address@hidden>
-
-       * frames.texi (Layout Parameters): Add cindex entries (Bug#6929).
-
 2010-08-22  Chong Yidong  <address@hidden>
 
        * modes.texi (Defining Minor Modes): Doc fix (Bug#6880).

=== modified file 'doc/lispref/frames.texi'
--- a/doc/lispref/frames.texi   2010-09-04 18:21:48 +0000
+++ b/doc/lispref/frames.texi   2010-09-04 18:36:24 +0000
@@ -623,10 +623,6 @@
 
 @node Layout Parameters
 @subsubsection Layout Parameters
address@hidden scroll bars, and frame parameters
address@hidden fringes, and frame parameters
address@hidden menu bars, and frame parameters
address@hidden tool bars, and frame parameters
 
   These frame parameters enable or disable various parts of the
 frame, or control their sizes.
@@ -643,6 +639,13 @@
 of the frame they should be on.  The possible values are @code{left},
 @code{right}, and @code{nil} for no scroll bars.
 
address@hidden
address@hidden horizontal-scroll-bars
+Whether the frame has scroll bars for horizontal scrolling
+(address@hidden means yes).  Horizontal scroll bars are not currently
+implemented.
address@hidden ignore
+
 @item scroll-bar-width
 The width of vertical scroll bars, in pixels, or @code{nil} meaning to
 use the default width.
@@ -670,7 +673,7 @@
 menu bar line; they treat larger values as 1.)
 
 @item tool-bar-lines
-      The number of lines to use for the tool bar.  A value of @code{nil}
+The number of lines to use for the tool bar.  A value of @code{nil}
 means don't display a tool bar.  (GTK and Nextstep allow at most one
 tool bar line; they treat larger values as 1.)