[Emacs-diffs] /srv/bzr/emacs/trunk r107053: Native scroll-bars are not implemented for Nextstep (bug#10673)

[Glenn Morris]

------------------------------------------------------------
revno: 107053
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2012-02-01 21:12:57 -0500
message:
  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.
modified:
  ChangeLog
  configure.in
  src/ChangeLog
  src/nsterm.m
  src/w32term.c
  src/xterm.c

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-02-01 06:04:34 +0000
+++ b/ChangeLog 2012-02-02 02:12:57 +0000
@@ -1,3 +1,8 @@
+2012-02-02  Glenn Morris  <address@hidden>
+
+       * configure.in [HAVE_NS]:
+       Error if use --without-toolkit-scroll-bars.  (Bug#10673)
+
 2012-02-01  Paul Eggert  <address@hidden>
 
        Port to older Solaris 10 versions (Bug#10677).

=== modified file 'configure.in'
--- a/configure.in      2012-01-31 03:47:51 +0000
+++ b/configure.in      2012-02-02 02:12:57 +0000
@@ -1568,6 +1568,10 @@
 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

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-02-02 00:32:12 +0000
+++ b/src/ChangeLog     2012-02-02 02:12:57 +0000
@@ -1,3 +1,11 @@
+2012-02-02  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * xdisp.c (BUILD_COMPOSITE_GLYPH_STRING): Initialize first_s to

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2012-01-31 03:07:38 +0000
+++ b/src/nsterm.m      2012-02-02 02:12:57 +0000
@@ -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 @@
 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,

=== modified file 'src/w32term.c'
--- a/src/w32term.c     2012-01-31 03:33:16 +0000
+++ b/src/w32term.c     2012-02-02 02:12:57 +0000
@@ -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 @@
 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);

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2012-01-31 03:07:38 +0000
+++ b/src/xterm.c       2012-02-02 02:12:57 +0000
@@ -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 @@
 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");