procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* 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.
This commit is contained in:
Glenn Morris 2012-02-01 21:12:57 -05:00
parent 953a8c3b9c
commit 44f9273998
6 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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).

4
configure.in
View file

@ -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

8
src/ChangeLog
View file

@ -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

12
src/nsterm.m
View file

@ -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 @@ Convert an X font name (XLFD) to an NS font name.
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,

5
src/w32term.c
View file

@ -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);

5
src/xterm.c
View file

@ -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");