Mercurial > emacs
changeset 109701:2cf388f16cae
* w32fns.c (syms_of_w32fns) <x-max-tooltip-size>: Fix typo in docstring.
* xfns.c (syms_of_xfns) <x-max-tooltip-size>: Reflow docstring.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Sun, 01 Aug 2010 06:28:09 +0200 |
| parents | e100e3aa28fb |
| children | 0837e4551510 |
| files | src/ChangeLog src/w32fns.c src/xfns.c |
| diffstat | 3 files changed, 12 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Aug 01 06:00:59 2010 +0200 +++ b/src/ChangeLog Sun Aug 01 06:28:09 2010 +0200 @@ -1,3 +1,8 @@ +2010-08-01 Juanma Barranquero <lekktu@gmail.com> + + * w32fns.c (syms_of_w32fns) <x-max-tooltip-size>: Fix typo in docstring. + * xfns.c (syms_of_xfns) <x-max-tooltip-size>: Reflow docstring. + 2010-07-30 Juanma Barranquero <lekktu@gmail.com> * fns.c (Fsubstring_no_properties, Fnthcdr, Ffeaturep)
--- a/src/w32fns.c Sun Aug 01 06:00:59 2010 +0200 +++ b/src/w32fns.c Sun Aug 01 06:28:09 2010 +0200 @@ -7199,7 +7199,7 @@ 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,
--- a/src/xfns.c Sun Aug 01 06:00:59 2010 +0200 +++ b/src/xfns.c Sun Aug 01 06:28:09 2010 +0200 @@ -1025,7 +1025,7 @@ if (FRAME_X_DISPLAY_INFO (f)->invisible_cursor == 0) FRAME_X_DISPLAY_INFO (f)->invisible_cursor = make_invisible_cursor (f); - + if (cursor != x->text_cursor && x->text_cursor != 0) XFreeCursor (dpy, x->text_cursor); @@ -3072,7 +3072,7 @@ if (system_font) font_param = make_string (system_font, strlen (system_font)); } - + font = !NILP (font_param) ? font_param : x_get_arg (dpyinfo, parms, Qfont, "font", "Font", RES_TYPE_STRING); @@ -5646,7 +5646,7 @@ font_param = Ffont_get (font, intern (":name")); if (STRINGP (font_param)) default_name = xstrdup (SDATA (font_param)); - else + else { font_param = Fframe_parameter (frame, Qfont_param); if (STRINGP (font_param)) @@ -5657,7 +5657,7 @@ default_name = xstrdup (x_last_font_name); /* Convert fontconfig names to Gtk names, i.e. remove - before number */ - if (default_name) + if (default_name) { char *p = strrchr (default_name, '-'); if (p) @@ -5918,8 +5918,8 @@ Vx_cursor_fore_pixel = Qnil; 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. */); + doc: /* Maximum size for tooltips. +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,