2 files changed, 14 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ae35ff6cce2..2b631dfc5f9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2014-02-21  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.c (Fwindow_scroll_bar_width): New function.
+
 2014-02-21  Paul Eggert  <eggert@cs.ucla.edu>
 
         Pacify GCC when configuring with --enable-gcc-warnings.
diff --git a/src/window.c b/src/window.c
index b2c97d52157..0f62838d672 100644
--- a/src/window.c
+++ b/src/window.c
@@ -974,6 +974,15 @@ WINDOW must be a live window and defaults to the selected one.  */)
   return (make_number (WINDOW_BOTTOM_DIVIDER_WIDTH (decode_live_window (window))));
 }
 
+DEFUN ("window-scroll-bar-width", Fwindow_scroll_bar_width,
+       Swindow_scroll_bar_width, 0, 1, 0,
+       doc: /* Return the width in pixels of WINDOW's vertical scrollbar.
+WINDOW must be a live window and defaults to the selected one.  */)
+  (Lisp_Object window)
+{
+  return (make_number (WINDOW_SCROLL_BAR_AREA_WIDTH (decode_live_window (window))));
+}
+
 DEFUN ("window-hscroll", Fwindow_hscroll, Swindow_hscroll, 0, 1, 0,
        doc: /* Return the number of columns by which WINDOW is scrolled from left margin.
 WINDOW must be a live window and defaults to the selected one.  */)
@@ -7363,6 +7372,7 @@ pixelwise even if this option is nil.  */);
   defsubr (&Swindow_header_line_height);
   defsubr (&Swindow_right_divider_width);
   defsubr (&Swindow_bottom_divider_width);
+  defsubr (&Swindow_scroll_bar_width);
   defsubr (&Swindow_inside_edges);
   defsubr (&Swindow_inside_pixel_edges);
   defsubr (&Swindow_inside_absolute_pixel_edges);