From mboxrd@z Thu Jan 1 00:00:00 1970 Path: quimby.gnus.org!not-for-mail From: Juanma Barranquero Newsgroups: gmane.emacs.devel Subject: Obsolete xrdb-related code in w32term.c and w32fns.c Date: Mon, 18 Feb 2002 16:41:34 +0100 Message-ID: <20020218161600.9662.LEKTU@terra.es> NNTP-Posting-Host: quimby2.netfonds.no Mime-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Trace: quimby2.netfonds.no 1014047743 28356 195.204.10.66 (18 Feb 2002 15:55:43 GMT) X-Complaints-To: usenet@quimby2.netfonds.no NNTP-Posting-Date: 18 Feb 2002 15:55:43 GMT Original-Received: from fencepost.gnu.org ([199.232.76.164]) by quimby2.netfonds.no with esmtp (Exim 3.12 #1 (Debian)) id 16cq8k-0007NG-00 for ; Mon, 18 Feb 2002 16:55:42 +0100 Original-Received: from localhost ([127.0.0.1] helo=fencepost.gnu.org) by fencepost.gnu.org with esmtp (Exim 3.33 #1 (Debian)) id 16cpvf-00017P-00; Mon, 18 Feb 2002 10:42:11 -0500 Original-Received: from [62.22.27.141] (helo=mail.peoplecall.com) by fencepost.gnu.org with esmtp (Exim 3.33 #1 (Debian)) id 16cpv5-00016J-00 for ; Mon, 18 Feb 2002 10:41:35 -0500 Original-Received: from jbarranquero (jbarranquero.ofi.peoplecall.com [62.22.27.143]) by mail.peoplecall.com (8.11.6/8.11.6) with ESMTP id g1IFfY007850 for ; Mon, 18 Feb 2002 16:41:34 +0100 Original-To: emacs-devel@gnu.org X-BkRandomSig-Folder: 3ade7ea7.mb\Emacs\Emacs-Devel\ X-Mailer: Becky! ver. 2.00.07 Errors-To: emacs-devel-admin@gnu.org X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.0.5 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Emacs development discussions. List-Unsubscribe: , List-Archive: Xref: quimby.gnus.org gmane.emacs.devel:1287 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:1287 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 * 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