diff options
| author | Jason Rumney | 2007-10-10 21:52:29 +0000 |
|---|---|---|
| committer | Jason Rumney | 2007-10-10 21:52:29 +0000 |
| commit | 04710ebdcc8183e1373b7edf3c803eeebf56aa7e (patch) | |
| tree | f708124f8beeb96f9b937b64087d8e83774af6f7 /src | |
| parent | 9e48337731ca5bb809ceb5f998cd44b342f1ff50 (diff) | |
| download | emacs-04710ebdcc8183e1373b7edf3c803eeebf56aa7e.tar.gz emacs-04710ebdcc8183e1373b7edf3c803eeebf56aa7e.zip | |
(x_create_tip_frame): Set terminal for frame.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/macfns.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index e35d7383658..0976f20247b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2007-10-10 Jason Rumney <jasonr@gnu.org> | ||
| 2 | |||
| 3 | * macfns.c (x_create_tip_frame): Set terminal for frame. | ||
| 4 | |||
| 1 | 2007-10-10 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2007-10-10 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * frame.c (Qenvironment): Remove. | 7 | * frame.c (Qenvironment): Remove. |
diff --git a/src/macfns.c b/src/macfns.c index d447ee90a4f..fdc5c7e5920 100644 --- a/src/macfns.c +++ b/src/macfns.c | |||
| @@ -3855,6 +3855,8 @@ x_create_tip_frame (dpyinfo, parms, text) | |||
| 3855 | the frame is live, as per FRAME_LIVE_P. If we get a signal | 3855 | the frame is live, as per FRAME_LIVE_P. If we get a signal |
| 3856 | from this point on, x_destroy_window might screw up reference | 3856 | from this point on, x_destroy_window might screw up reference |
| 3857 | counts etc. */ | 3857 | counts etc. */ |
| 3858 | f->terminal = dpyinfo->terminal; | ||
| 3859 | f->terminal->reference_count++; | ||
| 3858 | f->output_method = output_mac; | 3860 | f->output_method = output_mac; |
| 3859 | f->output_data.mac = | 3861 | f->output_data.mac = |
| 3860 | (struct mac_output *) xmalloc (sizeof (struct mac_output)); | 3862 | (struct mac_output *) xmalloc (sizeof (struct mac_output)); |