diff options
| author | Richard M. Stallman | 2005-12-08 15:49:11 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2005-12-08 15:49:11 +0000 |
| commit | 2fda697741c0221061caab9680773922d9bb56e9 (patch) | |
| tree | 8fa194212d3095379e02e223808ec88521897252 | |
| parent | 186bccc366fb587be86437cf8f60c347b9f28241 (diff) | |
| download | emacs-2fda697741c0221061caab9680773922d9bb56e9.tar.gz emacs-2fda697741c0221061caab9680773922d9bb56e9.zip | |
(Fx_create_frame): Comment out previous change.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xfns.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 4fa4093631f..7830a382731 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2005-12-08 Richard M. Stallman <rms@gnu.org> | ||
| 2 | |||
| 3 | * xfns.c (Fx_create_frame): Comment out previous change. | ||
| 4 | |||
| 1 | 2005-12-07 L$,1 q(Brentey K,Aa(Broly <lorentey@elte.hu> | 5 | 2005-12-07 L$,1 q(Brentey K,Aa(Broly <lorentey@elte.hu> |
| 2 | 6 | ||
| 3 | * xfns.c (Fx_create_frame): Initialize Vdefault_minibuffer_frame, | 7 | * xfns.c (Fx_create_frame): Initialize Vdefault_minibuffer_frame, |
diff --git a/src/xfns.c b/src/xfns.c index ee4a7bf3b00..06779ca3b07 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -3373,12 +3373,16 @@ This function is an internal primitive--use `make-frame' instead. */) | |||
| 3373 | UNBLOCK_INPUT; | 3373 | UNBLOCK_INPUT; |
| 3374 | } | 3374 | } |
| 3375 | 3375 | ||
| 3376 | #if 0 /* This is incorrect because `default-minibuffer-frame' | ||
| 3377 | should only be set automatically to a minibuffer-only frame. */ | ||
| 3378 | |||
| 3376 | /* Initialize `default-minibuffer-frame' in case this is the first | 3379 | /* Initialize `default-minibuffer-frame' in case this is the first |
| 3377 | frame on this display device. */ | 3380 | frame on this display device. */ |
| 3378 | if (FRAME_HAS_MINIBUF_P (f) | 3381 | if (FRAME_HAS_MINIBUF_P (f) |
| 3379 | && (!FRAMEP (kb->Vdefault_minibuffer_frame) | 3382 | && (!FRAMEP (kb->Vdefault_minibuffer_frame) |
| 3380 | || !FRAME_LIVE_P (XFRAME (kb->Vdefault_minibuffer_frame)))) | 3383 | || !FRAME_LIVE_P (XFRAME (kb->Vdefault_minibuffer_frame)))) |
| 3381 | kb->Vdefault_minibuffer_frame = frame; | 3384 | kb->Vdefault_minibuffer_frame = frame; |
| 3385 | #endif | ||
| 3382 | 3386 | ||
| 3383 | UNGCPRO; | 3387 | UNGCPRO; |
| 3384 | 3388 | ||