Mercurial > emacs
changeset 95900:99342636fa96
(Fserial_process_configure, Fprocess_send_eof):
Use EQ to compare Lisp_Objects.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 13 Jun 2008 16:35:17 +0000 |
| parents | d5d7186027e2 |
| children | b4bd9957663d |
| files | src/ChangeLog src/process.c |
| diffstat | 2 files changed, 21 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Jun 13 16:22:16 2008 +0000 +++ b/src/ChangeLog Fri Jun 13 16:35:17 2008 +0000 @@ -1,15 +1,20 @@ +2008-06-13 Stefan Monnier <monnier@iro.umontreal.ca> + + * process.c (Fserial_process_configure, Fprocess_send_eof): + Use EQ to compare Lisp_Objects. + 2008-06-13 Jason Rumney <jasonr@gnu.org> - * w32fns.c (Fw32_select_font): Removed old font API function. - - * w32font.c (logfont_to_fcname): New function. - (Fx_select_font): New font dialog function compatible with - GTK/fontconfig version. - - * font.c (font_style_symbolic_from_value): New function. - (font_style_symbolic): Use it. - - * font.h (font_style_symbolic_from_value): Declare new function. + * w32fns.c (Fw32_select_font): Remove old font API function. + + * w32font.c (logfont_to_fcname): New function. + (Fx_select_font): New font dialog function compatible with + GTK/fontconfig version. + + * font.c (font_style_symbolic_from_value): New function. + (font_style_symbolic): Use it. + + * font.h (font_style_symbolic_from_value): Declare new function. 2008-06-13 Juanma Barranquero <lekktu@gmail.com> @@ -52,7 +57,7 @@ (font_update_lface): Don't parse "foundry-family" form here. Handle FONT_FOUNDRY_INDEX. (font_find_for_lface): Likewise. Handle alternate families here. - If registry is nil, try iso8859-1 and ascii-0. + If registry is nil, try iso8859-1 and ascii-0. (font_open_for_lface): Pay attention to size in ENTITY. (font_open_by_name): Simplify by calling font_load_for_lface. (free_font_driver_list): Delete it. @@ -1058,15 +1063,13 @@ calculate underline position and thickness. Use xlfd name as name property. Don't set codepage. (w32font_open): Pass font_object to w32font_open_internal. Don't - update dpyinfo->smallest_font_height and - dpyinfo->smallest_char_width. + update dpyinfo->smallest_font_height and dpyinfo->smallest_char_width. (w32font_draw): Use s->font. (clear_cached_metrics): Don't clear non-existent blocks. * w32term.c (w32_compute_glyph_string_overhangs): Don't compute if font was not found. - (x_draw_glyph_string): Use underline position and thickness from - font. + (x_draw_glyph_string): Use underline position and thickness from font. * w32uniscribe.c (uniscribe_open): Pass font_object to w32font_open_internal.
--- a/src/process.c Fri Jun 13 16:22:16 2008 +0000 +++ b/src/process.c Fri Jun 13 16:35:17 2008 +0000 @@ -2794,7 +2794,7 @@ proc = Fplist_get (contact, QCport); proc = get_process (proc); p = XPROCESS (proc); - if (p->type != Qserial) + if (!EQ (p->type, Qserial)) error ("Not a serial process"); if (NILP (Fplist_get (p->childp, QCspeed))) @@ -6678,7 +6678,7 @@ #else if (XPROCESS (proc)->pty_flag) send_process (proc, "\004", 1, Qnil); - else if (XPROCESS (proc)->type == Qserial) + else if (EQ (XPROCESS (proc)->type, Qserial)) { #ifdef HAVE_TERMIOS if (tcdrain (XPROCESS (proc)->outfd) != 0) @@ -6695,7 +6695,7 @@ for communication with the subprocess, call shutdown to cause EOF. (In some old system, shutdown to socketpair doesn't work. Then we just can't win.) */ - if (XPROCESS (proc)->type == Qnetwork + if (EQ (XPROCESS (proc)->type, Qnetwork) || XPROCESS (proc)->outfd == XPROCESS (proc)->infd) shutdown (XPROCESS (proc)->outfd, 1); /* In case of socketpair, outfd == infd, so don't close it. */