diff options
| author | Paul Eggert | 2012-02-10 10:58:48 -0800 |
|---|---|---|
| committer | Paul Eggert | 2012-02-10 10:58:48 -0800 |
| commit | 6e6c82a4e687708d5a7a3887f92db45bd74da276 (patch) | |
| tree | 85dc3105240e84a8cddadb25d572e170fcdbd8bc /src/w32term.c | |
| parent | 78df1fb1d46d556bfc2698ca1802972b13613ba8 (diff) | |
| parent | cc26d239af9a82cff079556a1daff4b4bf60eb5c (diff) | |
| download | emacs-6e6c82a4e687708d5a7a3887f92db45bd74da276.tar.gz emacs-6e6c82a4e687708d5a7a3887f92db45bd74da276.zip | |
Merge from trunk.
Diffstat (limited to 'src/w32term.c')
| -rw-r--r-- | src/w32term.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/w32term.c b/src/w32term.c index f764ad9d218..8a0e9efc943 100644 --- a/src/w32term.c +++ b/src/w32term.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* Implementation of GUI terminal on the Microsoft W32 API. | 1 | /* Implementation of GUI terminal on the Microsoft W32 API. |
| 2 | 2 | ||
| 3 | Copyright (C) 1989, 1993-2012 Free Software Foundation, Inc. | 3 | Copyright (C) 1989, 1993-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | This file is part of GNU Emacs. | 5 | This file is part of GNU Emacs. |
| 6 | 6 | ||
| @@ -6432,7 +6432,7 @@ baseline level. The default value is nil. */); | |||
| 6432 | A value of nil means Emacs doesn't use toolkit scroll bars. | 6432 | A value of nil means Emacs doesn't use toolkit scroll bars. |
| 6433 | With the X Window system, the value is a symbol describing the | 6433 | With the X Window system, the value is a symbol describing the |
| 6434 | X toolkit. Possible values are: gtk, motif, xaw, or xaw3d. | 6434 | X toolkit. Possible values are: gtk, motif, xaw, or xaw3d. |
| 6435 | With MS Windows, the value is t. */); | 6435 | With MS Windows or Nextstep, the value is t. */); |
| 6436 | Vx_toolkit_scroll_bars = Qt; | 6436 | Vx_toolkit_scroll_bars = Qt; |
| 6437 | 6437 | ||
| 6438 | staticpro (&last_mouse_motion_frame); | 6438 | staticpro (&last_mouse_motion_frame); |