diff options
Diffstat (limited to 'src')
| -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 cfa4851d027..87fab89eb05 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -399,7 +399,7 @@ make_frame_without_minibuffer (mini_window, kb, display) | |||
| 399 | #ifdef MULTI_KBOARD | 399 | #ifdef MULTI_KBOARD |
| 400 | if (!NILP (mini_window) | 400 | if (!NILP (mini_window) |
| 401 | && XFRAME (XWINDOW (mini_window)->frame)->kboard != kb) | 401 | && XFRAME (XWINDOW (mini_window)->frame)->kboard != kb) |
| 402 | error ("frame and minibuffer must be on the same display"); | 402 | error ("Frame and minibuffer must be on the same display"); |
| 403 | #endif | 403 | #endif |
| 404 | 404 | ||
| 405 | /* Make a frame containing just a root window. */ | 405 | /* Make a frame containing just a root window. */ |
| @@ -3374,7 +3374,7 @@ extern char *x_get_string_resource P_ ((XrmDatabase, char *, char *)); | |||
| 3374 | extern Display_Info *check_x_display_info P_ ((Lisp_Object)); | 3374 | extern Display_Info *check_x_display_info P_ ((Lisp_Object)); |
| 3375 | 3375 | ||
| 3376 | 3376 | ||
| 3377 | /* Get specified attribute from resource database RDB. | 3377 | /* Get specified attribute from resource database RDB. |
| 3378 | See Fx_get_resource below for other parameters. */ | 3378 | See Fx_get_resource below for other parameters. */ |
| 3379 | 3379 | ||
| 3380 | static Lisp_Object | 3380 | static Lisp_Object |
| @@ -3511,7 +3511,7 @@ x_get_resource_string (attribute, class) | |||
| 3511 | 3511 | ||
| 3512 | Lisp_Object | 3512 | Lisp_Object |
| 3513 | x_get_arg (dpyinfo, alist, param, attribute, class, type) | 3513 | x_get_arg (dpyinfo, alist, param, attribute, class, type) |
| 3514 | Display_Info *dpyinfo; | 3514 | Display_Info *dpyinfo; |
| 3515 | Lisp_Object alist, param; | 3515 | Lisp_Object alist, param; |
| 3516 | char *attribute; | 3516 | char *attribute; |
| 3517 | char *class; | 3517 | char *class; |