Mercurial > emacs
changeset 7801:10e818a0248a
(x_term_init): New args xrm_option and resource_string.
Pass an -xrm option to XtAppInitialize if appropriate.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sun, 05 Jun 1994 17:42:38 +0000 |
| parents | 329e59e31d8d |
| children | d687e885fa6a |
| files | src/xterm.c |
| diffstat | 1 files changed, 15 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xterm.c Sun Jun 05 17:36:02 1994 +0000 +++ b/src/xterm.c Sun Jun 05 17:42:38 1994 +0000 @@ -6039,8 +6039,10 @@ #endif /* USE_X_TOOLKIT */ void -x_term_init (display_name) +x_term_init (display_name, xrm_option, resource_name) char *display_name; + char *xrm_option; + char *resource_name; { Lisp_Object frame; char *defaultvalue; @@ -6055,13 +6057,19 @@ x_focus_frame = x_highlight_frame = 0; #ifdef USE_X_TOOLKIT - argv = (char **) XtMalloc (5 * sizeof (char *)); - argv [0] = ""; - argv [1] = "-display"; - argv [2] = display_name; - argv [3] = "-name"; - argv [4] = "emacs"; + argv = (char **) XtMalloc (7 * sizeof (char *)); + argv[0] = ""; + argv[1] = "-display"; + argv[2] = display_name; + argv[3] = "-name"; + /* Usually `emacs', but not always. */ + argv[4] = resource_name; argc = 5; + if (xrm_option) + { + argv[argc++] = "-xrm"; + argv[argc++] = xrm_option; + } Xt_app_shell = XtAppInitialize (&Xt_app_con, "Emacs", emacs_options, XtNumber (emacs_options), &argc, argv,