aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Monnier2008-06-13 16:35:17 +0000
committerStefan Monnier2008-06-13 16:35:17 +0000
commita879ee6f98dfc8572450ff2f5a7c242e9467050d (patch)
tree2c730bb0ec53ed60890119e3d19fb3c0ad405ffa /src
parentec4e0abcd2ec5e1523fca615487878e89a9e366e (diff)
downloademacs-a879ee6f98dfc8572450ff2f5a7c242e9467050d.tar.gz
emacs-a879ee6f98dfc8572450ff2f5a7c242e9467050d.zip
(Fserial_process_configure, Fprocess_send_eof):
Use EQ to compare Lisp_Objects.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog27
-rw-r--r--src/process.c6
2 files changed, 18 insertions, 15 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 30aa9fff7af..bd8dd3059ec 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,15 +1,20 @@
12008-06-13 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * process.c (Fserial_process_configure, Fprocess_send_eof):
4 Use EQ to compare Lisp_Objects.
5
12008-06-13 Jason Rumney <jasonr@gnu.org> 62008-06-13 Jason Rumney <jasonr@gnu.org>
2 7
3 * w32fns.c (Fw32_select_font): Removed old font API function. 8 * w32fns.c (Fw32_select_font): Remove old font API function.
4 9
5 * w32font.c (logfont_to_fcname): New function. 10 * w32font.c (logfont_to_fcname): New function.
6 (Fx_select_font): New font dialog function compatible with 11 (Fx_select_font): New font dialog function compatible with
7 GTK/fontconfig version. 12 GTK/fontconfig version.
8 13
9 * font.c (font_style_symbolic_from_value): New function. 14 * font.c (font_style_symbolic_from_value): New function.
10 (font_style_symbolic): Use it. 15 (font_style_symbolic): Use it.
11 16
12 * font.h (font_style_symbolic_from_value): Declare new function. 17 * font.h (font_style_symbolic_from_value): Declare new function.
13 18
142008-06-13 Juanma Barranquero <lekktu@gmail.com> 192008-06-13 Juanma Barranquero <lekktu@gmail.com>
15 20
@@ -52,7 +57,7 @@
52 (font_update_lface): Don't parse "foundry-family" form here. 57 (font_update_lface): Don't parse "foundry-family" form here.
53 Handle FONT_FOUNDRY_INDEX. 58 Handle FONT_FOUNDRY_INDEX.
54 (font_find_for_lface): Likewise. Handle alternate families here. 59 (font_find_for_lface): Likewise. Handle alternate families here.
55 If registry is nil, try iso8859-1 and ascii-0. 60 If registry is nil, try iso8859-1 and ascii-0.
56 (font_open_for_lface): Pay attention to size in ENTITY. 61 (font_open_for_lface): Pay attention to size in ENTITY.
57 (font_open_by_name): Simplify by calling font_load_for_lface. 62 (font_open_by_name): Simplify by calling font_load_for_lface.
58 (free_font_driver_list): Delete it. 63 (free_font_driver_list): Delete it.
@@ -1058,15 +1063,13 @@
1058 calculate underline position and thickness. Use xlfd name as name 1063 calculate underline position and thickness. Use xlfd name as name
1059 property. Don't set codepage. 1064 property. Don't set codepage.
1060 (w32font_open): Pass font_object to w32font_open_internal. Don't 1065 (w32font_open): Pass font_object to w32font_open_internal. Don't
1061 update dpyinfo->smallest_font_height and 1066 update dpyinfo->smallest_font_height and dpyinfo->smallest_char_width.
1062 dpyinfo->smallest_char_width.
1063 (w32font_draw): Use s->font. 1067 (w32font_draw): Use s->font.
1064 (clear_cached_metrics): Don't clear non-existent blocks. 1068 (clear_cached_metrics): Don't clear non-existent blocks.
1065 1069
1066 * w32term.c (w32_compute_glyph_string_overhangs): Don't compute if 1070 * w32term.c (w32_compute_glyph_string_overhangs): Don't compute if
1067 font was not found. 1071 font was not found.
1068 (x_draw_glyph_string): Use underline position and thickness from 1072 (x_draw_glyph_string): Use underline position and thickness from font.
1069 font.
1070 1073
1071 * w32uniscribe.c (uniscribe_open): Pass font_object to 1074 * w32uniscribe.c (uniscribe_open): Pass font_object to
1072 w32font_open_internal. 1075 w32font_open_internal.
diff --git a/src/process.c b/src/process.c
index 1d49f8fc2b4..fdeb0aa9e91 100644
--- a/src/process.c
+++ b/src/process.c
@@ -2794,7 +2794,7 @@ usage: (serial-process-configure &rest ARGS) */)
2794 proc = Fplist_get (contact, QCport); 2794 proc = Fplist_get (contact, QCport);
2795 proc = get_process (proc); 2795 proc = get_process (proc);
2796 p = XPROCESS (proc); 2796 p = XPROCESS (proc);
2797 if (p->type != Qserial) 2797 if (!EQ (p->type, Qserial))
2798 error ("Not a serial process"); 2798 error ("Not a serial process");
2799 2799
2800 if (NILP (Fplist_get (p->childp, QCspeed))) 2800 if (NILP (Fplist_get (p->childp, QCspeed)))
@@ -6678,7 +6678,7 @@ process has been transmitted to the serial port. */)
6678#else 6678#else
6679 if (XPROCESS (proc)->pty_flag) 6679 if (XPROCESS (proc)->pty_flag)
6680 send_process (proc, "\004", 1, Qnil); 6680 send_process (proc, "\004", 1, Qnil);
6681 else if (XPROCESS (proc)->type == Qserial) 6681 else if (EQ (XPROCESS (proc)->type, Qserial))
6682 { 6682 {
6683#ifdef HAVE_TERMIOS 6683#ifdef HAVE_TERMIOS
6684 if (tcdrain (XPROCESS (proc)->outfd) != 0) 6684 if (tcdrain (XPROCESS (proc)->outfd) != 0)
@@ -6695,7 +6695,7 @@ process has been transmitted to the serial port. */)
6695 for communication with the subprocess, call shutdown to cause EOF. 6695 for communication with the subprocess, call shutdown to cause EOF.
6696 (In some old system, shutdown to socketpair doesn't work. 6696 (In some old system, shutdown to socketpair doesn't work.
6697 Then we just can't win.) */ 6697 Then we just can't win.) */
6698 if (XPROCESS (proc)->type == Qnetwork 6698 if (EQ (XPROCESS (proc)->type, Qnetwork)
6699 || XPROCESS (proc)->outfd == XPROCESS (proc)->infd) 6699 || XPROCESS (proc)->outfd == XPROCESS (proc)->infd)
6700 shutdown (XPROCESS (proc)->outfd, 1); 6700 shutdown (XPROCESS (proc)->outfd, 1);
6701 /* In case of socketpair, outfd == infd, so don't close it. */ 6701 /* In case of socketpair, outfd == infd, so don't close it. */