diff options
| author | Dan Nicolaescu | 2008-05-07 06:01:08 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2008-05-07 06:01:08 +0000 |
| commit | 1a1113949ef61a8e9502f751d355a098920419ac (patch) | |
| tree | 7855d8bd18f246e98cbe44085c644336f4612101 /src | |
| parent | 23532cb11b584d4229a29f810d690de008399dd8 (diff) | |
| download | emacs-1a1113949ef61a8e9502f751d355a098920419ac.tar.gz emacs-1a1113949ef61a8e9502f751d355a098920419ac.zip | |
(Fx_create_frame): Make a copy of frame parameters
because the original parameters are in pure storage now.
(mac_window): Remove unused params. Update callers.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/macfns.c | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 3be7a188bd7..e29fe0e6650 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2008-05-07 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | * macfns.c (Fx_create_frame): Make a copy of frame parameters | ||
| 4 | because the original parameters are in pure storage now. | ||
| 5 | (mac_window): Remove unused params. Update callers. | ||
| 6 | |||
| 1 | 2008-05-06 Stefan Monnier <monnier@iro.umontreal.ca> | 7 | 2008-05-06 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 8 | ||
| 3 | * lread.c (substitute_object_recurse): Use lower-level primitives. | 9 | * lread.c (substitute_object_recurse): Use lower-level primitives. |
diff --git a/src/macfns.c b/src/macfns.c index 21866876155..f51335cfa1a 100644 --- a/src/macfns.c +++ b/src/macfns.c | |||
| @@ -2153,10 +2153,8 @@ XParseGeometry (string, x, y, width, height) | |||
| 2153 | /* Create and set up the Mac window for frame F. */ | 2153 | /* Create and set up the Mac window for frame F. */ |
| 2154 | 2154 | ||
| 2155 | static void | 2155 | static void |
| 2156 | mac_window (f, window_prompting, minibuffer_only) | 2156 | mac_window (f) |
| 2157 | struct frame *f; | 2157 | struct frame *f; |
| 2158 | long window_prompting; | ||
| 2159 | int minibuffer_only; | ||
| 2160 | { | 2158 | { |
| 2161 | BLOCK_INPUT; | 2159 | BLOCK_INPUT; |
| 2162 | 2160 | ||
| @@ -2410,6 +2408,8 @@ This function is an internal primitive--use `make-frame' instead. */) | |||
| 2410 | 2408 | ||
| 2411 | check_mac (); | 2409 | check_mac (); |
| 2412 | 2410 | ||
| 2411 | parms = Fcopy_alist (parms); | ||
| 2412 | |||
| 2413 | /* Use this general default value to start with | 2413 | /* Use this general default value to start with |
| 2414 | until we know if this frame has a specified name. */ | 2414 | until we know if this frame has a specified name. */ |
| 2415 | Vx_resource_name = Vinvocation_name; | 2415 | Vx_resource_name = Vinvocation_name; |
| @@ -2622,7 +2622,7 @@ This function is an internal primitive--use `make-frame' instead. */) | |||
| 2622 | tem = mac_get_arg (parameters, Qunsplittable, 0, 0, RES_TYPE_BOOLEAN); | 2622 | tem = mac_get_arg (parameters, Qunsplittable, 0, 0, RES_TYPE_BOOLEAN); |
| 2623 | f->no_split = minibuffer_only || EQ (tem, Qt); | 2623 | f->no_split = minibuffer_only || EQ (tem, Qt); |
| 2624 | 2624 | ||
| 2625 | mac_window (f, window_prompting, minibuffer_only); | 2625 | mac_window (f); |
| 2626 | x_icon (f, parameters); | 2626 | x_icon (f, parameters); |
| 2627 | 2627 | ||
| 2628 | x_make_gc (f); | 2628 | x_make_gc (f); |