diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-08-08 17:15:44 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-08-08 17:15:44 -0400 |
| commit | cc36ae609d01e7922c662c78866300d57b34b07e (patch) | |
| tree | 2fc2af92520d09b2fb9cf4014187496cf35793df /src/xfns.c | |
| parent | 675e2c697bc8a0ff827fcb33297f63f4cc7ecad3 (diff) | |
| parent | 7815fe1985833c57457882b415a29358991dabdc (diff) | |
| download | emacs-cc36ae609d01e7922c662c78866300d57b34b07e.tar.gz | |
Merge changes from emacs-23 branch.
Diffstat (limited to 'src/xfns.c')
| -rw-r--r-- | src/xfns.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/xfns.c b/src/xfns.c index 249aa6998c3..bc28ccd3a63 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -1003,7 +1003,7 @@ x_set_mouse_color (struct frame *f, Lisp_Object arg, Lisp_Object 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); @@ -5598,7 +5598,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)) @@ -5609,7 +5609,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) @@ -5870,8 +5870,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, |