Mercurial > emacs
comparison src/frame.c @ 83486:fc6efa09ea7a
Fix segfault by `C-x 5 2' on the controlling tty. (Reported by Suresh Madhu.)
* src/frame.c (Fmake_terminal_frame): Handle NULL tty names correctly.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-526
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Wed, 08 Mar 2006 16:47:48 +0000 |
| parents | 6319046b5d4c |
| children | f271076dab2d |
comparison
equal
deleted
inserted
replaced
| 83485:f4e40bc8606b | 83486:fc6efa09ea7a |
|---|---|
| 764 Fmodify_frame_parameters (frame, parms); | 764 Fmodify_frame_parameters (frame, parms); |
| 765 Fmodify_frame_parameters (frame, Fcons (Fcons (Qwindow_system, Qnil), Qnil)); | 765 Fmodify_frame_parameters (frame, Fcons (Fcons (Qwindow_system, Qnil), Qnil)); |
| 766 Fmodify_frame_parameters (frame, Fcons (Fcons (Qtty_type, | 766 Fmodify_frame_parameters (frame, Fcons (Fcons (Qtty_type, |
| 767 build_string (t->display_info.tty->type)), | 767 build_string (t->display_info.tty->type)), |
| 768 Qnil)); | 768 Qnil)); |
| 769 Fmodify_frame_parameters (frame, Fcons (Fcons (Qtty, | 769 if (t->display_info.tty->name != NULL) |
| 770 build_string (t->display_info.tty->name)), | 770 Fmodify_frame_parameters (frame, Fcons (Fcons (Qtty, |
| 771 Qnil)); | 771 build_string (t->display_info.tty->name)), |
| 772 Qnil)); | |
| 773 else | |
| 774 Fmodify_frame_parameters (frame, Fcons (Fcons (Qtty, Qnil), Qnil)); | |
| 772 | 775 |
| 773 /* Make the frame face alist be frame-specific, so that each | 776 /* Make the frame face alist be frame-specific, so that each |
| 774 frame could change its face definitions independently. */ | 777 frame could change its face definitions independently. */ |
| 775 f->face_alist = Fcopy_alist (sf->face_alist); | 778 f->face_alist = Fcopy_alist (sf->face_alist); |
| 776 /* Simple Fcopy_alist isn't enough, because we need the contents of | 779 /* Simple Fcopy_alist isn't enough, because we need the contents of |