aboutsummaryrefslogtreecommitdiffstats
path: root/src/xterm.c
diff options
context:
space:
mode:
authorPaul Eggert2012-02-10 10:58:48 -0800
committerPaul Eggert2012-02-10 10:58:48 -0800
commit6e6c82a4e687708d5a7a3887f92db45bd74da276 (patch)
tree85dc3105240e84a8cddadb25d572e170fcdbd8bc /src/xterm.c
parent78df1fb1d46d556bfc2698ca1802972b13613ba8 (diff)
parentcc26d239af9a82cff079556a1daff4b4bf60eb5c (diff)
downloademacs-6e6c82a4e687708d5a7a3887f92db45bd74da276.tar.gz
emacs-6e6c82a4e687708d5a7a3887f92db45bd74da276.zip
Merge from trunk.
Diffstat (limited to 'src/xterm.c')
-rw-r--r--src/xterm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xterm.c b/src/xterm.c
index 2a2ae105e2e..6b19533e97c 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -1,6 +1,6 @@
1/* X Communication module for terminals which understand the X protocol. 1/* X Communication module for terminals which understand the X protocol.
2 2
3Copyright (C) 1989, 1993-2012 Free Software Foundation, Inc. 3Copyright (C) 1989, 1993-2012 Free Software Foundation, Inc.
4 4
5This file is part of GNU Emacs. 5This file is part of GNU Emacs.
6 6
@@ -10844,7 +10844,7 @@ selected window or cursor position is preserved. */);
10844A value of nil means Emacs doesn't use toolkit scroll bars. 10844A value of nil means Emacs doesn't use toolkit scroll bars.
10845With the X Window system, the value is a symbol describing the 10845With the X Window system, the value is a symbol describing the
10846X toolkit. Possible values are: gtk, motif, xaw, or xaw3d. 10846X toolkit. Possible values are: gtk, motif, xaw, or xaw3d.
10847With MS Windows, the value is t. */); 10847With MS Windows or Nextstep, the value is t. */);
10848#ifdef USE_TOOLKIT_SCROLL_BARS 10848#ifdef USE_TOOLKIT_SCROLL_BARS
10849#ifdef USE_MOTIF 10849#ifdef USE_MOTIF
10850 Vx_toolkit_scroll_bars = intern_c_string ("motif"); 10850 Vx_toolkit_scroll_bars = intern_c_string ("motif");