(syms_of_buffer) <vertical-scroll-bar>: Correct typo.

diff --git a/src/ChangeLog b/src/ChangeLog
index e7a901fd1836bd62591c173ec9655ea29285a261..2f974365cdcdca776a2689af2f0fd4b1639696d0 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-29  Luc Teirlinck  <teirllm@auburn.edu>
+
+       * buffer.c (syms_of_buffer) <vertical-scroll-bar>: Correct typo.
+
 2004-12-29  Richard M. Stallman  <rms@gnu.org>
 
        * buffer.c (syms_of_buffer) <vertical-scroll-bar>: Doc fix.

diff --git a/src/buffer.c b/src/buffer.c
index 7eb9bbbe65010edd67526935d680871b71eda594..b3bcb68c2812f04c58f9aa8667cede460b0519e4 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5649,7 +5649,7 @@ A value of nil means to use the scroll bar width from the window's frame.  */);
                     Qnil,
                     doc: /* *Position of this buffer's vertical scroll bar.
 The value takes effect whenever you tell a window to display this buffer;
-for instance, with `set-window-buffer' when or `display-buffer' displays it.
+for instance, with `set-window-buffer' or when `display-buffer' displays it.
 
 A value of `left' or `right' means put the vertical scroll bar at that side
 of the window; a value of nil means don't show any vertical scroll bars.