* Obsolete xrdb-related code in w32term.c and w32fns.c
@ 2002-02-18 15:41 Juanma Barranquero
0 siblings, 0 replies; only message in thread
From: Juanma Barranquero @ 2002-02-18 15:41 UTC (permalink / raw)
This code from x_open_connection and w32_term_init is a leftover from
xfns.c and xterm.c
/L/e/k/t/u
2002-02-18 Juanma Barranquero <lektu@terra.es>
* w32fns.c (Fx_open_connection): Remove obsolete code dealing with
xrdb resources.
* w32term.c (w32_term_init): Likewise.
Index: w32fns.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/w32fns.c,v
retrieving revision 1.155
diff -u -r1.155 w32fns.c
--- w32fns.c 17 Feb 2002 23:44:09 -0000 1.155
+++ w32fns.c 18 Feb 2002 15:36:57 -0000
@@ -7981,7 +7981,6 @@
(display, xrm_string, must_succeed)
Lisp_Object display, xrm_string, must_succeed;
{
- unsigned char *xrm_option;
struct w32_display_info *dpyinfo;
/* If initialization has already been done, return now to avoid
@@ -8018,11 +8017,6 @@
if (NILP (Vw32_color_map))
Vw32_color_map = Fw32_default_color_map ();
- if (! NILP (xrm_string))
- xrm_option = (unsigned char *) XSTRING (xrm_string)->data;
- else
- xrm_option = (unsigned char *) 0;
-
/* Use this general default value to start with. */
/* First remove .exe suffix from invocation-name - it looks ugly. */
{
@@ -8039,7 +8033,7 @@
/* This is what opens the connection and sets x_current_display.
This also initializes many symbols, such as those used for input. */
- dpyinfo = w32_term_init (display, xrm_option,
+ dpyinfo = w32_term_init (display, (unsigned char*)0,
(char *) XSTRING (Vx_resource_name)->data);
if (dpyinfo == 0)
Index: w32term.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/w32term.c,v
retrieving revision 1.143
diff -u -r1.143 w32term.c
--- w32term.c 17 Feb 2002 23:42:40 -0000 1.143
+++ w32term.c 18 Feb 2002 15:36:58 -0000
@@ -11038,19 +11038,6 @@
w32_initialized = 1;
}
- {
- int argc = 0;
- char *argv[3];
-
- argv[0] = "";
- argc = 1;
- if (xrm_option)
- {
- argv[argc++] = "-xrm";
- argv[argc++] = xrm_option;
- }
- }
-
w32_initialize_display_info (display_name);
dpyinfo = &one_w32_display_info;
/L/e/k/t/u
_______________________________________________
Emacs-devel mailing list
Emacs-devel@gnu.org
http://mail.gnu.org/mailman/listinfo/emacs-devel
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2002-02-18 15:41 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2002-02-18 15:41 Obsolete xrdb-related code in w32term.c and w32fns.c Juanma Barranquero
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.