Mercurial > hg > xemacs-beta

comparison src/console-tty.c @ 4990:8f0cf4fd3d2c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automatic merge
author Ben Wing <ben@xemacs.org>
date Sat, 06 Feb 2010 04:01:46 -0600
parents 16112448d484
children b5df3737028a
comparison
equal deleted inserted replaced
4989:d2ec55325515 4990:8f0cf4fd3d2c
112 if (!temp_type) 112 if (!temp_type)
113 { 113 {
114 invalid_state ("Cannot determine terminal type", Qunbound); 114 invalid_state ("Cannot determine terminal type", Qunbound);
115 } 115 }
116 else 116 else
117 terminal_type = build_intstring (temp_type); 117 terminal_type = build_istring (temp_type);
118 } 118 }
119 119
120 /* Determine the controlling process */ 120 /* Determine the controlling process */
121 if (!NILP (controlling_process)) 121 if (!NILP (controlling_process))
122 CHECK_INT (controlling_process); 122 CHECK_INT (controlling_process);
214 struct tty_console *tty_con = CONSOLE_TTY_DATA (con); 214 struct tty_console *tty_con = CONSOLE_TTY_DATA (con);
215 if (tty_con) 215 if (tty_con)
216 { 216 {
217 if (tty_con->term_entry_buffer) /* allocated in term_init () */ 217 if (tty_con->term_entry_buffer) /* allocated in term_init () */
218 { 218 {
219 xfree (tty_con->term_entry_buffer, char *); 219 xfree (tty_con->term_entry_buffer);
220 tty_con->term_entry_buffer = NULL; 220 tty_con->term_entry_buffer = NULL;
221 } 221 }
222 #ifndef NEW_GC 222 #ifndef NEW_GC
223 xfree (tty_con, struct tty_console *); 223 xfree (tty_con);
224 #endif /* not NEW_GC */ 224 #endif /* not NEW_GC */
225 CONSOLE_TTY_DATA (con) = NULL; 225 CONSOLE_TTY_DATA (con) = NULL;
226 } 226 }
227 } 227 }
228 228