[Emacs-diffs] Changes to emacs/src/window.c

[Masatake YAMATO]

Index: emacs/src/window.c
diff -c emacs/src/window.c:1.447 emacs/src/window.c:1.448
*** emacs/src/window.c:1.447    Sat Sep 20 19:38:54 2003
--- emacs/src/window.c  Mon Sep 22 08:55:24 2003
***************
*** 5861,5867 ****
  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.  
*/)
       (window, width, vertical_type, horizontal_type)
       Lisp_Object window, width, vertical_type, horizontal_type;
  {
--- 5861,5868 ----
  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.
! 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;
  {
***************
*** 5872,5877 ****
--- 5873,5884 ----
  
    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))