Mercurial > emacs
comparison src/frame.c @ 89956:b9eee0a7bef5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-25
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-459
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-463
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-464
Update from CVS: lisp/progmodes/make-mode.el: Fix comments.
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-465
Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 23 Jul 2004 04:30:44 +0000 |
parents | 68c22ea6027c b8b142a8e2c6 |
children | c08afac24467 |
comparison
equal
deleted
inserted
replaced
89955:7f8b53f94713 | 89956:b9eee0a7bef5 |
---|---|
1324 last_nonminibuf_frame = f; | 1324 last_nonminibuf_frame = f; |
1325 break; | 1325 break; |
1326 } | 1326 } |
1327 } | 1327 } |
1328 } | 1328 } |
1329 | |
1330 /* If there's no other frame on the same kboard, get out of | |
1331 single-kboard state if we're in it for this kboard. */ | |
1332 { | |
1333 Lisp_Object frames; | |
1334 /* Some frame we found on the same kboard, or nil if there are none. */ | |
1335 Lisp_Object frame_on_same_kboard; | |
1336 | |
1337 frame_on_same_kboard = Qnil; | |
1338 | |
1339 for (frames = Vframe_list; | |
1340 CONSP (frames); | |
1341 frames = XCDR (frames)) | |
1342 { | |
1343 Lisp_Object this; | |
1344 struct frame *f1; | |
1345 | |
1346 this = XCAR (frames); | |
1347 if (!FRAMEP (this)) | |
1348 abort (); | |
1349 f1 = XFRAME (this); | |
1350 | |
1351 if (FRAME_KBOARD (f) == FRAME_KBOARD (f1)) | |
1352 frame_on_same_kboard = this; | |
1353 } | |
1354 | |
1355 if (NILP (frame_on_same_kboard)) | |
1356 not_single_kboard_state (FRAME_KBOARD (f)); | |
1357 } | |
1358 | |
1329 | 1359 |
1330 /* If we've deleted this keyboard's default_minibuffer_frame, try to | 1360 /* If we've deleted this keyboard's default_minibuffer_frame, try to |
1331 find another one. Prefer minibuffer-only frames, but also notice | 1361 find another one. Prefer minibuffer-only frames, but also notice |
1332 frames with other windows. */ | 1362 frames with other windows. */ |
1333 if (EQ (frame, FRAME_KBOARD (f)->Vdefault_minibuffer_frame)) | 1363 if (EQ (frame, FRAME_KBOARD (f)->Vdefault_minibuffer_frame)) |