Mercurial > emacs
comparison src/frame.c @ 83314:d07fdd5d7d4e
Merged from miles@gnu.org--gnu-2005 (patch 441-446)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-441
Update reference to renamed Buffer-menu-buffer face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-442
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-443
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-444
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-445
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-446
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-354
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Sat, 25 Jun 2005 15:00:08 +0000 |
parents | bdcbdec78dd3 e7e58f0947fe |
children | 61487e73bbc2 |
comparison
equal
deleted
inserted
replaced
83313:bdcbdec78dd3 | 83314:d07fdd5d7d4e |
---|---|
424 CHECK_LIVE_WINDOW (mini_window); | 424 CHECK_LIVE_WINDOW (mini_window); |
425 | 425 |
426 #ifdef MULTI_KBOARD | 426 #ifdef MULTI_KBOARD |
427 if (!NILP (mini_window) | 427 if (!NILP (mini_window) |
428 && XFRAME (XWINDOW (mini_window)->frame)->kboard != kb) | 428 && XFRAME (XWINDOW (mini_window)->frame)->kboard != kb) |
429 error ("frame and minibuffer must be on the same display"); | 429 error ("Frame and minibuffer must be on the same display"); |
430 #endif | 430 #endif |
431 | 431 |
432 /* Make a frame containing just a root window. */ | 432 /* Make a frame containing just a root window. */ |
433 f = make_frame (0); | 433 f = make_frame (0); |
434 | 434 |
3607 | 3607 |
3608 extern char *x_get_string_resource P_ ((XrmDatabase, char *, char *)); | 3608 extern char *x_get_string_resource P_ ((XrmDatabase, char *, char *)); |
3609 extern Display_Info *check_x_display_info P_ ((Lisp_Object)); | 3609 extern Display_Info *check_x_display_info P_ ((Lisp_Object)); |
3610 | 3610 |
3611 | 3611 |
3612 /* Get specified attribute from resource database RDB. | 3612 /* Get specified attribute from resource database RDB. |
3613 See Fx_get_resource below for other parameters. */ | 3613 See Fx_get_resource below for other parameters. */ |
3614 | 3614 |
3615 static Lisp_Object | 3615 static Lisp_Object |
3616 xrdb_get_resource (rdb, attribute, class, component, subclass) | 3616 xrdb_get_resource (rdb, attribute, class, component, subclass) |
3617 XrmDatabase rdb; | 3617 XrmDatabase rdb; |
3744 x_get_arg, make sure you deal with Qunbound in a reasonable way, | 3744 x_get_arg, make sure you deal with Qunbound in a reasonable way, |
3745 and don't let it get stored in any Lisp-visible variables! */ | 3745 and don't let it get stored in any Lisp-visible variables! */ |
3746 | 3746 |
3747 Lisp_Object | 3747 Lisp_Object |
3748 x_get_arg (dpyinfo, alist, param, attribute, class, type) | 3748 x_get_arg (dpyinfo, alist, param, attribute, class, type) |
3749 Display_Info *dpyinfo; | 3749 Display_Info *dpyinfo; |
3750 Lisp_Object alist, param; | 3750 Lisp_Object alist, param; |
3751 char *attribute; | 3751 char *attribute; |
3752 char *class; | 3752 char *class; |
3753 enum resource_types type; | 3753 enum resource_types type; |
3754 { | 3754 { |