From unknown Fri Jun 20 20:11:31 2025 X-Loop: help-debbugs@gnu.org Subject: bug#9785: w32-default-color-map should be obsolete Resent-From: Juanma Barranquero Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 18 Oct 2011 15:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 9785 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 9785@debbugs.gnu.org X-Debbugs-Original-To: Bug-Gnu-Emacs Received: via spool by submit@debbugs.gnu.org id=B.131895206232387 (code B ref -1); Tue, 18 Oct 2011 15:35:02 +0000 Received: (at submit) by debbugs.gnu.org; 18 Oct 2011 15:34:22 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1RGBgM-0008QJ-B0 for submit@debbugs.gnu.org; Tue, 18 Oct 2011 11:34:22 -0400 Received: from eggs.gnu.org ([140.186.70.92]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1RGBgI-0008Q3-UZ for submit@debbugs.gnu.org; Tue, 18 Oct 2011 11:34:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RGBfH-0000GM-IV for submit@debbugs.gnu.org; Tue, 18 Oct 2011 11:33:16 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from lists.gnu.org ([140.186.70.17]:58107) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RGBfH-0000GH-FC for submit@debbugs.gnu.org; Tue, 18 Oct 2011 11:33:15 -0400 Received: from eggs.gnu.org ([140.186.70.92]:40678) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RGBfF-0007HA-Rb for bug-gnu-emacs@gnu.org; Tue, 18 Oct 2011 11:33:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RGBfE-0000C9-SU for bug-gnu-emacs@gnu.org; Tue, 18 Oct 2011 11:33:13 -0400 Received: from mail-qw0-f41.google.com ([209.85.216.41]:58294) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RGBfE-0000B6-Ib for bug-gnu-emacs@gnu.org; Tue, 18 Oct 2011 11:33:12 -0400 Received: by qadb17 with SMTP id b17so636140qad.0 for ; Tue, 18 Oct 2011 08:33:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:from:date:message-id:subject:to:content-type :content-transfer-encoding; bh=Lb9vKu/I0d7LF+RcnguyXv7DPUlHOG8iPMz0Hb5mOQA=; b=gsLT9nJZ8T3upO2vqkj+NxWMr+ZPVWPl17EdMjss/8gES9GznisY9XpJhB0F44ubp6 gpJnh5Aa9pKgp2JK4FbdrnMvYPZb6he8orHJ3oo48YcT8/IC/zgiISIcuWcSvc2DRtAg cC8V4xO9Jv+YW/PT6ERX+LofH0QIlOIYOrCLs= Received: by 10.68.13.35 with SMTP id e3mr5694499pbc.31.1318951991146; Tue, 18 Oct 2011 08:33:11 -0700 (PDT) MIME-Version: 1.0 Received: by 10.143.165.16 with HTTP; Tue, 18 Oct 2011 08:32:31 -0700 (PDT) From: Juanma Barranquero Date: Tue, 18 Oct 2011 17:32:31 +0200 Message-ID: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 140.186.70.17 X-Spam-Score: -4.5 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -4.5 (----) Package: emacs Severity: minor After revno:106121, the w32-specific function w32-default-color-map is only used from C, in w32fns.c:Fx_open_connection, to initialize the color map in case ~/rgb.txt and etc/rgb.txt are not found. It does not seem useful to expose it to elisp, so I suggest turning it into an internal function, and marking the elisp interface as obsolete. =C2=A0 =C2=A0 Juanma 2011-10-18 Juanma Barranquero * w32fns.c (w32_default_color_map): New function, extracted from Fw32_default_color_map. (Fw32_default_color_map, Fx_open_connection): Use it. 2011-10-18 Juanma Barranquero * term/w32-win.el (w32-default-color-map): Declare obsolete. =3D=3D=3D modified file 'lisp/term/w32-win.el' --- lisp/term/w32-win.el 2011-05-04 14:03:16 +0000 +++ lisp/term/w32-win.el 2011-10-18 14:40:13 +0000 @@ -85,6 +85,7 @@ (define-obsolete-function-alias 'w32-select-font 'x-select-font "23.1") (defvar w32-color-map) ;; defined in w32fns.c +(make-obsolete 'w32-default-color-map nil "24.1") (declare-function w32-send-sys-command "w32fns.c") (declare-function set-message-beep "w32console.c") =3D=3D=3D modified file 'src/w32fns.c' --- src/w32fns.c 2011-07-08 12:46:17 +0000 +++ src/w32fns.c 2011-10-18 14:35:09 +0000 @@ -635,9 +635,8 @@ {"LightGreen" , PALETTERGB (144,238,144)}, }; -DEFUN ("w32-default-color-map", Fw32_default_color_map, Sw32_default_color= _map, - 0, 0, 0, doc: /* Return the default color map. */) - (void) +static Lisp_Object +w32_default_color_map (void) { int i; colormap_t *pc =3D w32_color_map; @@ -658,6 +657,13 @@ return (cmap); } +DEFUN ("w32-default-color-map", Fw32_default_color_map, Sw32_default_color= _map, + 0, 0, 0, doc: /* Return the default color map. */) + (void) +{ + return w32_default_color_map (); +} + static Lisp_Object w32_color_map_lookup (char *colorname) { @@ -4768,7 +4773,7 @@ UNGCPRO; } if (NILP (Vw32_color_map)) - Vw32_color_map =3D Fw32_default_color_map (); + Vw32_color_map =3D w32_default_color_map (); /* Merge in system logical colors. */ add_system_logical_colors_to_map (&Vw32_color_map); From unknown Fri Jun 20 20:11:31 2025 X-Loop: help-debbugs@gnu.org Subject: bug#9785: w32-default-color-map should be obsolete Resent-From: Eli Zaretskii Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 18 Oct 2011 15:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 9785 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Juanma Barranquero Cc: 9785@debbugs.gnu.org Reply-To: Eli Zaretskii Received: via spool by 9785-submit@debbugs.gnu.org id=B9785.13189534872008 (code B ref 9785); Tue, 18 Oct 2011 15:59:02 +0000 Received: (at 9785) by debbugs.gnu.org; 18 Oct 2011 15:58:07 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1RGC3K-0000WL-T0 for submit@debbugs.gnu.org; Tue, 18 Oct 2011 11:58:07 -0400 Received: from mtaout20.012.net.il ([80.179.55.166]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1RGC3I-0000Vq-F3 for 9785@debbugs.gnu.org; Tue, 18 Oct 2011 11:58:05 -0400 Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0LT900M00QPN7900@a-mtaout20.012.net.il> for 9785@debbugs.gnu.org; Tue, 18 Oct 2011 17:56:51 +0200 (IST) Received: from HOME-C4E4A596F7 ([77.124.212.197]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0LT900KEGQYRUDJ0@a-mtaout20.012.net.il>; Tue, 18 Oct 2011 17:56:51 +0200 (IST) Date: Tue, 18 Oct 2011 17:56:52 +0200 From: Eli Zaretskii In-reply-to: X-012-Sender: halo1@inter.net.il Message-id: <83pqhuuwcb.fsf@gnu.org> References: X-Spam-Score: -2.1 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -2.1 (--) > From: Juanma Barranquero > Date: Tue, 18 Oct 2011 17:32:31 +0200 > > After revno:106121, the w32-specific function w32-default-color-map is > only used from C, in w32fns.c:Fx_open_connection, to initialize the > color map in case ~/rgb.txt and etc/rgb.txt are not found. > > It does not seem useful to expose it to elisp, so I suggest turning it > into an internal function, and marking the elisp interface as > obsolete. Fine with me, but please wait for a few days for possible comments from others. From unknown Fri Jun 20 20:11:31 2025 X-Loop: help-debbugs@gnu.org Subject: bug#9785: w32-default-color-map should be obsolete Resent-From: Juanma Barranquero Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 18 Oct 2011 16:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 9785 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Eli Zaretskii Cc: 9785@debbugs.gnu.org Received: via spool by 9785-submit@debbugs.gnu.org id=B9785.13189535972192 (code B ref 9785); Tue, 18 Oct 2011 16:00:02 +0000 Received: (at 9785) by debbugs.gnu.org; 18 Oct 2011 15:59:57 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1RGC57-0000ZI-6j for submit@debbugs.gnu.org; Tue, 18 Oct 2011 11:59:57 -0400 Received: from mail-gy0-f172.google.com ([209.85.160.172]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1RGC55-0000Z5-OY for 9785@debbugs.gnu.org; Tue, 18 Oct 2011 11:59:56 -0400 Received: by gyh20 with SMTP id 20so703862gyh.3 for <9785@debbugs.gnu.org>; Tue, 18 Oct 2011 08:58:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type:content-transfer-encoding; bh=CDRzDImQsoT3nwR3LpkybT6tafH9I51HP1qkOU8yl0M=; b=Ofsg6omKOxOqqOvELDgRhBI6fbWfzr58kJxH9ffDBNnxIOOGM+SIaTrpTP5Zgurya3 GXCibtK2JGLXWOdlAO2znzpLFBrtBn5JxhQwszU5eIZjaa3lheuYKAF2+qL5NIfagccZ bwnnEeFvfv3MrsFR+qGzqrh/1wOcVixS8JL9w= Received: by 10.68.14.97 with SMTP id o1mr6013348pbc.0.1318953532070; Tue, 18 Oct 2011 08:58:52 -0700 (PDT) MIME-Version: 1.0 Received: by 10.143.165.16 with HTTP; Tue, 18 Oct 2011 08:58:12 -0700 (PDT) In-Reply-To: <83pqhuuwcb.fsf@gnu.org> References: <83pqhuuwcb.fsf@gnu.org> From: Juanma Barranquero Date: Tue, 18 Oct 2011 17:58:12 +0200 Message-ID: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -3.4 (---) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -3.4 (---) On Tue, Oct 18, 2011 at 17:56, Eli Zaretskii wrote: > Fine with me, but please wait for a few days for possible comments > from others. No hurry. =C2=A0 =C2=A0 Juanma From unknown Fri Jun 20 20:11:31 2025 X-Loop: help-debbugs@gnu.org Subject: bug#9785: w32-default-color-map should be obsolete Resent-From: Juanma Barranquero Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 24 Oct 2011 19:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 9785 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Jason Rumney Cc: Eli Zaretskii , 9785@debbugs.gnu.org Received: via spool by 9785-submit@debbugs.gnu.org id=B9785.13194850294534 (code B ref 9785); Mon, 24 Oct 2011 19:38:01 +0000 Received: (at 9785) by debbugs.gnu.org; 24 Oct 2011 19:37:09 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1RIQKa-0001B5-Nv for submit@debbugs.gnu.org; Mon, 24 Oct 2011 15:37:08 -0400 Received: from mail-pz0-f50.google.com ([209.85.210.50]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1RIQKY-0001AS-RM for 9785@debbugs.gnu.org; Mon, 24 Oct 2011 15:37:07 -0400 Received: by pzk34 with SMTP id 34so17803224pzk.9 for <9785@debbugs.gnu.org>; Mon, 24 Oct 2011 12:35:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type:content-transfer-encoding; bh=gwa5UKSM8cCjhBGDxpeUowIc1yrN/U86C2TZGTQK448=; b=RuKVo/VyC5KeF9qbXYlUgU+05BIcDFpOqDQzuQPuzoUKU3FGRIX8soyk9g4Yd17wKu 4wf72HP0O7mAkenJrff4kt05r7XSJ28IRTjNchwivHj0bIfqbBYuKMYXmP8AFB7Zns7/ vavpWSr9CgtvAofeX3eIPmeeYuEjaqtDeA1vE= Received: by 10.68.10.34 with SMTP id f2mr8516106pbb.116.1319484928243; Mon, 24 Oct 2011 12:35:28 -0700 (PDT) MIME-Version: 1.0 Received: by 10.143.165.16 with HTTP; Mon, 24 Oct 2011 12:34:48 -0700 (PDT) In-Reply-To: <83pqhuuwcb.fsf@gnu.org> References: <83pqhuuwcb.fsf@gnu.org> From: Juanma Barranquero Date: Mon, 24 Oct 2011 21:34:48 +0200 Message-ID: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -3.4 (---) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -3.4 (---) > Fine with me, but please wait for a few days for possible comments > from others. Jason? =C2=A0 =C2=A0 Juanma From unknown Fri Jun 20 20:11:31 2025 X-Loop: help-debbugs@gnu.org Subject: bug#9785: w32-default-color-map should be obsolete Resent-From: Jason Rumney Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 26 Oct 2011 13:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 9785 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Juanma Barranquero Cc: Eli Zaretskii , 9785@debbugs.gnu.org Received: via spool by 9785-submit@debbugs.gnu.org id=B9785.131963531613722 (code B ref 9785); Wed, 26 Oct 2011 13:22:02 +0000 Received: (at 9785) by debbugs.gnu.org; 26 Oct 2011 13:21:56 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1RJ3QZ-0003ZH-V3 for submit@debbugs.gnu.org; Wed, 26 Oct 2011 09:21:56 -0400 Received: from mail-pz0-f50.google.com ([209.85.210.50]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1RJ3QX-0003Z1-1s for 9785@debbugs.gnu.org; Wed, 26 Oct 2011 09:21:54 -0400 Received: by pzk34 with SMTP id 34so4207445pzk.9 for <9785@debbugs.gnu.org>; Wed, 26 Oct 2011 06:20:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-type; bh=tZ/SPNBXQGK4LnHur3NRpq9JIDgeSDeC94SxZ+NUnss=; b=GpMzPhDbVZ5pEq52Ehapz2+U2LM6KIEwFnWOHATJtnWEJJsYs4m5Mdh9ATZFvo+uVI NtdwS1msCEQqaN4+wk3qXvVaR8noM/Wf3cM1bqZRbE7Eo5k8kYCnbHwefdT/ZEZbTs6B QgMHDUN3JcDMzzISLZXM7gZgucszDaFSjmRZg= Received: by 10.68.72.168 with SMTP id e8mr7453815pbv.127.1319635204430; Wed, 26 Oct 2011 06:20:04 -0700 (PDT) Received: from home.jasonrumney.net ([180.75.97.104]) by mx.google.com with ESMTPS id y4sm5731761pbe.4.2011.10.26.06.19.55 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 26 Oct 2011 06:19:59 -0700 (PDT) Received: by home.jasonrumney.net (Postfix, from userid 1000) id 34D951544; Wed, 26 Oct 2011 21:19:41 +0800 (MYT) From: Jason Rumney References: <83pqhuuwcb.fsf@gnu.org> Date: Wed, 26 Oct 2011 21:19:40 +0800 In-Reply-To: (Juanma Barranquero's message of "Mon, 24 Oct 2011 21:34:48 +0200") Message-ID: <877h3rvqj7.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.90 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -3.6 (---) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -3.6 (---) Juanma Barranquero writes: > From: Juanma Barranquero > Date: Tue, 18 Oct 2011 17:32:31 +0200 > > After revno:106121, the w32-specific function w32-default-color-map is > only used from C, in w32fns.c:Fx_open_connection, to initialize the > color map in case ~/rgb.txt and etc/rgb.txt are not found. > > It does not seem useful to expose it to elisp, so I suggest turning it > into an internal function, and marking the elisp interface as > obsolete. ... > Jason? Seems OK. From unknown Fri Jun 20 20:11:31 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.427 (Entity 5.427) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Juanma Barranquero Subject: bug#9785: closed (Re: bug#9785: w32-default-color-map should be obsolete) Message-ID: References: X-Gnu-PR-Message: they-closed 9785 X-Gnu-PR-Package: emacs Reply-To: 9785@debbugs.gnu.org Date: Wed, 26 Oct 2011 13:47:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1319636822-15867-1" This is a multi-part message in MIME format... ------------=_1319636822-15867-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #9785: w32-default-color-map should be obsolete which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 9785@debbugs.gnu.org. --=20 9785: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D9785 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1319636822-15867-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 9785-done) by debbugs.gnu.org; 26 Oct 2011 13:46:19 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1RJ3oA-000472-Se for submit@debbugs.gnu.org; Wed, 26 Oct 2011 09:46:18 -0400 Received: from mail-qy0-f179.google.com ([209.85.216.179]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1RJ3o8-00046q-Qg for 9785-done@debbugs.gnu.org; Wed, 26 Oct 2011 09:46:17 -0400 Received: by qyk31 with SMTP id 31so1679735qyk.3 for <9785-done@debbugs.gnu.org>; Wed, 26 Oct 2011 06:44:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type:content-transfer-encoding; bh=UJi8CF2Ner6sjo5pMWUpH7Iozreamo0tCz52FPKXIbs=; b=P4eLnCH0GYw6kVq5ey260KIYgQi6PF9bXPWuMup9BE09SEJBJl0IlksxN9HIp3u6sp nTNNrKFNq9qq3VOzDWA5r9GSu6Lm2vGjym9t5g63wHmuDaJsK3PdRnNVF7VX2w281UZp JWTxMZxNVwQfP3gDy0G1V8VASGE8+NUgonnAQ= Received: by 10.68.73.232 with SMTP id o8mr39487281pbv.82.1319636668081; Wed, 26 Oct 2011 06:44:28 -0700 (PDT) MIME-Version: 1.0 Received: by 10.143.165.16 with HTTP; Wed, 26 Oct 2011 06:43:48 -0700 (PDT) In-Reply-To: <877h3rvqj7.fsf@gnu.org> References: <83pqhuuwcb.fsf@gnu.org> <877h3rvqj7.fsf@gnu.org> From: Juanma Barranquero Date: Wed, 26 Oct 2011 15:43:48 +0200 Message-ID: Subject: Re: bug#9785: w32-default-color-map should be obsolete To: Jason Rumney Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -3.4 (---) X-Debbugs-Envelope-To: 9785-done Cc: Eli Zaretskii , 9785-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -3.4 (---) On Wed, Oct 26, 2011 at 15:19, Jason Rumney wrote: > Seems OK. Thanks, done. =C2=A0 =C2=A0 Juanma ------------=_1319636822-15867-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 18 Oct 2011 15:34:22 +0000 Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1RGBgM-0008QJ-B0 for submit@debbugs.gnu.org; Tue, 18 Oct 2011 11:34:22 -0400 Received: from eggs.gnu.org ([140.186.70.92]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1RGBgI-0008Q3-UZ for submit@debbugs.gnu.org; Tue, 18 Oct 2011 11:34:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RGBfH-0000GM-IV for submit@debbugs.gnu.org; Tue, 18 Oct 2011 11:33:16 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from lists.gnu.org ([140.186.70.17]:58107) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RGBfH-0000GH-FC for submit@debbugs.gnu.org; Tue, 18 Oct 2011 11:33:15 -0400 Received: from eggs.gnu.org ([140.186.70.92]:40678) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RGBfF-0007HA-Rb for bug-gnu-emacs@gnu.org; Tue, 18 Oct 2011 11:33:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RGBfE-0000C9-SU for bug-gnu-emacs@gnu.org; Tue, 18 Oct 2011 11:33:13 -0400 Received: from mail-qw0-f41.google.com ([209.85.216.41]:58294) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RGBfE-0000B6-Ib for bug-gnu-emacs@gnu.org; Tue, 18 Oct 2011 11:33:12 -0400 Received: by qadb17 with SMTP id b17so636140qad.0 for ; Tue, 18 Oct 2011 08:33:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:from:date:message-id:subject:to:content-type :content-transfer-encoding; bh=Lb9vKu/I0d7LF+RcnguyXv7DPUlHOG8iPMz0Hb5mOQA=; b=gsLT9nJZ8T3upO2vqkj+NxWMr+ZPVWPl17EdMjss/8gES9GznisY9XpJhB0F44ubp6 gpJnh5Aa9pKgp2JK4FbdrnMvYPZb6he8orHJ3oo48YcT8/IC/zgiISIcuWcSvc2DRtAg cC8V4xO9Jv+YW/PT6ERX+LofH0QIlOIYOrCLs= Received: by 10.68.13.35 with SMTP id e3mr5694499pbc.31.1318951991146; Tue, 18 Oct 2011 08:33:11 -0700 (PDT) MIME-Version: 1.0 Received: by 10.143.165.16 with HTTP; Tue, 18 Oct 2011 08:32:31 -0700 (PDT) From: Juanma Barranquero Date: Tue, 18 Oct 2011 17:32:31 +0200 Message-ID: Subject: w32-default-color-map should be obsolete To: Bug-Gnu-Emacs Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 140.186.70.17 X-Spam-Score: -4.5 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -4.5 (----) Package: emacs Severity: minor After revno:106121, the w32-specific function w32-default-color-map is only used from C, in w32fns.c:Fx_open_connection, to initialize the color map in case ~/rgb.txt and etc/rgb.txt are not found. It does not seem useful to expose it to elisp, so I suggest turning it into an internal function, and marking the elisp interface as obsolete. =C2=A0 =C2=A0 Juanma 2011-10-18 Juanma Barranquero * w32fns.c (w32_default_color_map): New function, extracted from Fw32_default_color_map. (Fw32_default_color_map, Fx_open_connection): Use it. 2011-10-18 Juanma Barranquero * term/w32-win.el (w32-default-color-map): Declare obsolete. =3D=3D=3D modified file 'lisp/term/w32-win.el' --- lisp/term/w32-win.el 2011-05-04 14:03:16 +0000 +++ lisp/term/w32-win.el 2011-10-18 14:40:13 +0000 @@ -85,6 +85,7 @@ (define-obsolete-function-alias 'w32-select-font 'x-select-font "23.1") (defvar w32-color-map) ;; defined in w32fns.c +(make-obsolete 'w32-default-color-map nil "24.1") (declare-function w32-send-sys-command "w32fns.c") (declare-function set-message-beep "w32console.c") =3D=3D=3D modified file 'src/w32fns.c' --- src/w32fns.c 2011-07-08 12:46:17 +0000 +++ src/w32fns.c 2011-10-18 14:35:09 +0000 @@ -635,9 +635,8 @@ {"LightGreen" , PALETTERGB (144,238,144)}, }; -DEFUN ("w32-default-color-map", Fw32_default_color_map, Sw32_default_color= _map, - 0, 0, 0, doc: /* Return the default color map. */) - (void) +static Lisp_Object +w32_default_color_map (void) { int i; colormap_t *pc =3D w32_color_map; @@ -658,6 +657,13 @@ return (cmap); } +DEFUN ("w32-default-color-map", Fw32_default_color_map, Sw32_default_color= _map, + 0, 0, 0, doc: /* Return the default color map. */) + (void) +{ + return w32_default_color_map (); +} + static Lisp_Object w32_color_map_lookup (char *colorname) { @@ -4768,7 +4773,7 @@ UNGCPRO; } if (NILP (Vw32_color_map)) - Vw32_color_map =3D Fw32_default_color_map (); + Vw32_color_map =3D w32_default_color_map (); /* Merge in system logical colors. */ add_system_logical_colors_to_map (&Vw32_color_map); ------------=_1319636822-15867-1--