diff options
| author | Karoly Lorentey <[email protected]> | 2005-06-25 15:00:08 +0000 |
|---|---|---|
| committer | Karoly Lorentey <[email protected]> | 2005-06-25 15:00:08 +0000 |
| commit | 0d0358be7e741898e363d02dbff01b35c662413c (patch) | |
| tree | e6bdb6ae792a8be712780a5cfad4eeddb09c4f43 /src/frame.c | |
| parent | f4d9bf3a9be50a17c2e2f7569b88f3606ab273d9 (diff) | |
| parent | b93e3c3ba1644f5e746c7486bd609ba9fc7ec583 (diff) | |
Merged from [email protected] (patch 441-446)
Patches applied:
* [email protected]/emacs--cvs-trunk--0--patch-441
Update reference to renamed Buffer-menu-buffer face
* [email protected]/emacs--cvs-trunk--0--patch-442
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-443
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-444
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-445
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-446
Update from CVS
git-archimport-id: [email protected]/emacs--multi-tty--0--patch-354
Diffstat (limited to 'src/frame.c')
| -rw-r--r-- | src/frame.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/frame.c b/src/frame.c index 62dba4d4d1..6a54e26121 100644 --- a/src/frame.c +++ b/src/frame.c @@ -426,7 +426,7 @@ make_frame_without_minibuffer (mini_window, kb, display) #ifdef MULTI_KBOARD if (!NILP (mini_window) && XFRAME (XWINDOW (mini_window)->frame)->kboard != kb) - error ("frame and minibuffer must be on the same display"); + error ("Frame and minibuffer must be on the same display"); #endif /* Make a frame containing just a root window. */ @@ -3609,7 +3609,7 @@ extern char *x_get_string_resource P_ ((XrmDatabase, char *, char *)); extern Display_Info *check_x_display_info P_ ((Lisp_Object)); -/* Get specified attribute from resource database RDB. +/* Get specified attribute from resource database RDB. See Fx_get_resource below for other parameters. */ static Lisp_Object @@ -3746,7 +3746,7 @@ x_get_resource_string (attribute, class) Lisp_Object x_get_arg (dpyinfo, alist, param, attribute, class, type) - Display_Info *dpyinfo; + Display_Info *dpyinfo; Lisp_Object alist, param; char *attribute; char *class; |