Native scroll-bars are not implemented for Nextstep (bug#10673)

* configure.in [HAVE_NS]: Error if use --without-toolkit-scroll-bars.

* src/nsterm.m (syms_of_nsterm) <x-toolkit-scroll-bars>:
Unconditionally set to t.

* src/nsterm.m (syms_of_nsterm) <x-toolkit-scroll-bars>:
* src/w32term.c (syms_of_w32term) <x-toolkit-scroll-bars>:
* src/xterm.c (syms_of_xterm) <x-toolkit-scroll-bars>: Doc fix.

6 files changed, 25 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 731bd80d549..cfcfab4ee33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-02  Glenn Morris  <rgm@gnu.org>
+
+	* configure.in [HAVE_NS]:
+	Error if use --without-toolkit-scroll-bars.  (Bug#10673)
+
 2012-02-01  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Port to older Solaris 10 versions (Bug#10677).
diff --git a/configure.in b/configure.in
index 9eae1a51767..1d3810253ab 100644
--- a/configure.in
+++ b/configure.in
@@ -1568,6 +1568,10 @@ ns_frag=/dev/null
 NS_OBJ=
 NS_OBJC_OBJ=
 if test "${HAVE_NS}" = yes; then
+  if test "$with_toolkit_scroll_bars" = "no"; then
+    AC_MSG_ERROR([Native scroll bars are not implemented for Nextstep.])
+  fi
+
   window_system=nextstep
   with_xft=no
   # set up packaging dirs
diff --git a/src/ChangeLog b/src/ChangeLog
index eebb10fb472..800409d2377 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2012-02-02  Glenn Morris  <rgm@gnu.org>
+
+	* nsterm.m (syms_of_nsterm) <x-toolkit-scroll-bars>:
+	Unconditionally set to t.  (Bug#10673)
+	* nsterm.m (syms_of_nsterm) <x-toolkit-scroll-bars>:
+	* w32term.c (syms_of_w32term) <x-toolkit-scroll-bars>:
+	* xterm.c (syms_of_xterm) <x-toolkit-scroll-bars>: Doc fix.
+
 2012-02-02  Kenichi Handa  <handa@m17n.org>
 
 	* xdisp.c (BUILD_COMPOSITE_GLYPH_STRING): Initialize first_s to
diff --git a/src/nsterm.m b/src/nsterm.m
index 1fbd3813fc7..277af26f149 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -1,6 +1,7 @@
 /* NeXT/Open/GNUstep / MacOSX communication module.
-   Copyright (C) 1989, 1993-1994, 2005-2006, 2008-2012
-     Free Software Foundation, Inc.
+
+Copyright (C) 1989, 1993-1994, 2005-2006, 2008-2012
+  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -6739,13 +6740,8 @@ Only works on OSX 10.6 or later.  */);
 A value of nil means Emacs doesn't use toolkit scroll bars.
 With the X Window system, the value is a symbol describing the
 X toolkit.  Possible values are: gtk, motif, xaw, or xaw3d.
-With MS Windows, the value is t.  With Nextstep, the value is
-t or nil.  */);
-#ifdef USE_TOOLKIT_SCROLL_BARS
+With MS Windows or Nextstep, the value is t.  */);
   Vx_toolkit_scroll_bars = Qt;
-#else
-  Vx_toolkit_scroll_bars = Qnil;
-#endif
 
   DEFVAR_BOOL ("x-use-underline-position-properties",
 	       x_use_underline_position_properties,
diff --git a/src/w32term.c b/src/w32term.c
index 57fdf070850..8a0e9efc943 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -1,6 +1,6 @@
 /* Implementation of GUI terminal on the Microsoft W32 API.
 
-Copyright (C) 1989, 1993-2012  Free Software Foundation, Inc.
+Copyright (C) 1989, 1993-2012 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -6432,8 +6432,7 @@ baseline level.  The default value is nil.  */);
 A value of nil means Emacs doesn't use toolkit scroll bars.
 With the X Window system, the value is a symbol describing the
 X toolkit.  Possible values are: gtk, motif, xaw, or xaw3d.
-With MS Windows, the value is t.  With Nextstep, the value is
-t or nil.  */);
+With MS Windows or Nextstep, the value is t.  */);
   Vx_toolkit_scroll_bars = Qt;
 
   staticpro (&last_mouse_motion_frame);
diff --git a/src/xterm.c b/src/xterm.c
index 8fd0c0d24f7..0a54c987387 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -1,6 +1,6 @@
 /* X Communication module for terminals which understand the X protocol.
 
-Copyright (C) 1989, 1993-2012  Free Software Foundation, Inc.
+Copyright (C) 1989, 1993-2012 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -10844,8 +10844,7 @@ selected window or cursor position is preserved.  */);
 A value of nil means Emacs doesn't use toolkit scroll bars.
 With the X Window system, the value is a symbol describing the
 X toolkit.  Possible values are: gtk, motif, xaw, or xaw3d.
-With MS Windows, the value is t.  With Nextstep, the value is
-t or nil.  */);
+With MS Windows or Nextstep, the value is t.  */);
 #ifdef USE_TOOLKIT_SCROLL_BARS
 #ifdef USE_MOTIF
   Vx_toolkit_scroll_bars = intern_c_string ("motif");