Mercurial > hg > xemacs-beta
comparison src/console-tty.c @ 5125:b5df3737028a ben-lisp-object
merge
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Wed, 24 Feb 2010 01:58:04 -0600 |
parents | d1247f3cc363 16112448d484 |
children | a9c41067dd88 |
comparison
equal
deleted
inserted
replaced
5124:623d57b7fbe8 | 5125:b5df3737028a |
---|---|
109 if (!temp_type) | 109 if (!temp_type) |
110 { | 110 { |
111 invalid_state ("Cannot determine terminal type", Qunbound); | 111 invalid_state ("Cannot determine terminal type", Qunbound); |
112 } | 112 } |
113 else | 113 else |
114 terminal_type = build_intstring (temp_type); | 114 terminal_type = build_istring (temp_type); |
115 } | 115 } |
116 | 116 |
117 /* Determine the controlling process */ | 117 /* Determine the controlling process */ |
118 if (!NILP (controlling_process)) | 118 if (!NILP (controlling_process)) |
119 CHECK_INT (controlling_process); | 119 CHECK_INT (controlling_process); |
211 struct tty_console *tty_con = CONSOLE_TTY_DATA (con); | 211 struct tty_console *tty_con = CONSOLE_TTY_DATA (con); |
212 if (tty_con) | 212 if (tty_con) |
213 { | 213 { |
214 if (tty_con->term_entry_buffer) /* allocated in term_init () */ | 214 if (tty_con->term_entry_buffer) /* allocated in term_init () */ |
215 { | 215 { |
216 xfree (tty_con->term_entry_buffer, char *); | 216 xfree (tty_con->term_entry_buffer); |
217 tty_con->term_entry_buffer = NULL; | 217 tty_con->term_entry_buffer = NULL; |
218 } | 218 } |
219 #ifndef NEW_GC | 219 #ifndef NEW_GC |
220 xfree (tty_con, struct tty_console *); | 220 xfree (tty_con); |
221 #endif /* not NEW_GC */ | 221 #endif /* not NEW_GC */ |
222 CONSOLE_TTY_DATA (con) = NULL; | 222 CONSOLE_TTY_DATA (con) = NULL; |
223 } | 223 } |
224 } | 224 } |
225 | 225 |