diff options
| author | Jason Rumney | 2007-09-13 22:24:42 +0000 |
|---|---|---|
| committer | Jason Rumney | 2007-09-13 22:24:42 +0000 |
| commit | 9c7c716d87ef787bd192c71879109678c9bb9946 (patch) | |
| tree | 2c5a6230509649c3e43ea23a7cd757e10c425b2d | |
| parent | 91f4aeef89425b6b4d59e2a3d29d4201852eaff2 (diff) | |
| download | emacs-9c7c716d87ef787bd192c71879109678c9bb9946.tar.gz emacs-9c7c716d87ef787bd192c71879109678c9bb9946.zip | |
(mac_initialize): Don't call mac_init_fringe here.
(mac_term_init): Call here instead, passing rif.
| -rw-r--r-- | src/macterm.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/macterm.c b/src/macterm.c index 8b3cee42f5c..f14193a2d56 100644 --- a/src/macterm.c +++ b/src/macterm.c | |||
| @@ -12590,6 +12590,10 @@ mac_term_init (display_name, xrm_option, resource_name) | |||
| 12590 | x_display_name_list); | 12590 | x_display_name_list); |
| 12591 | dpyinfo->name_list_element = XCAR (x_display_name_list); | 12591 | dpyinfo->name_list_element = XCAR (x_display_name_list); |
| 12592 | 12592 | ||
| 12593 | #if USE_CG_DRAWING | ||
| 12594 | mac_init_fringe (terminal->rif); | ||
| 12595 | #endif | ||
| 12596 | |||
| 12593 | UNBLOCK_INPUT; | 12597 | UNBLOCK_INPUT; |
| 12594 | 12598 | ||
| 12595 | return dpyinfo; | 12599 | return dpyinfo; |
| @@ -12801,6 +12805,7 @@ mac_create_terminal (struct mac_display_info *dpyinfo) | |||
| 12801 | off the bottom. */ | 12805 | off the bottom. */ |
| 12802 | 12806 | ||
| 12803 | #endif | 12807 | #endif |
| 12808 | |||
| 12804 | return terminal; | 12809 | return terminal; |
| 12805 | } | 12810 | } |
| 12806 | 12811 | ||
| @@ -12846,8 +12851,6 @@ mac_initialize () | |||
| 12846 | 12851 | ||
| 12847 | #if USE_CG_DRAWING | 12852 | #if USE_CG_DRAWING |
| 12848 | init_cg_color (); | 12853 | init_cg_color (); |
| 12849 | |||
| 12850 | mac_init_fringe (); | ||
| 12851 | #endif | 12854 | #endif |
| 12852 | 12855 | ||
| 12853 | UNBLOCK_INPUT; | 12856 | UNBLOCK_INPUT; |