procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(Fserial_process_configure, Fprocess_send_eof):

Browse source 
Use EQ to compare Lisp_Objects.
This commit is contained in:
Stefan Monnier 2008-06-13 16:35:17 +00:00
parent ec4e0abcd2
commit a879ee6f98
2 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/ChangeLog
View file

@ -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.
* 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.
* 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.c (font_style_symbolic_from_value): New function.
(font_style_symbolic): Use it.
* font.h (font_style_symbolic_from_value): Declare new function.
* 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.

6
src/process.c
View file

@ -2794,7 +2794,7 @@ usage: (serial-process-configure &rest ARGS) */)
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 @@ process has been transmitted to the serial port. */)
#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 @@ process has been transmitted to the serial port. */)
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. */