summaryrefslogtreecommitdiff
path: root/src/w32fns.c
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2010-08-08 17:12:29 -0400
committerChong Yidong <cyd@stupidchicken.com>2010-08-08 17:12:29 -0400
commit7815fe1985833c57457882b415a29358991dabdc (patch)
treeab8aabf9ad322c149a6434712c14b93bb93543dc /src/w32fns.c
parent25717ca11cae32e191e3dc9318562190d682f425 (diff)
parente54a1075033073f835596ab666eeed099028beb8 (diff)
downloademacs-7815fe1985833c57457882b415a29358991dabdc.tar.gz
Merge changes from emacs-23 branch
Diffstat (limited to 'src/w32fns.c')
-rw-r--r--src/w32fns.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/w32fns.c b/src/w32fns.c
index 72830c435e9..d1f21e8acdd 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -7053,7 +7053,7 @@ or when you set the mouse color. */);
DEFVAR_LISP ("x-max-tooltip-size", &Vx_max_tooltip_size,
doc: /* Maximum size for tooltips.
-Value is a pair (COLUMNS . ROWS). Text larger than this is clipped. */);
+Value is a pair (COLUMNS . ROWS). Text larger than this is clipped. */);
Vx_max_tooltip_size = Fcons (make_number (80), make_number (40));
DEFVAR_LISP ("x-no-window-manager", &Vx_no_window_manager,