* w32fns.c (syms_of_w32fns) <x-max-tooltip-size>: Fix typo in docstring.

* xfns.c (syms_of_xfns) <x-max-tooltip-size>: Reflow docstring.

diff --git a/src/ChangeLog b/src/ChangeLog
index 9dd44716c74581c148a93f4b4a5ba1a7ae4c8514..2b413a7958ce882c224aa5c9b17453630d7ffb33 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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)

diff --git a/src/w32fns.c b/src/w32fns.c
index 9df243ede7fddc28b5812551fc2a6b0270366988..e27e7fecdc618e17cc518b56d3a4d58a9af05121 100644 (file)
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -7199,7 +7199,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,

diff --git a/src/xfns.c b/src/xfns.c
index 458904b326af0b8e65779b0e2504b92b9d751ff8..1d7d3d0358029cafae00f79259c3be1198a6c5b3 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1025,7 +1025,7 @@ x_set_mouse_color (f, arg, oldval)
 
   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 @@ x_default_font_parameter (f, parms)
       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 @@ If FRAME is omitted or nil, it defaults to the selected frame. */)
   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 @@ If FRAME is omitted or nil, it defaults to the selected frame. */)
     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 @@ or when you set the mouse color.  */);
   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,