# HG changeset patch
# User Masatake YAMATO <jet@gyve.org>
# Date 1064235325 0
# Node ID 26d1a4665f6cb4fc2420e62772c4c5c947efcabf
# Parent  eaaa5462dd17d0c189f2a22a84d3c6d7e55f6315
(Fset_window_scroll_bars): Validate the value of `vertical_type'.

diff -r eaaa5462dd17 -r 26d1a4665f6c src/ChangeLog
--- a/src/ChangeLog	Mon Sep 22 12:37:00 2003 +0000
+++ b/src/ChangeLog	Mon Sep 22 12:55:25 2003 +0000
@@ -1,3 +1,8 @@
+2003-09-22  Masatake YAMATO  <jet@gyve.org>
+
+	* window.c (Fset_window_scroll_bars): Validate the value of 
+	`vertical_type'.
+	
 2003-09-21  Kim F. Storm  <storm@cua.dk>
 
 	* frame.c (Vdefault_frame_scroll_bars): New variable.
diff -r eaaa5462dd17 -r 26d1a4665f6c src/window.c
--- a/src/window.c	Mon Sep 22 12:37:00 2003 +0000
+++ b/src/window.c	Mon Sep 22 12:55:25 2003 +0000
@@ -5861,7 +5861,8 @@
 this is automatically adjusted to a multiple of the frame column width.
 Third parameter VERTICAL-TYPE specifies the type of the vertical scroll
 bar: left, right, or nil.
-A width of nil and type of t means to use the frame's corresponding value.  */)
+If WIDTH is nil, use the frame's scroll-bar width.
+If TYPE is t, use the frame's scroll-bar type.  */)
      (window, width, vertical_type, horizontal_type)
      Lisp_Object window, width, vertical_type, horizontal_type;
 {
@@ -5873,6 +5874,12 @@
   if (XINT (width) == 0)
     vertical_type = Qnil;
 
+  if (!(EQ (vertical_type, Qnil)
+	|| EQ (vertical_type, Qleft) 
+	|| EQ (vertical_type, Qright)
+	|| EQ (vertical_type, Qt)))
+    error ("Invalid type of vertical scroll bar");
+
   if (!EQ (w->scroll_bar_width, width)
       || !EQ (w->vertical_scroll_bar_type, vertical_type))
     {