aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2006-12-10 23:32:00 +0000
committerJuanma Barranquero2006-12-10 23:32:00 +0000
commit5820771bca3f16a5f5b4dad1cca57df03d309132 (patch)
tree355c4a21e61a88ba4596496c20031fc2f3754e2a /src
parentb9fed7290fe1bbfa83260132285084718c318957 (diff)
downloademacs-5820771bca3f16a5f5b4dad1cca57df03d309132.tar.gz
emacs-5820771bca3f16a5f5b4dad1cca57df03d309132.zip
(syms_of_xterm) <x-use-underline-position-properties,
x-underline-at-descent-line>: Doc fix.
Diffstat (limited to 'src')
-rw-r--r--src/xterm.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/xterm.c b/src/xterm.c
index d97c1aa7d29..0becc704a13 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -8309,15 +8309,15 @@ do_ewmh_fullscreen (f)
8309 Atom *atoms = XListProperties (FRAME_X_DISPLAY (f), 8309 Atom *atoms = XListProperties (FRAME_X_DISPLAY (f),
8310 FRAME_X_DISPLAY_INFO (f)->root_window, 8310 FRAME_X_DISPLAY_INFO (f)->root_window,
8311 &num); 8311 &num);
8312 if (atoms && num > 0) 8312 if (atoms && num > 0)
8313 { 8313 {
8314 char **names = (char **) xmalloc (num * sizeof(*names)); 8314 char **names = (char **) xmalloc (num * sizeof(*names));
8315 if (XGetAtomNames (FRAME_X_DISPLAY (f), atoms, num, names)) 8315 if (XGetAtomNames (FRAME_X_DISPLAY (f), atoms, num, names))
8316 { 8316 {
8317 int i; 8317 int i;
8318 for (i = 0; i < num; ++i) 8318 for (i = 0; i < num; ++i)
8319 { 8319 {
8320 if (!have_net_atom) 8320 if (!have_net_atom)
8321 have_net_atom = strncmp (names[i], "_NET_", 5) == 0; 8321 have_net_atom = strncmp (names[i], "_NET_", 5) == 0;
8322 XFree (names[i]); 8322 XFree (names[i]);
8323 } 8323 }
@@ -8330,7 +8330,7 @@ do_ewmh_fullscreen (f)
8330 FRAME_X_DISPLAY_INFO (f)->have_net_atoms = have_net_atom; 8330 FRAME_X_DISPLAY_INFO (f)->have_net_atoms = have_net_atom;
8331 } 8331 }
8332 8332
8333 if (have_net_atom) 8333 if (have_net_atom)
8334 { 8334 {
8335 Lisp_Object frame; 8335 Lisp_Object frame;
8336 const char *atom = "_NET_WM_STATE"; 8336 const char *atom = "_NET_WM_STATE";
@@ -8343,7 +8343,7 @@ do_ewmh_fullscreen (f)
8343 8343
8344 /* If there are _NET_ atoms we assume we have extended window manager 8344 /* If there are _NET_ atoms we assume we have extended window manager
8345 hints. */ 8345 hints. */
8346 switch (f->want_fullscreen) 8346 switch (f->want_fullscreen)
8347 { 8347 {
8348 case FULLSCREEN_BOTH: 8348 case FULLSCREEN_BOTH:
8349 what = fs; 8349 what = fs;
@@ -8399,7 +8399,7 @@ static void
8399XTfullscreen_hook (f) 8399XTfullscreen_hook (f)
8400 FRAME_PTR f; 8400 FRAME_PTR f;
8401{ 8401{
8402 if (f->async_visible) 8402 if (f->async_visible)
8403 { 8403 {
8404 BLOCK_INPUT; 8404 BLOCK_INPUT;
8405 do_ewmh_fullscreen (f); 8405 do_ewmh_fullscreen (f);
@@ -8419,7 +8419,7 @@ x_check_fullscreen (f)
8419 { 8419 {
8420 int width, height, ign; 8420 int width, height, ign;
8421 8421
8422 if (do_ewmh_fullscreen (f)) 8422 if (do_ewmh_fullscreen (f))
8423 return; 8423 return;
8424 8424
8425 x_real_positions (f, &f->left_pos, &f->top_pos); 8425 x_real_positions (f, &f->left_pos, &f->top_pos);
@@ -11146,7 +11146,7 @@ syms_of_xterm ()
11146 DEFVAR_BOOL ("x-use-underline-position-properties", 11146 DEFVAR_BOOL ("x-use-underline-position-properties",
11147 &x_use_underline_position_properties, 11147 &x_use_underline_position_properties,
11148 doc: /* *Non-nil means make use of UNDERLINE_POSITION font properties. 11148 doc: /* *Non-nil means make use of UNDERLINE_POSITION font properties.
11149nil means ignore them. If you encounter fonts with bogus 11149A value of nil means ignore them. If you encounter fonts with bogus
11150UNDERLINE_POSITION font properties, for example 7x13 on XFree prior 11150UNDERLINE_POSITION font properties, for example 7x13 on XFree prior
11151to 4.1, set this to nil. */); 11151to 4.1, set this to nil. */);
11152 x_use_underline_position_properties = 1; 11152 x_use_underline_position_properties = 1;
@@ -11154,9 +11154,9 @@ to 4.1, set this to nil. */);
11154 DEFVAR_BOOL ("x-underline-at-descent-line", 11154 DEFVAR_BOOL ("x-underline-at-descent-line",
11155 &x_underline_at_descent_line, 11155 &x_underline_at_descent_line,
11156 doc: /* *Non-nil means to draw the underline at the same place as the descent line. 11156 doc: /* *Non-nil means to draw the underline at the same place as the descent line.
11157nil means to draw the underline according to the value of the variable 11157A value of nil means to draw the underline according to the value of the
11158`x-use-underline-position-properties', which is usually at the baseline 11158variable `x-use-underline-position-properties', which is usually at the
11159level. The default value is nil. */); 11159baseline level. The default value is nil. */);
11160 x_underline_at_descent_line = 0; 11160 x_underline_at_descent_line = 0;
11161 11161
11162 DEFVAR_BOOL ("x-mouse-click-focus-ignore-position", 11162 DEFVAR_BOOL ("x-mouse-click-focus-ignore-position",