From 65807d733424d31514780c4e2c7b902e93561126 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 23 Oct 2010 18:15:43 -0700 Subject: [PATCH] Sync X and MS-Windows docs of x-toolkit-scroll-bars. * src/w32term.c (syms_of_w32term) : * src/xterm.c (syms_of_xterm) : Sync docs. --- src/ChangeLog | 5 +++++ src/w32term.c | 15 +++++++++------ src/xterm.c | 17 +++++++++-------- 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 2e2d771b792..a0d7d47ce35 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-10-24 Glenn Morris + + * w32term.c (syms_of_w32term) : + * xterm.c (syms_of_xterm) : Sync docs. + 2010-10-23 Glenn Morris * buffer.c (syms_of_buffer) : diff --git a/src/w32term.c b/src/w32term.c index 1f53860de2e..e9865ed7aee 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -1,7 +1,8 @@ /* Implementation of GUI terminal on the Microsoft W32 API. - Copyright (C) 1989, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001, 2002, 2003, 2004, 2005, - 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + +Copyright (C) 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, + 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 + Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -6348,12 +6349,14 @@ baseline level. The default value is nil. */); x_underline_at_descent_line = 0; DEFVAR_LISP ("x-toolkit-scroll-bars", &Vx_toolkit_scroll_bars, - doc: /* If not nil, Emacs uses toolkit scroll bars. */); + doc: /* Which toolkit scroll bars Emacs uses, if any. +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. */); Vx_toolkit_scroll_bars = Qt; staticpro (&last_mouse_motion_frame); last_mouse_motion_frame = Qnil; } -/* arch-tag: 5fa70624-ab86-499c-8a85-473958ee4646 - (do not change this comment) */ diff --git a/src/xterm.c b/src/xterm.c index d9d908d4396..b685ad475f7 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -1,7 +1,8 @@ /* X Communication module for terminals which understand the X protocol. - Copyright (C) 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, - 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 - Free Software Foundation, Inc. + +Copyright (C) 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, + 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 + Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -10682,9 +10683,11 @@ selected window or cursor position is preserved. */); x_mouse_click_focus_ignore_position = 0; DEFVAR_LISP ("x-toolkit-scroll-bars", &Vx_toolkit_scroll_bars, - doc: /* What X toolkit scroll bars Emacs uses. -A value of nil means Emacs doesn't use X toolkit scroll bars. -Otherwise, value is a symbol describing the X toolkit. */); + doc: /* Which toolkit scroll bars Emacs uses, if any. +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. */); #ifdef USE_TOOLKIT_SCROLL_BARS #ifdef USE_MOTIF Vx_toolkit_scroll_bars = intern_c_string ("motif"); @@ -10750,5 +10753,3 @@ default is nil, which is the same as `super'. */); #endif /* HAVE_X_WINDOWS */ -/* arch-tag: 6d4e4cb7-abc1-4302-9585-d84dcfb09d0f - (do not change this comment) */ -- 2.39.5