From unknown Sat Jun 14 03:48:50 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#16434 <16434@debbugs.gnu.org> To: bug#16434 <16434@debbugs.gnu.org> Subject: Status: Regression: emacs --reverse-video broken Reply-To: bug#16434 <16434@debbugs.gnu.org> Date: Sat, 14 Jun 2025 10:48:50 +0000 retitle 16434 Regression: emacs --reverse-video broken reassign 16434 emacs submitter 16434 Barry OReilly severity 16434 important thanks From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 13 19:42:31 2014 Received: (at submit) by debbugs.gnu.org; 14 Jan 2014 00:42:31 +0000 Received: from localhost ([127.0.0.1]:49529 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1W2s5O-0007i0-Fj for submit@debbugs.gnu.org; Mon, 13 Jan 2014 19:42:30 -0500 Received: from eggs.gnu.org ([208.118.235.92]:53006) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1W2s5M-0007hs-S4 for submit@debbugs.gnu.org; Mon, 13 Jan 2014 19:42:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W2s5M-0003uy-01 for submit@debbugs.gnu.org; Mon, 13 Jan 2014 19:42:28 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, HTML_MESSAGE,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:50929) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W2s5L-0003uu-TD for submit@debbugs.gnu.org; Mon, 13 Jan 2014 19:42:27 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54710) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W2s5K-00087L-Ri for bug-gnu-emacs@gnu.org; Mon, 13 Jan 2014 19:42:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W2s5J-0003rl-01 for bug-gnu-emacs@gnu.org; Mon, 13 Jan 2014 19:42:26 -0500 Received: from mail-ob0-x234.google.com ([2607:f8b0:4003:c01::234]:37623) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W2s5I-0003qo-Qz for bug-gnu-emacs@gnu.org; Mon, 13 Jan 2014 19:42:24 -0500 Received: by mail-ob0-f180.google.com with SMTP id wm4so2185825obc.39 for ; Mon, 13 Jan 2014 16:42:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=ARZJLmgBUbcCtIxTSPhurqpzG7lqP2SGvgm6T/pXkX0=; b=XH+0zy6uynxZktHk/l7MI0avUDD1e+cJ32STk4TxYsuxYqeByWjdUt+3GCG4qxpReZ fNz8aYVfo7ymsmUy1RyV2rcMwF5YtRn6OG1XMNsE+H5g1wOcMF1Qzm8ZsO2aMfEJAjn3 3fwZHr8TTbOrXzAttRLXWJlLYZHn3jfUunUtkh6OhoUuqP+gG5VoGWSkgCdJYmUWVXAx RYWg2D4Xm30CRG4roR9MobVFLPv1V0tVwmS61d4VZuOe8aZUALelI1kqXWNsPhzH53fI 8tXDa3gUwkiRAinBnYQL6ynpobeSSeiaUZZxvArpp2sfVu5xe1D/pgRJ1mQw0av0bnq+ nNOg== MIME-Version: 1.0 X-Received: by 10.60.161.106 with SMTP id xr10mr15511483oeb.35.1389660143868; Mon, 13 Jan 2014 16:42:23 -0800 (PST) Received: by 10.76.21.84 with HTTP; Mon, 13 Jan 2014 16:42:23 -0800 (PST) Date: Mon, 13 Jan 2014 19:42:23 -0500 Message-ID: Subject: Regression: emacs --reverse-video broken From: Barry OReilly To: bug-gnu-emacs@gnu.org Content-Type: multipart/alternative; boundary=089e011771893be25104efe377e6 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) --089e011771893be25104efe377e6 Content-Type: text/plain; charset=ISO-8859-1 Used to be that emacs --reverse-video would open Emacs with black background. Now it opens with white background as though the flag wasn't specified. I Git bisected the Savannah repo to: 15e14b165dcbc6566a0459b0d5e66f89080f569e is the first bad commit commit 15e14b165dcbc6566a0459b0d5e66f89080f569e Author: Chong Yidong Date: Sat Dec 21 23:31:09 2013 +0800 Don't make faces when loading Custom themes. * custom.el (custom-theme-recalc-face): Do nothing if the face is undefined. Thus, theme settings for undefined faces do not take effect until the faces are defined with defface, the same as with theme variables. * faces.el (face-spec-set): Use face-spec-recalc in all cases. (face-spec-reset-face): Don't assign extra properties in temacs. (face-spec-recalc): Apply X resources too. --089e011771893be25104efe377e6 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable
Used to be that emacs --reverse-video would open Emacs wit= h black
background. Now it opens with white background as though the fla= g
wasn't specified. I Git bisected the Savannah repo to:

15e1= 4b165dcbc6566a0459b0d5e66f89080f569e is the first bad commit
commit 15e14b165dcbc6566a0459b0d5e66f89080f569e
Author: Chong Yidong <= ;cyd@gnu.org>
Date:=A0=A0 Sat Dec = 21 23:31:09 2013 +0800

=A0=A0=A0 Don't make faces when loading C= ustom themes.
=A0=A0=A0
=A0=A0=A0 * custom.el (custom-theme-recalc-face): Do nothing = if the face is
=A0=A0=A0 undefined.=A0 Thus, theme settings for undefine= d faces do not take
=A0=A0=A0 effect until the faces are defined with de= fface, the same as with
=A0=A0=A0 theme variables.
=A0=A0=A0
=A0=A0=A0 * faces.el (face-spec= -set): Use face-spec-recalc in all cases.
=A0=A0=A0 (face-spec-reset-fac= e): Don't assign extra properties in temacs.
=A0=A0=A0 (face-spec-re= calc): Apply X resources too.

--089e011771893be25104efe377e6-- From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 14 11:56:50 2014 Received: (at control) by debbugs.gnu.org; 14 Jan 2014 16:56:50 +0000 Received: from localhost ([127.0.0.1]:50520 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1W37II-0003u9-CZ for submit@debbugs.gnu.org; Tue, 14 Jan 2014 11:56:50 -0500 Received: from fencepost.gnu.org ([208.118.235.10]:58401) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1W37IH-0003u0-AR for control@debbugs.gnu.org; Tue, 14 Jan 2014 11:56:49 -0500 Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1W37IG-00036b-Sq for control@debbugs.gnu.org; Tue, 14 Jan 2014 11:56:49 -0500 Date: Tue, 14 Jan 2014 11:56:48 -0500 Message-Id: Subject: control message for bug 16443 To: X-Mailer: mail (GNU Mailutils 2.1) From: Glenn Morris X-Spam-Score: -5.1 (-----) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.1 (-----) forcemerge 16434 16443 From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 14 11:57:45 2014 Received: (at control) by debbugs.gnu.org; 14 Jan 2014 16:57:45 +0000 Received: from localhost ([127.0.0.1]:50524 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1W37JA-0003wL-SJ for submit@debbugs.gnu.org; Tue, 14 Jan 2014 11:57:45 -0500 Received: from fencepost.gnu.org ([208.118.235.10]:58420) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1W37J8-0003wD-V5 for control@debbugs.gnu.org; Tue, 14 Jan 2014 11:57:43 -0500 Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1W37J8-0003q0-My for control@debbugs.gnu.org; Tue, 14 Jan 2014 11:57:42 -0500 Date: Tue, 14 Jan 2014 11:57:42 -0500 Message-Id: Subject: control message for bug 16440 To: X-Mailer: mail (GNU Mailutils 2.1) From: Glenn Morris X-Spam-Score: -5.1 (-----) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.1 (-----) forcemerge 16434 16440 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 12 17:22:01 2014 Received: (at control) by debbugs.gnu.org; 12 Feb 2014 22:22:01 +0000 Received: from localhost ([127.0.0.1]:49415 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WDiBs-00024w-O5 for submit@debbugs.gnu.org; Wed, 12 Feb 2014 17:22:01 -0500 Received: from fencepost.gnu.org ([208.118.235.10]:52316 ident=Debian-exim) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WDiBq-00024m-DE for control@debbugs.gnu.org; Wed, 12 Feb 2014 17:21:58 -0500 Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1WDiBq-0005Qm-6h for control@debbugs.gnu.org; Wed, 12 Feb 2014 17:21:58 -0500 Date: Wed, 12 Feb 2014 17:21:58 -0500 Message-Id: Subject: control message for bug 16694 To: X-Mailer: mail (GNU Mailutils 2.1) From: Glenn Morris X-Spam-Score: -5.7 (-----) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.7 (-----) merge 16443 16694 From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 24 13:54:16 2014 Received: (at control) by debbugs.gnu.org; 24 Mar 2014 17:54:16 +0000 Received: from localhost ([127.0.0.1]:47942 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WS94h-0002hn-Kc for submit@debbugs.gnu.org; Mon, 24 Mar 2014 13:54:15 -0400 Received: from mtaout20.012.net.il ([80.179.55.166]:44352) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WS94e-0002hc-Hc for control@debbugs.gnu.org; Mon, 24 Mar 2014 13:54:13 -0400 Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0N2Y00K00BSQ5R00@a-mtaout20.012.net.il> for control@debbugs.gnu.org; Mon, 24 Mar 2014 19:54:11 +0200 (IST) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0N2Y00KXKCE81I30@a-mtaout20.012.net.il> for control@debbugs.gnu.org; Mon, 24 Mar 2014 19:54:09 +0200 (IST) Date: Mon, 24 Mar 2014 19:53:59 +0200 From: Eli Zaretskii Subject: Re: Processed (with 1 errors): Re: bug#17085: No dark backgrounds in git emacs In-reply-to: X-012-Sender: halo1@inter.net.il To: control@debbugs.gnu.org (GNU bug tracker automated control server) Message-id: <83d2hb1o08.fsf@gnu.org> References: <83ha6n1ojt.fsf@gnu.org> X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: Eli Zaretskii List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) severity 17085 important merge 17085 16694 thanks From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 28 11:15:34 2014 Received: (at 16434) by debbugs.gnu.org; 28 Mar 2014 15:15:34 +0000 Received: from localhost ([127.0.0.1]:54993 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WTYVK-00075k-64 for submit@debbugs.gnu.org; Fri, 28 Mar 2014 11:15:34 -0400 Received: from hemera.binary-island.eu ([97.107.138.233]:39904) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WTYVH-00075Y-8f; Fri, 28 Mar 2014 11:15:32 -0400 Received: from [10.0.0.20] (95-90-43-88-dynip.superkabel.de [95.90.43.88]) (using TLSv1 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by hemera.binary-island.eu (Postfix) with ESMTPSA id 9F2B63C0D5; Fri, 28 Mar 2014 11:21:46 -0400 (EDT) Message-ID: <5335920F.4030008@binary-island.eu> Date: Fri, 28 Mar 2014 16:15:27 +0100 From: Matthias Dahl User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 MIME-Version: 1.0 To: Barry OReilly Subject: Re: bug#16694: bugs #16694/#16378: Patches References: <52F601AE.5040309@binary-island.eu> <87k3bj40nu.fsf@cougar.home.aneadesign.com> <83wqfiz36v.fsf@gnu.org> <5331D45B.7090704@binary-island.eu> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Spam-Score: -0.4 (/) X-Debbugs-Envelope-To: 16434 Cc: 16434@debbugs.gnu.org, Eli Zaretskii , =?ISO-8859-1?Q?Clemens_Sch=FCller?= , Stefan Monnier , 16694@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.4 (/) Hello @all. Sorry for my late reply. I was _really_ busy this week. :( @Barry: Thanks for all your investigative work. Unfortunately I fear you are somewhat barking up the wrong tree (= function). :) I am pretty sure I've found the real culprit but the fix is a bit more involved, if I am right. I still need to do a few more tests and think about a solution that works without side-effects and is as non-invasive as possible. If nobody minds, give me a few more days (still a bit busy here) and I will see if I can get a patch out for testing asap. Thanks for the patience in advance. :-) So long, Matthias From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 01 13:15:28 2014 Received: (at 16434) by debbugs.gnu.org; 1 Apr 2014 17:15:28 +0000 Received: from localhost ([127.0.0.1]:59622 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WV2HX-0005cq-6T for submit@debbugs.gnu.org; Tue, 01 Apr 2014 13:15:28 -0400 Received: from mail-ob0-f182.google.com ([209.85.214.182]:63223) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WV2HT-0005cb-QS; Tue, 01 Apr 2014 13:15:24 -0400 Received: by mail-ob0-f182.google.com with SMTP id uz6so11279863obc.41 for ; Tue, 01 Apr 2014 10:15:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=+F6AIuRHSq0IDv/lTd427PxqSv2HTorTqvsmCcrmjDQ=; b=WQkVIVVftVJveCpVYRiDsEgAHSa+8mqNzQqUU2mWmkN8I+sX5eJos54Q0XvsWyJmBI M6zYIjAGMOw1/ECb4lgCk1XYUpaG8Km2o/6UkNA6dHz4n2K6jGwZsL+tsI6aak1zXiCo zq2EvZP8DS7JqxuPZDsjlWRc2BERy5U7FLD1PhBUcxuB/oNig5ScnphTdGkR0t1tzJ6c PLs8neaLloLZI2UOMV3gJM2St7kFGcjOAPHqGP+/OqPWdqY/T01dbcyytNDheOSFeavc 3XXT9RL71wqOvYJT+DQppRp9PzsjpZxOpCiWF0L5XTLYVUgFATCVderAd4VO5d/Wewl0 wMQg== MIME-Version: 1.0 X-Received: by 10.60.62.34 with SMTP id v2mr15471762oer.37.1396372523090; Tue, 01 Apr 2014 10:15:23 -0700 (PDT) Received: by 10.76.6.44 with HTTP; Tue, 1 Apr 2014 10:15:23 -0700 (PDT) In-Reply-To: <5335920F.4030008@binary-island.eu> References: <52F601AE.5040309@binary-island.eu> <87k3bj40nu.fsf@cougar.home.aneadesign.com> <83wqfiz36v.fsf@gnu.org> <5331D45B.7090704@binary-island.eu> <5335920F.4030008@binary-island.eu> Date: Tue, 1 Apr 2014 13:15:23 -0400 Message-ID: Subject: Re: bug#16694: bugs #16694/#16378: Patches From: Barry OReilly To: Matthias Dahl Content-Type: multipart/alternative; boundary=089e0141a7ca368afe04f5fe5028 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 16434 Cc: 16434@debbugs.gnu.org, Eli Zaretskii , =?ISO-8859-1?Q?Clemens_Sch=FCller?= , Stefan Monnier , 16694@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --089e0141a7ca368afe04f5fe5028 Content-Type: text/plain; charset=ISO-8859-1 > I am pretty sure I've found the real culprit but the fix is a bit > more involved, if I am right. It would be nice to get a fix into the upcoming pretest, announced at: http://lists.gnu.org/archive/html/emacs-devel/2014-03/msg01243.html Could you explain how the patch I proposed would be wrong to install, even if it doesn't solve all ill symptoms? (No one has reported whether or not it solves theme problems.) --089e0141a7ca368afe04f5fe5028 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable
> I am pretty sure I've found the real culprit but = the fix is a bit
> more involved, if I am right.

It would be n= ice to get a fix into the upcoming pretest, announced at:

=A0 h= ttp://lists.gnu.org/archive/html/emacs-devel/2014-03/msg01243.html

Could you explain how the patch I proposed would be wrong to install,even if it doesn't solve all ill symptoms? (No one has reported
wh= ether or not it solves theme problems.)

--089e0141a7ca368afe04f5fe5028-- From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 01 14:18:14 2014 Received: (at 16434) by debbugs.gnu.org; 1 Apr 2014 18:18:15 +0000 Received: from localhost ([127.0.0.1]:59682 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WV3GH-0007IE-EI for submit@debbugs.gnu.org; Tue, 01 Apr 2014 14:18:14 -0400 Received: from hemera.binary-island.eu ([97.107.138.233]:50814) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WV3G0-0007HN-Az; Tue, 01 Apr 2014 14:18:11 -0400 Received: from [10.0.0.20] (95-90-43-88-dynip.superkabel.de [95.90.43.88]) (using TLSv1 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by hemera.binary-island.eu (Postfix) with ESMTPSA id 82BE33C0D5; Tue, 1 Apr 2014 14:24:16 -0400 (EDT) Message-ID: <533B02D0.1030904@binary-island.eu> Date: Tue, 01 Apr 2014 20:17:52 +0200 From: Matthias Dahl User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 MIME-Version: 1.0 To: Barry OReilly Subject: Re: bug#16694: bugs #16694/#16378: Patches References: <52F601AE.5040309@binary-island.eu> <87k3bj40nu.fsf@cougar.home.aneadesign.com> <83wqfiz36v.fsf@gnu.org> <5331D45B.7090704@binary-island.eu> <5335920F.4030008@binary-island.eu> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Spam-Score: -0.6 (/) X-Debbugs-Envelope-To: 16434 Cc: 16434@debbugs.gnu.org, Eli Zaretskii , =?ISO-8859-1?Q?Clemens_Sch=FCller?= , Stefan Monnier , 16694@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.6 (/) Hello Barry... > It would be nice to get a fix into the upcoming pretest, announced at: I agree-- that goes for all the mentioned bugs in the subject btw. ;-) So I hope we can delay the pretest until those patches are applied. > Could you explain how the patch I proposed would be wrong to install, > even if it doesn't solve all ill symptoms? (No one has reported > whether or not it solves theme problems.) That whole part of Emacs is not as easy to modify as it might look and things do tend to have rather unexpected side-effects there-- speaking from experience. :) So I honestly would like to keep as much untouched (with my other patches applied) as possible to fix this bug as well. The problem is: The inverse video logic is not handled in faces.el but outside of it. And for X, after the frame has been created, the default face needs to be left alone, otherwise the inverse video is lost. I've a few ideas that I just need to test. I've set aside some time tomorrow for this, so I'll get back to everyone later that day after I have either cooked up something that works fine or I've given up and banged my head against the wall. ;) Sorry for the delay... Matthias -- Dipl.-Inf. (FH) Matthias Dahl | Software Engineer | binary-island.eu services: custom software [desktop, mobile, web], server administration From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 02 11:04:41 2014 Received: (at 16434) by debbugs.gnu.org; 2 Apr 2014 15:04:41 +0000 Received: from localhost ([127.0.0.1]:33069 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WVMiW-0002uV-4I for submit@debbugs.gnu.org; Wed, 02 Apr 2014 11:04:41 -0400 Received: from hemera.binary-island.eu ([97.107.138.233]:53070) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WVMiE-0002tx-E7; Wed, 02 Apr 2014 11:04:37 -0400 Received: from [10.0.0.20] (95-90-43-88-dynip.superkabel.de [95.90.43.88]) (using TLSv1 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by hemera.binary-island.eu (Postfix) with ESMTPSA id 7C99B3C0D5; Wed, 2 Apr 2014 11:10:44 -0400 (EDT) Message-ID: <533C26F3.4040600@binary-island.eu> Date: Wed, 02 Apr 2014 17:04:19 +0200 From: Matthias Dahl User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 MIME-Version: 1.0 To: Barry OReilly Subject: Re: bug#16694: bugs #16694/#16378: Patches References: <52F601AE.5040309@binary-island.eu> <87k3bj40nu.fsf@cougar.home.aneadesign.com> <83wqfiz36v.fsf@gnu.org> <5331D45B.7090704@binary-island.eu> <5335920F.4030008@binary-island.eu> In-Reply-To: Content-Type: multipart/mixed; boundary="------------070800060109060102040303" X-Spam-Score: -0.6 (/) X-Debbugs-Envelope-To: 16434 Cc: 16434@debbugs.gnu.org, Eli Zaretskii , =?ISO-8859-1?Q?Clemens_Sch=FCller?= , Stefan Monnier , 16694@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.6 (/) This is a multi-part message in MIME format. --------------070800060109060102040303 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Hello @all... Like promised, attached revised versions of my first three patches which had a nasty and very embarrassing bug/brain-fart as well as a potential fix for bug #16434. I'd appreciate testing and any feedback, so that we (as in who ever is in charge and can do this) commit this for the pretest. :) Keeping my fingers crossed... So long, Matthias --------------070800060109060102040303 Content-Type: text/x-patch; name="0001-lisp-faces.el-Fix-application-of-X-resource-attribut.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0001-lisp-faces.el-Fix-application-of-X-resource-attribut.pa"; filename*1="tch" >From a209fe3499b5c25b409539deb6b395de098411c1 Mon Sep 17 00:00:00 2001 From: Matthias Dahl Date: Wed, 2 Apr 2014 15:26:43 +0200 Subject: [PATCH 1/4] lisp/faces.el: Fix application of X resource attributes Attributes from X resources have to applied first after the face spec has been reset, to give Emacs' own face spec theming, customization and defface defaults a higher priority over it. Otherwise those will be overriden and the user sees a broken (= as in unintended and mixed up) user interface. Commit 15e14b165dcbc6566a0459b0d5e66f89080f569e inadvertently changed that priority. This fixes bug #16694. --- lisp/faces.el | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/lisp/faces.el b/lisp/faces.el index 49b5928..7d04938 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -1639,11 +1639,19 @@ function for its other effects." (defun face-spec-recalc (face frame) "Reset the face attributes of FACE on FRAME according to its specs. -This applies the defface/custom spec first, then the custom theme specs, -then the override spec." +After the reset, the specs are applied from the following sources in this order: + X resources (if applicable) + | + (theme and user customization) + or, if nonexistent or does not match the current frame, + (defface default spec) + | + defface override spec" (while (get face 'face-alias) (setq face (get face 'face-alias))) (face-spec-reset-face face frame) + (unless inhibit-x-resources + (make-face-x-resource-internal face frame)) ;; If FACE is customized or themed, set the custom spec from ;; `theme-face' records. (let ((theme-faces (get face 'theme-face)) @@ -1661,8 +1669,7 @@ then the override spec." (setq spec (face-spec-choose (face-default-spec face) frame)) (face-spec-set-2 face frame spec)) (setq spec (face-spec-choose (get face 'face-override-spec) frame)) - (face-spec-set-2 face frame spec)) - (make-face-x-resource-internal face frame)) + (face-spec-set-2 face frame spec))) (defun face-spec-set-2 (face frame spec) "Set the face attributes of FACE on FRAME according to SPEC." -- 1.9.1 --------------070800060109060102040303 Content-Type: text/x-patch; name="0002-lisp-faces.el-Fix-empty-face-handling.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0002-lisp-faces.el-Fix-empty-face-handling.patch" >From 4155005861d68e2bc6a4bf7ec21d308e090e8e39 Mon Sep 17 00:00:00 2001 From: Matthias Dahl Date: Wed, 2 Apr 2014 15:30:01 +0200 Subject: [PATCH 2/4] lisp/faces.el: Fix empty face handling Commit 57becb6238dd612e3bf56bef1608bba9486dcec8 inadvertently broke the handling of empty face specs. If face-spec-choose returned an empty spec (which is valid to do), this was mishandled as a no match found condition and as such, the defface default spec was applied. The bug is twofold: * face-spec-choose maps two valid states onto a single return value (no match and empty face both return as nil). * face-spec-recalc does not differentiate between both cases appropriately. This patch fixes the former by introducing a new optional parameter to face-spec-choose which, if given, is returned if no match was found. Thus the function is completely backwards compatible. The latter is fixed by adapting face-spec-recalc to make use of this new functionality and thus reliably detect if no match was found and only then apply the defface default spec. Fixes bug #16378. --- lisp/faces.el | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/lisp/faces.el b/lisp/faces.el index 7d04938..8536c08 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -1532,13 +1532,15 @@ If FRAME is nil, the current FRAME is used." match)) -(defun face-spec-choose (spec &optional frame) - "Choose the proper attributes for FRAME, out of SPEC. -If SPEC is nil, return nil." +(defun face-spec-choose (spec &optional frame no-match-retval) + "Return the proper attributes for FRAME, out of SPEC. + +If no match is found or SPEC is nil, nil is returned unless NO-MATCH-RETVAL +is given which would then be returned instead." (unless frame (setq frame (selected-frame))) (let ((tail spec) - result defaults) + result defaults match-found) (while tail (let* ((entry (pop tail)) (display (car entry)) @@ -1558,9 +1560,18 @@ If SPEC is nil, return nil." (setq defaults thisval) ;; Otherwise, if it matches, use it. (when (face-spec-set-match-display display frame) - (setq result thisval) - (setq tail nil))))) - (if defaults (append result defaults) result))) + (setq result thisval + tail nil + match-found t))))) + ;; If defaults have been found, it's safe to just append those to the result + ;; list (which at this point will be either nil or contain actual specs) and + ;; return it to the caller. Since there will most definitely be something to + ;; return in this case, there's no need to know/check if a match was found. + (if defaults + (append result defaults) + (if match-found + result + no-match-retval)))) (defun face-spec-reset-face (face &optional frame) @@ -1655,11 +1666,12 @@ After the reset, the specs are applied from the following sources in this order: ;; If FACE is customized or themed, set the custom spec from ;; `theme-face' records. (let ((theme-faces (get face 'theme-face)) + (no-match-found 0) spec theme-face-applied) (if theme-faces (dolist (elt (reverse theme-faces)) - (setq spec (face-spec-choose (cadr elt) frame)) - (when spec + (setq spec (face-spec-choose (cadr elt) frame no-match-found)) + (unless (eq spec no-match-found) (face-spec-set-2 face frame spec) (setq theme-face-applied t)))) ;; If there was a spec applicable to FRAME, that overrides the -- 1.9.1 --------------070800060109060102040303 Content-Type: text/x-patch; name="0003-lisp-faces.el-Centralize-no-init-from-x-resources-ch.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0003-lisp-faces.el-Centralize-no-init-from-x-resources-ch.pa"; filename*1="tch" >From 00e322ce045ce2b678b28dd71eeb5df3085a4a45 Mon Sep 17 00:00:00 2001 From: Matthias Dahl Date: Wed, 2 Apr 2014 15:32:40 +0200 Subject: [PATCH 3/4] lisp/faces.el: Centralize no-init-from-x-resources check logic Centralize the check for inhibit-x-resources directly in make-face-x-resource-internal and remove all redundant checks. Backwards incompatible change: make-face previously accepted no-init-from-resources as an optional parameter which has now been removed. There were no other users within Emacs itself. And this parameter shouldn't have been there in the first place, imho. --- lisp/faces.el | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/lisp/faces.el b/lisp/faces.el index 8536c08..28205d2 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -149,13 +149,10 @@ REGISTRY, ALTERNATIVE1, ALTERNATIVE2, and etc." "Return a list of all defined faces." (mapcar #'car face-new-frame-defaults)) -(defun make-face (face &optional no-init-from-resources) +(defun make-face (face) "Define a new face with name FACE, a symbol. Do not call this directly from Lisp code; use `defface' instead. - -If NO-INIT-FROM-RESOURCES is non-nil, don't initialize face -attributes from X resources. If FACE is already known as a face, -leave it unmodified. Return FACE." +If FACE is already known as a face, leave it unmodified. Return FACE." (interactive (list (read-from-minibuffer "Make face: " nil nil t 'face-name-history))) (unless (facep face) @@ -166,8 +163,7 @@ leave it unmodified. Return FACE." (when (fboundp 'facemenu-add-new-face) (facemenu-add-new-face face)) ;; Define frame-local faces for all frames from X resources. - (unless no-init-from-resources - (make-face-x-resource-internal face))) + (make-face-x-resource-internal face)) face) (defun make-empty-face (face) @@ -175,7 +171,7 @@ leave it unmodified. Return FACE." Do not call this directly from Lisp code; use `defface' instead." (interactive (list (read-from-minibuffer "Make empty face: " nil nil t 'face-name-history))) - (make-face face 'no-init-from-resources)) + (make-face face)) (defun copy-face (old-face new-face &optional frame new-frame) "Define a face named NEW-FACE, which is a copy of OLD-FACE. @@ -354,11 +350,14 @@ specifies an invalid attribute." (defun make-face-x-resource-internal (face &optional frame) "Fill frame-local FACE on FRAME from X resources. -FRAME nil or not specified means do it for all frames." - (if (null frame) - (dolist (frame (frame-list)) - (set-face-attributes-from-resources face frame)) - (set-face-attributes-from-resources face frame))) +FRAME nil or not specified means do it for all frames. + +If `inhibit-x-resources' is t, this will do nothing." + (unless inhibit-x-resources + (if (null frame) + (dolist (frame (frame-list)) + (set-face-attributes-from-resources face frame)) + (set-face-attributes-from-resources face frame)))) @@ -1661,8 +1660,7 @@ After the reset, the specs are applied from the following sources in this order: (while (get face 'face-alias) (setq face (get face 'face-alias))) (face-spec-reset-face face frame) - (unless inhibit-x-resources - (make-face-x-resource-internal face frame)) + (make-face-x-resource-internal face frame) ;; If FACE is customized or themed, set the custom spec from ;; `theme-face' records. (let ((theme-faces (get face 'theme-face)) -- 1.9.1 --------------070800060109060102040303 Content-Type: text/x-patch; name="0004-lisp-faces.el-Fix-reverse-video-for-X-window-system.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0004-lisp-faces.el-Fix-reverse-video-for-X-window-system.pat"; filename*1="ch" >From b2d03ac8f2daf84130378d8dcb36ee1d26b368b0 Mon Sep 17 00:00:00 2001 From: Matthias Dahl Date: Wed, 2 Apr 2014 15:50:42 +0200 Subject: [PATCH 4/4] lisp/faces.el: Fix reverse-video for X window system During frame creation, the initial values for the default face are set-- including swapped fg/bg colors in the reverse-video case. Commit 15e14b165dcbc6566a0459b0d5e66f89080f569e introduced a bug that overwrote those defaults by accident. Previously: If reverse-video was active, the default face was no longer synced with any X resources. The aforementioned commit placed make-face-x-resource-internal in face-spec-recalc and called it unconditionally there, which overwrote, amongst other things, the proper set defaults. To fix this, make-face-x-resource-internal itself has to make sure that fg/bg colors for the default face are swapped appropriately while still syncing with all of the X resources. Fixes bug #16434. --- lisp/faces.el | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/lisp/faces.el b/lisp/faces.el index 28205d2..187702a 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -354,10 +354,13 @@ FRAME nil or not specified means do it for all frames. If `inhibit-x-resources' is t, this will do nothing." (unless inhibit-x-resources - (if (null frame) - (dolist (frame (frame-list)) - (set-face-attributes-from-resources face frame)) - (set-face-attributes-from-resources face frame)))) + (dolist (frame (if (null frame) (frame-list) (list frame))) + (set-face-attributes-from-resources face frame) + (when (and (eq face 'default) + (frame-parameter frame 'reverse)) + (let ((fg (face-attribute face :foreground frame)) + (bg (face-attribute face :background frame))) + (set-face-attribute face frame :foreground bg :background fg)))))) @@ -2063,10 +2066,6 @@ frame parameters in PARAMETERS." (progn ;; Initialize faces from face spec and custom theme. (face-spec-recalc face frame) - ;; X resources for the default face are applied during - ;; `x-create-frame'. - (and (not (eq face 'default)) window-system-p - (make-face-x-resource-internal face frame)) ;; Apply attributes specified by face-new-frame-defaults (internal-merge-in-global-face face frame)) ;; Don't let invalid specs prevent frame creation. -- 1.9.1 --------------070800060109060102040303-- From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 02 12:47:59 2014 Received: (at 16434) by debbugs.gnu.org; 2 Apr 2014 16:47:59 +0000 Received: from localhost ([127.0.0.1]:33188 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WVOKV-0006tW-2H for submit@debbugs.gnu.org; Wed, 02 Apr 2014 12:47:59 -0400 Received: from mail-oa0-f54.google.com ([209.85.219.54]:33416) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WVOKS-0006tK-V8; Wed, 02 Apr 2014 12:47:57 -0400 Received: by mail-oa0-f54.google.com with SMTP id n16so572334oag.41 for ; Wed, 02 Apr 2014 09:47:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=wMGUi5/p34yP2rVosMmTrW3A6kKG3VzqEzcSKUyuyQU=; b=Hq2Og/9WPsAoYtVchmD5pcME2jKDb3gf2S4HBSRhDTEW6kSrUFtUEQqL9lrazBN0SV WDd9Urp2RT4yx6yLk+/Z08FXHJrb10YWIpWbCw9djZqgRh4jYBXvdkqPjBwbD/9I28c8 qqShwpxzsmOSthHym1gT5irfaNo86VaA9GNAaeLDcADWJZ2cdw1K5QvGnVB/wCBIVBfe DX4BZImTwt0uZ1C/CT5QmIvCFf1G5Ug/zrEVA+uZvILmrJnqPXf01XsmC3IwFm2bU7cP RkJFEelFzECvivF7qC6hH8nOLoW3MRiN26U4Nm6FMDg85io0M3jqyFO1h0DF9jue+4/d P+iw== MIME-Version: 1.0 X-Received: by 10.182.118.169 with SMTP id kn9mr1004451obb.46.1396457275878; Wed, 02 Apr 2014 09:47:55 -0700 (PDT) Received: by 10.76.6.44 with HTTP; Wed, 2 Apr 2014 09:47:55 -0700 (PDT) In-Reply-To: <533C26F3.4040600@binary-island.eu> References: <52F601AE.5040309@binary-island.eu> <87k3bj40nu.fsf@cougar.home.aneadesign.com> <83wqfiz36v.fsf@gnu.org> <5331D45B.7090704@binary-island.eu> <5335920F.4030008@binary-island.eu> <533C26F3.4040600@binary-island.eu> Date: Wed, 2 Apr 2014 12:47:55 -0400 Message-ID: Subject: Re: bug#16694: bugs #16694/#16378: Patches From: Barry OReilly To: Matthias Dahl Content-Type: multipart/alternative; boundary=089e0149cdc8dfea5e04f6120b70 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 16434 Cc: 16434@debbugs.gnu.org, Eli Zaretskii , =?ISO-8859-1?Q?Clemens_Sch=FCller?= , Stefan Monnier , 16694@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --089e0149cdc8dfea5e04f6120b70 Content-Type: text/plain; charset=ISO-8859-1 Hi Matthias, thank you for taking the time to update the patch series. Patch 3 undoes something patch 1 introduced, perhaps because you intended a subset of the patches for the emacs-24 branch and the rest for trunk? Could you clarify that? I applied all 4 patches and find './src/emacs -r' works correctly. However, the behavior of './src/emacs -nw -r' is different from emacs-24.3. I have my gnome-terminal configured to white on black, so 24.3's './src/emacs -nw -r' starts with white background. With your patch, './src/emacs -nw -r' starts with black background. Not that I mind the -nw behavior, but I suspect the behavioral difference is unintended. + (when (and (eq face 'default) + (frame-parameter frame 'reverse)) + (let ((fg (face-attribute face :foreground frame)) + (bg (face-attribute face :background frame))) + (set-face-attribute face frame :foreground bg :background fg)))))) Wouldn't there already be a place in code responsible for the swap? (x-handle-reverse-video and tty-handle-reverse-video?) I'm unsure why the fix would entail a new place in code responsible for it. For my information, could you confirm the effect my patch has on your theme problem? --089e0149cdc8dfea5e04f6120b70 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable
Hi Matthias, thank you for taking the time to update the p= atch series.

Patch 3 undoes something patch 1 introduced, perhaps be= cause you
intended a subset of the patches for the emacs-24 branch and t= he rest
for trunk? Could you clarify that?

I applied all 4 patches and find = './src/emacs -r' works correctly.
However, the behavior of '= ./src/emacs -nw -r' is different from
emacs-24.3. I have my gnome-te= rminal configured to white on black, so
24.3's './src/emacs -nw -r' starts with white background. With = your
patch, './src/emacs -nw -r' starts with black background. N= ot that I
mind the -nw behavior, but I suspect the behavioral difference= is
unintended.

+=A0=A0=A0=A0=A0 (when (and (eq face 'default)
+= =A0=A0=A0 =A0=A0=A0 =A0(frame-parameter frame 'reverse))
+=A0=A0=A0= =A0=A0=A0=A0 (let ((fg (face-attribute face :foreground frame))
+=A0=A0= =A0 =A0=A0=A0=A0=A0 (bg (face-attribute face :background frame)))
+=A0=A0=A0 =A0 (set-face-attribute face frame :foreground bg :background fg= ))))))

Wouldn't there already be a place in code responsible for= the swap?
(x-handle-reverse-video and tty-handle-reverse-video?) I'= m unsure why
the fix would entail a new place in code responsible for it.

For my = information, could you confirm the effect my patch has on your
theme pro= blem?

--089e0149cdc8dfea5e04f6120b70-- From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 02 14:36:17 2014 Received: (at 16434) by debbugs.gnu.org; 2 Apr 2014 18:36:17 +0000 Received: from localhost ([127.0.0.1]:33263 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WVQ1H-0002Qf-Ao for submit@debbugs.gnu.org; Wed, 02 Apr 2014 14:36:15 -0400 Received: from hemera.binary-island.eu ([97.107.138.233]:53510) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WVQ1D-0002QR-ID; Wed, 02 Apr 2014 14:36:12 -0400 Received: from [10.0.0.20] (95-90-43-88-dynip.superkabel.de [95.90.43.88]) (using TLSv1 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by hemera.binary-island.eu (Postfix) with ESMTPSA id DE0E73C0D5; Wed, 2 Apr 2014 14:42:33 -0400 (EDT) Message-ID: <533C5898.9000200@binary-island.eu> Date: Wed, 02 Apr 2014 20:36:08 +0200 From: Matthias Dahl User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 MIME-Version: 1.0 To: Barry OReilly Subject: Re: bug#16694: bugs #16694/#16378: Patches References: <52F601AE.5040309@binary-island.eu> <87k3bj40nu.fsf@cougar.home.aneadesign.com> <83wqfiz36v.fsf@gnu.org> <5331D45B.7090704@binary-island.eu> <5335920F.4030008@binary-island.eu> <533C26F3.4040600@binary-island.eu> In-Reply-To: Content-Type: multipart/mixed; boundary="------------020509080507060603070803" X-Spam-Score: -0.6 (/) X-Debbugs-Envelope-To: 16434 Cc: 16434@debbugs.gnu.org, Eli Zaretskii , =?ISO-8859-1?Q?Clemens_Sch=FCller?= , Stefan Monnier , 16694@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.6 (/) This is a multi-part message in MIME format. --------------020509080507060603070803 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Hello Barry, I'm on the run but I wanted to answer you this very day, so please excuse my brief mail. :( > Patch 3 undoes something patch 1 introduced, perhaps because you > intended a subset of the patches for the emacs-24 branch and the rest > for trunk? Could you clarify that? Thanks for taking a closer look. :) I usually write small contained patches which work iteratively together which makes it a lot easier to track down bugs at a later stage with git bisect or whatever. So sometimes patch x introduces something that is needed for problem x which patch x+1 slightly modifies or revises to solve problem x+1. :) > For my information, could you confirm the effect my patch has on your > theme problem? I'm sorry but you lost me there. Could you please elaborate more what it is you want me to comment on? Sorry... and thanks. Last but not least: Attached you find a new patch for the problem which is still the fourth in the series but since the last 3 haven't changed, those are omitted from this mail but still required. The patch basically restores the behavior (wrt reverse video) to what Emacs 24.3 did without undoing any of the other work and fixes. I've tested everything as far as I could and all your test cases work just fine on my machine. I hope this one is a keeper. Thanks for testing and your patience. Again, sorry for the short mail. So long, Matthias -- Dipl.-Inf. (FH) Matthias Dahl | Software Engineer | binary-island.eu services: custom software [desktop, mobile, web], server administration --------------020509080507060603070803 Content-Type: text/x-patch; name="0004-lisp-faces.el-Fix-reverse-video-for-X-window-system.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0004-lisp-faces.el-Fix-reverse-video-for-X-window-system.pat"; filename*1="ch" >From 921a907b9ccf990bb0885160fde37a173d237c22 Mon Sep 17 00:00:00 2001 From: Matthias Dahl Date: Wed, 2 Apr 2014 15:50:42 +0200 Subject: [PATCH 4/4] lisp/faces.el: Fix reverse-video for X window system During frame creation, the initial values for the default face are set-- including swapped fg/bg colors in the reverse-video case. Commit 15e14b165dcbc6566a0459b0d5e66f89080f569e introduced a bug that overwrote those defaults by accident. Previously: If reverse-video was active, the default face was no longer synced with any X resources. The aforementioned commit placed make-face-x-resource-internal in face-spec-recalc and called it unconditionally there, which overwrote, amongst other things, the proper set defaults. To fix this, make-face-x-resource-internal now makes sure that it doesn't touch the default face if reversed video is given-- as it was done previously. Fixes bug #16434. --- lisp/faces.el | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/lisp/faces.el b/lisp/faces.el index 28205d2..f14ffc7 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -354,10 +354,12 @@ FRAME nil or not specified means do it for all frames. If `inhibit-x-resources' is t, this will do nothing." (unless inhibit-x-resources - (if (null frame) - (dolist (frame (frame-list)) - (set-face-attributes-from-resources face frame)) - (set-face-attributes-from-resources face frame)))) + (dolist (frame (if (null frame) (frame-list) (list frame))) + ;; `x-create-frame' already took care of correctly handling + ;; the reverse video case-- do _not_ touch the default face + (unless (and (eq face 'default) + (frame-parameter frame 'reverse)) + (set-face-attributes-from-resources face frame))))) @@ -2063,10 +2065,6 @@ frame parameters in PARAMETERS." (progn ;; Initialize faces from face spec and custom theme. (face-spec-recalc face frame) - ;; X resources for the default face are applied during - ;; `x-create-frame'. - (and (not (eq face 'default)) window-system-p - (make-face-x-resource-internal face frame)) ;; Apply attributes specified by face-new-frame-defaults (internal-merge-in-global-face face frame)) ;; Don't let invalid specs prevent frame creation. -- 1.9.1 --------------020509080507060603070803-- From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 02 15:35:05 2014 Received: (at 16434) by debbugs.gnu.org; 2 Apr 2014 19:35:05 +0000 Received: from localhost ([127.0.0.1]:33293 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WVQwC-000425-3L for submit@debbugs.gnu.org; Wed, 02 Apr 2014 15:35:04 -0400 Received: from mail-oa0-f45.google.com ([209.85.219.45]:65003) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WVQw8-00041R-4z; Wed, 02 Apr 2014 15:35:00 -0400 Received: by mail-oa0-f45.google.com with SMTP id eb12so843515oac.18 for ; Wed, 02 Apr 2014 12:34:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=oxoFMRLHsUvBcpksIoZPMFUGXj3YL3AcSFDqE7+kVL8=; b=JQZcxy/C0Zcc0XA5TAgjYLzeExhYME8VUGIUaKMEMNOSv1o+Gl9c7TRpEhtJF5XI9U KT6KOQqlDMBD7ticrJiwWcnoR5mjcGn3QyDnD8QhfPRFV4ks/0XGbU5hXwHwNPvYpdYl fxmJcQ1j4lCGAYHJa/nn/WB/NhMG3pWapsVbfpxHlgdP/+rW3OhbedbH7CNmlEjaYxOM J8ahwHLJVD5Pu8DeX+DZTAXwJDpHqsmYbaNCsiVAAr9nLKMGYViAEf5i7qGaabxQxii5 YLyTEpDYbZzx8ZEegOMlvEotsGGIc5GJpFe52+vCbGCSOqiuWztJOdbcBR0peqMCu1FA 1QJQ== MIME-Version: 1.0 X-Received: by 10.60.125.72 with SMTP id mo8mr1677978oeb.36.1396467299121; Wed, 02 Apr 2014 12:34:59 -0700 (PDT) Received: by 10.76.6.44 with HTTP; Wed, 2 Apr 2014 12:34:59 -0700 (PDT) In-Reply-To: <533C5898.9000200@binary-island.eu> References: <52F601AE.5040309@binary-island.eu> <87k3bj40nu.fsf@cougar.home.aneadesign.com> <83wqfiz36v.fsf@gnu.org> <5331D45B.7090704@binary-island.eu> <5335920F.4030008@binary-island.eu> <533C26F3.4040600@binary-island.eu> <533C5898.9000200@binary-island.eu> Date: Wed, 2 Apr 2014 15:34:59 -0400 Message-ID: Subject: Re: bug#16694: bugs #16694/#16378: Patches From: Barry OReilly To: Matthias Dahl Content-Type: text/plain; charset=ISO-8859-1 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 16434 Cc: 16434@debbugs.gnu.org, Eli Zaretskii , =?ISO-8859-1?Q?Clemens_Sch=FCller?= , Stefan Monnier , 16694@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) >> For my information, could you confirm the effect my patch has on >> your theme problem? > I'm sorry but you lost me there. Could you please elaborate more > what it is you want me to comment on? Sorry... and thanks. I wanted to know if the following happened to fix the problem described at http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16694#5 : diff --git a/lisp/faces.el b/lisp/faces.el index e008993..2f8560a 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -1615,7 +1615,8 @@ function for its other effects." ;; Initialize the face if it does not exist, then recalculate. (make-empty-face face) (dolist (frame (frame-list)) - (face-spec-recalc face frame))) + (face-spec-recalc face frame) + (make-face-x-resource-internal face frame))) (defun face-spec-recalc (face frame) "Reset the face attributes of FACE on FRAME according to its specs. @@ -1641,8 +1642,7 @@ then the override spec." (setq spec (face-spec-choose (face-default-spec face) frame)) (face-spec-set-2 face frame spec)) (setq spec (face-spec-choose (get face 'face-override-spec) frame)) - (face-spec-set-2 face frame spec)) - (make-face-x-resource-internal face frame)) + (face-spec-set-2 face frame spec))) (defun face-spec-set-2 (face frame spec) "Set the face attributes of FACE on FRAME according to SPEC." > The patch basically restores the behavior (wrt reverse video) to > what Emacs 24.3 did without undoing any of the other work and fixes. > I've tested everything as far as I could and all your test cases > work just fine on my machine. Confirmed, thanks. I have no further objections to the patch series. Thank you for the work you put into it. From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 05 03:52:44 2014 Received: (at 16434-done) by debbugs.gnu.org; 5 Apr 2014 07:52:44 +0000 Received: from localhost ([127.0.0.1]:35845 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WWLP9-0007u4-JR for submit@debbugs.gnu.org; Sat, 05 Apr 2014 03:52:44 -0400 Received: from mtaout20.012.net.il ([80.179.55.166]:45778) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WWLP3-0007tf-Ga; Sat, 05 Apr 2014 03:52:39 -0400 Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0N3J00H00SDBOH00@a-mtaout20.012.net.il>; Sat, 05 Apr 2014 10:52:35 +0300 (IDT) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0N3J00H6TSJNBX80@a-mtaout20.012.net.il>; Sat, 05 Apr 2014 10:52:35 +0300 (IDT) Date: Sat, 05 Apr 2014 10:52:54 +0300 From: Eli Zaretskii Subject: Re: bug#16694: bugs #16694/#16378: Patches In-reply-to: <533C26F3.4040600@binary-island.eu> X-012-Sender: halo1@inter.net.il To: Matthias Dahl Message-id: <83lhvk8b6x.fsf@gnu.org> MIME-version: 1.0 Content-type: text/plain; charset=iso-8859-1 Content-transfer-encoding: 8BIT References: <52F601AE.5040309@binary-island.eu> <87k3bj40nu.fsf@cougar.home.aneadesign.com> <83wqfiz36v.fsf@gnu.org> <5331D45B.7090704@binary-island.eu> <5335920F.4030008@binary-island.eu> <533C26F3.4040600@binary-island.eu> X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 16434-done Cc: 16434-done@debbugs.gnu.org, gundaetiapo@gmail.com, monnier@iro.umontreal.ca, 16378-done@debbugs.gnu.org, cs.mlists+bug-gnu-emacs@mailbox.org, 16694-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: Eli Zaretskii List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) > Date: Wed, 02 Apr 2014 17:04:19 +0200 > From: Matthias Dahl > CC: Clemens Schüller > , 16694@debbugs.gnu.org, > Stefan Monnier , > Eli Zaretskii , 16434@debbugs.gnu.org > > Like promised, attached revised versions of my first three patches which > had a nasty and very embarrassing bug/brain-fart as well as a potential > fix for bug #16434. > > I'd appreciate testing and any feedback, so that we (as in who ever is > in charge and can do this) commit this for the pretest. :) Thanks. I applied to the emacs-24 branch the first 2 patches, the part of the 3rd patch that does not introduce backward incompatibilities, and the 4th patch you sent in a later message. Please confirm that the result will DTRT. Meanwhile, I'm marking those bugs as "done". In the future, please also provide ChangeLog entries for the changes that could be dropped into the respective ChangeLog files. TIA. The incompatible part of the 3rd patch, reproduced below, remains uncommitted. I understand the motivation for it, but the emacs-24 branch shouldn't introduce incompatible changes at this time. If Stefan agrees with applying this part to the trunk, I will do that. ============================================================ Backwards incompatible change: make-face previously accepted no-init-from-resources as an optional parameter which has now been removed. There were no other users within Emacs itself. And this parameter shouldn't have been there in the first place, imho. diff --git a/lisp/faces.el b/lisp/faces.el index 8536c08..28205d2 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -149,13 +149,10 @@ REGISTRY, ALTERNATIVE1, ALTERNATIVE2, and etc." "Return a list of all defined faces." (mapcar #'car face-new-frame-defaults)) -(defun make-face (face &optional no-init-from-resources) +(defun make-face (face) "Define a new face with name FACE, a symbol. Do not call this directly from Lisp code; use `defface' instead. - -If NO-INIT-FROM-RESOURCES is non-nil, don't initialize face -attributes from X resources. If FACE is already known as a face, -leave it unmodified. Return FACE." +If FACE is already known as a face, leave it unmodified. Return FACE." (interactive (list (read-from-minibuffer "Make face: " nil nil t 'face-name-history))) (unless (facep face) @@ -166,8 +163,7 @@ leave it unmodified. Return FACE." (when (fboundp 'facemenu-add-new-face) (facemenu-add-new-face face)) ;; Define frame-local faces for all frames from X resources. - (unless no-init-from-resources - (make-face-x-resource-internal face))) + (make-face-x-resource-internal face)) face) (defun make-empty-face (face) @@ -175,7 +171,7 @@ leave it unmodified. Return FACE." Do not call this directly from Lisp code; use `defface' instead." (interactive (list (read-from-minibuffer "Make empty face: " nil nil t 'face-name-history))) - (make-face face 'no-init-from-resources)) + (make-face face)) (defun copy-face (old-face new-face &optional frame new-frame) "Define a face named NEW-FACE, which is a copy of OLD-FACE. From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 05 11:48:58 2014 Received: (at 16434-done) by debbugs.gnu.org; 5 Apr 2014 15:48:59 +0000 Received: from localhost ([127.0.0.1]:36970 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WWSq2-0006Ts-5F for submit@debbugs.gnu.org; Sat, 05 Apr 2014 11:48:58 -0400 Received: from chene.dit.umontreal.ca ([132.204.246.20]:35064) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WWSq0-0006TZ-1I; Sat, 05 Apr 2014 11:48:56 -0400 Received: from pastel.home (lechon.iro.umontreal.ca [132.204.27.242]) by chene.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id s35FmpPN003140; Sat, 5 Apr 2014 11:48:51 -0400 Received: by pastel.home (Postfix, from userid 20848) id DFAAA60125; Sat, 5 Apr 2014 11:48:50 -0400 (EDT) From: Stefan Monnier To: Eli Zaretskii Subject: Re: bug#16694: bugs #16694/#16378: Patches Message-ID: References: <52F601AE.5040309@binary-island.eu> <87k3bj40nu.fsf@cougar.home.aneadesign.com> <83wqfiz36v.fsf@gnu.org> <5331D45B.7090704@binary-island.eu> <5335920F.4030008@binary-island.eu> <533C26F3.4040600@binary-island.eu> <83lhvk8b6x.fsf@gnu.org> Date: Sat, 05 Apr 2014 11:48:50 -0400 In-Reply-To: <83lhvk8b6x.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 05 Apr 2014 10:52:54 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV4903=0 X-NAI-Spam-Version: 2.3.0.9378 : core <4903> : inlines <692> : streams <1152654> : uri <1721263> X-Spam-Score: -1.9 (-) X-Debbugs-Envelope-To: 16434-done Cc: Matthias Dahl , 16434-done@debbugs.gnu.org, gundaetiapo@gmail.com, 16378-done@debbugs.gnu.org, cs.mlists+bug-gnu-emacs@mailbox.org, 16694-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.9 (-) > Backwards incompatible change: make-face previously accepted > no-init-from-resources as an optional parameter which has now > been removed. There were no other users within Emacs itself. And this > parameter shouldn't have been there in the first place, imho. It's kind of late for 24.4, but it looks like a good API cleanup, so I think it's OK, tho in the 24.4 branch, please keep the optional parameter and use it to signal a warning. Stefan From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 05 12:16:02 2014 Received: (at 16434-done) by debbugs.gnu.org; 5 Apr 2014 16:16:02 +0000 Received: from localhost ([127.0.0.1]:37004 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WWTGD-0008NZ-U2 for submit@debbugs.gnu.org; Sat, 05 Apr 2014 12:16:02 -0400 Received: from mtaout23.012.net.il ([80.179.55.175]:58470) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WWTG9-0008N0-LW; Sat, 05 Apr 2014 12:15:58 -0400 Received: from conversion-daemon.a-mtaout23.012.net.il by a-mtaout23.012.net.il (HyperSendmail v2007.08) id <0N3K00C00FLRBM00@a-mtaout23.012.net.il>; Sat, 05 Apr 2014 19:15:56 +0300 (IDT) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout23.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0N3K00C4YFUJ8D70@a-mtaout23.012.net.il>; Sat, 05 Apr 2014 19:15:56 +0300 (IDT) Date: Sat, 05 Apr 2014 19:15:53 +0300 From: Eli Zaretskii Subject: Re: bug#16694: bugs #16694/#16378: Patches In-reply-to: X-012-Sender: halo1@inter.net.il To: Stefan Monnier Message-id: <83a9bz92h2.fsf@gnu.org> References: <52F601AE.5040309@binary-island.eu> <87k3bj40nu.fsf@cougar.home.aneadesign.com> <83wqfiz36v.fsf@gnu.org> <5331D45B.7090704@binary-island.eu> <5335920F.4030008@binary-island.eu> <533C26F3.4040600@binary-island.eu> <83lhvk8b6x.fsf@gnu.org> X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 16434-done Cc: ml_emacs-lists@binary-island.eu, 16434-done@debbugs.gnu.org, gundaetiapo@gmail.com, 16378-done@debbugs.gnu.org, cs.mlists+bug-gnu-emacs@mailbox.org, 16694-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: Eli Zaretskii List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) > From: Stefan Monnier > Cc: Matthias Dahl , gundaetiapo@gmail.com, > cs.mlists+bug-gnu-emacs@mailbox.org, 16694-done@debbugs.gnu.org, > 16434-done@debbugs.gnu.org, 16378-done@debbugs.gnu.org > Date: Sat, 05 Apr 2014 11:48:50 -0400 > > > Backwards incompatible change: make-face previously accepted > > no-init-from-resources as an optional parameter which has now > > been removed. There were no other users within Emacs itself. And this > > parameter shouldn't have been there in the first place, imho. > > It's kind of late for 24.4, but it looks like a good API cleanup, so > I think it's OK, tho in the 24.4 branch, please keep the optional > parameter and use it to signal a warning. Mathias, could you please prepare 2 patches along these lines, one for the trunk, the other for the emacs-24 branch? Thanks. From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 07 05:58:10 2014 Received: (at 16434-done) by debbugs.gnu.org; 7 Apr 2014 09:58:10 +0000 Received: from localhost ([127.0.0.1]:38780 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WX6Jd-0000tn-TP for submit@debbugs.gnu.org; Mon, 07 Apr 2014 05:58:10 -0400 Received: from hemera.binary-island.eu ([97.107.138.233]:36122) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WX6Ja-0000tN-4w; Mon, 07 Apr 2014 05:58:06 -0400 Received: from [10.0.0.20] (95-90-43-88-dynip.superkabel.de [95.90.43.88]) (using TLSv1 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by hemera.binary-island.eu (Postfix) with ESMTPSA id 779A33C0D5; Mon, 7 Apr 2014 06:04:34 -0400 (EDT) Message-ID: <534276AA.2030203@binary-island.eu> Date: Mon, 07 Apr 2014 11:58:02 +0200 From: Matthias Dahl User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 MIME-Version: 1.0 To: Eli Zaretskii , Stefan Monnier Subject: Re: bug#16694: bugs #16694/#16378: Patches References: <52F601AE.5040309@binary-island.eu> <87k3bj40nu.fsf@cougar.home.aneadesign.com> <83wqfiz36v.fsf@gnu.org> <5331D45B.7090704@binary-island.eu> <5335920F.4030008@binary-island.eu> <533C26F3.4040600@binary-island.eu> <83lhvk8b6x.fsf@gnu.org> <83a9bz92h2.fsf@gnu.org> In-Reply-To: <83a9bz92h2.fsf@gnu.org> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Spam-Score: -0.3 (/) X-Debbugs-Envelope-To: 16434-done Cc: gundaetiapo@gmail.com, 16434-done@debbugs.gnu.org, cs.mlists+bug-gnu-emacs@mailbox.org, 16378-done@debbugs.gnu.org, 16694-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.3 (/) Hi... > Mathias, could you please prepare 2 patches along these lines, one for > the trunk, the other for the emacs-24 branch? Thanks. > Sure. I'll prepare something tomorrow or Wednesday at the latest. Thanks for applying the patches, btw. :) So long, Matthias From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 09 05:49:39 2014 Received: (at 16434-done) by debbugs.gnu.org; 9 Apr 2014 09:49:39 +0000 Received: from localhost ([127.0.0.1]:38456 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WXp8U-0003Rj-8n for submit@debbugs.gnu.org; Wed, 09 Apr 2014 05:49:39 -0400 Received: from hemera.binary-island.eu ([97.107.138.233]:34402) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WXp8P-0003RJ-Kk; Wed, 09 Apr 2014 05:49:34 -0400 Received: from [10.0.0.20] (95-90-43-88-dynip.superkabel.de [95.90.43.88]) (using TLSv1 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by hemera.binary-island.eu (Postfix) with ESMTPSA id D0EAE3C335; Wed, 9 Apr 2014 05:51:00 -0400 (EDT) Message-ID: <534517A5.1070306@binary-island.eu> Date: Wed, 09 Apr 2014 11:49:25 +0200 From: Matthias Dahl User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 MIME-Version: 1.0 To: Eli Zaretskii , Stefan Monnier Subject: Re: bug#16694: bugs #16694/#16378: Patches References: <52F601AE.5040309@binary-island.eu> <87k3bj40nu.fsf@cougar.home.aneadesign.com> <83wqfiz36v.fsf@gnu.org> <5331D45B.7090704@binary-island.eu> <5335920F.4030008@binary-island.eu> <533C26F3.4040600@binary-island.eu> <83lhvk8b6x.fsf@gnu.org> <83a9bz92h2.fsf@gnu.org> In-Reply-To: <83a9bz92h2.fsf@gnu.org> Content-Type: multipart/mixed; boundary="------------060102080708020807030402" X-Spam-Score: -0.3 (/) X-Debbugs-Envelope-To: 16434-done Cc: gundaetiapo@gmail.com, 16434-done@debbugs.gnu.org, cs.mlists+bug-gnu-emacs@mailbox.org, 16378-done@debbugs.gnu.org, 16694-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.3 (/) This is a multi-part message in MIME format. --------------060102080708020807030402 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Hello... Attached the promised patches. Deprecation goes to emacs-24, removal to master. And the ChangeLog fix, if nobody minds, to both. :) Hope everything is ok. Thanks for the patience. :) If there is anything else, please let me know. So long, Matthias --------------060102080708020807030402 Content-Type: text/x-patch; name="0001-lisp-ChangeLog-Fix-mail-address-for-entry.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0001-lisp-ChangeLog-Fix-mail-address-for-entry.patch" >From 95dd6855bf10edc770a956031c756de4d2aab0e7 Mon Sep 17 00:00:00 2001 From: Matthias Dahl Date: Wed, 9 Apr 2014 11:44:43 +0200 Subject: [PATCH] lisp/ChangeLog: Fix mail address for entry --- lisp/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5b8e0e9..2dd3e54 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -100,7 +100,7 @@ * help.el (view-lossage): Doc tweak. -2014-04-07 Matthias Dahl +2014-04-07 Matthias Dahl * faces.el (face-spec-recalc): Call make-face-x-resource-internal only when inhibit-x-resources is nil, and do that earlier in the -- 1.9.1 --------------060102080708020807030402 Content-Type: text/x-patch; name="0001-lisp-faces.el-Deprecate-optional-argument-of-make-fa.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0001-lisp-faces.el-Deprecate-optional-argument-of-make-fa.pa"; filename*1="tch" >From 28fd5ca2188a80b18762d4b378e7fef96963615c Mon Sep 17 00:00:00 2001 From: Matthias Dahl Date: Wed, 9 Apr 2014 11:17:37 +0200 Subject: [PATCH] lisp/faces.el: Deprecate optional argument of make-face The conditional application of X resources has been pushed down to make-face-x-resource-internal itself and thus the optional argument is no longer needed nor evaluated. --- lisp/ChangeLog | 7 +++++++ lisp/faces.el | 18 ++++++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 54ac144..58e488c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2014-04-09 Matthias Dahl + + * faces.el (make-face): Deprecate optional argument as it is no + longer needed/used since the conditional X resources handling + has been pushed down to make-face-x-resource-internal itself. + (make-empty-face): Don't pass optional argument to make-face. + 2014-04-09 Dmitry Gutov * progmodes/ruby-mode.el (ruby-font-lock-keywords): Highlight more diff --git a/lisp/faces.el b/lisp/faces.el index e4d8a35..cf571af 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -133,9 +133,11 @@ REGISTRY, ALTERNATIVE1, ALTERNATIVE2, and etc." "Define a new face with name FACE, a symbol. Do not call this directly from Lisp code; use `defface' instead. -If NO-INIT-FROM-RESOURCES is non-nil, don't initialize face -attributes from X resources. If FACE is already known as a face, -leave it unmodified. Return FACE." +If FACE is already known as a face, leave it unmodified. Return FACE. + +NO-INIT-FROM-RESOURCES has been deprecated and is no longer used +and will go away. Handling of conditional X resources application +has been pushed down to make-x-resource-internal itself." (interactive (list (read-from-minibuffer "Make face: " nil nil t 'face-name-history))) (unless (facep face) @@ -146,16 +148,20 @@ leave it unmodified. Return FACE." (when (fboundp 'facemenu-add-new-face) (facemenu-add-new-face face)) ;; Define frame-local faces for all frames from X resources. - (unless no-init-from-resources - (make-face-x-resource-internal face))) + (make-face-x-resource-internal face)) face) +;; Handling of whether to apply X resources or not, has been pushed down +;; to make-face-x-resource-internal itself, thus the optional arg is no +;; longer evaluated at all and going away. +(set-advertised-calling-convention 'make-face '(face) "24.4") + (defun make-empty-face (face) "Define a new, empty face with name FACE. Do not call this directly from Lisp code; use `defface' instead." (interactive (list (read-from-minibuffer "Make empty face: " nil nil t 'face-name-history))) - (make-face face 'no-init-from-resources)) + (make-face face)) (defun copy-face (old-face new-face &optional frame new-frame) "Define a face named NEW-FACE, which is a copy of OLD-FACE. -- 1.9.1 --------------060102080708020807030402 Content-Type: text/x-patch; name="0001-lisp-faces.el-Remove-deprecated-optional-argument-of.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0001-lisp-faces.el-Remove-deprecated-optional-argument-of.pa"; filename*1="tch" >From c8848a3c73f3773bdfcc35d177b0ec0421cfbdfa Mon Sep 17 00:00:00 2001 From: Matthias Dahl Date: Wed, 9 Apr 2014 11:35:22 +0200 Subject: [PATCH] lisp/faces.el: Remove deprecated optional argument of make-face The conditional application of X resources is handled directly by make-face-x-resource-internal since Emacs 24.4 and thus hasn't been evaluated since. Fix make-empty-face to not pass an optional argument to make-face. --- lisp/ChangeLog | 7 +++++++ lisp/faces.el | 11 ++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5b8e0e9..f926d30 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2014-04-07 Matthias Dahl + + * faces.el (make-face): Remove deprecated optional argument. The + conditional application of X resources is handled directly by + make-face-x-resource-internal since Emacs 24.4. + (make-empty-face): Don't pass optional argument to make-face. + 2014-04-09 Daniel Colascione * emacs-lisp/cl-indent.el: Add comment claiming diff --git a/lisp/faces.el b/lisp/faces.el index b2f353d..c2ef62f 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -149,13 +149,11 @@ REGISTRY, ALTERNATIVE1, ALTERNATIVE2, and etc." "Return a list of all defined faces." (mapcar #'car face-new-frame-defaults)) -(defun make-face (face &optional no-init-from-resources) +(defun make-face (face) "Define a new face with name FACE, a symbol. Do not call this directly from Lisp code; use `defface' instead. -If NO-INIT-FROM-RESOURCES is non-nil, don't initialize face -attributes from X resources. If FACE is already known as a face, -leave it unmodified. Return FACE." +If FACE is already known as a face, leave it unmodified. Return FACE." (interactive (list (read-from-minibuffer "Make face: " nil nil t 'face-name-history))) (unless (facep face) @@ -166,8 +164,7 @@ leave it unmodified. Return FACE." (when (fboundp 'facemenu-add-new-face) (facemenu-add-new-face face)) ;; Define frame-local faces for all frames from X resources. - (unless no-init-from-resources - (make-face-x-resource-internal face))) + (make-face-x-resource-internal face)) face) (defun make-empty-face (face) @@ -175,7 +172,7 @@ leave it unmodified. Return FACE." Do not call this directly from Lisp code; use `defface' instead." (interactive (list (read-from-minibuffer "Make empty face: " nil nil t 'face-name-history))) - (make-face face 'no-init-from-resources)) + (make-face face) (defun copy-face (old-face new-face &optional frame new-frame) "Define a face named NEW-FACE, which is a copy of OLD-FACE. -- 1.9.1 --------------060102080708020807030402-- From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 12 10:32:55 2014 Received: (at 16434-done) by debbugs.gnu.org; 12 Apr 2014 14:32:55 +0000 Received: from localhost ([127.0.0.1]:46307 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WYyzG-0007DA-Qw for submit@debbugs.gnu.org; Sat, 12 Apr 2014 10:32:55 -0400 Received: from mtaout21.012.net.il ([80.179.55.169]:65442) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WYyzD-0007Ch-59; Sat, 12 Apr 2014 10:32:52 -0400 Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0N3X009009M1ZH00@a-mtaout21.012.net.il>; Sat, 12 Apr 2014 17:32:44 +0300 (IDT) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0N3X009MN9QKZ800@a-mtaout21.012.net.il>; Sat, 12 Apr 2014 17:32:44 +0300 (IDT) Date: Sat, 12 Apr 2014 17:32:44 +0300 From: Eli Zaretskii Subject: Re: bug#16694: bugs #16694/#16378: Patches In-reply-to: <53492567.4090303@binary-island.eu> X-012-Sender: halo1@inter.net.il To: Matthias Dahl Message-id: <83zjjqsjn7.fsf@gnu.org> References: <52F601AE.5040309@binary-island.eu> <87k3bj40nu.fsf@cougar.home.aneadesign.com> <83wqfiz36v.fsf@gnu.org> <5331D45B.7090704@binary-island.eu> <5335920F.4030008@binary-island.eu> <533C26F3.4040600@binary-island.eu> <83lhvk8b6x.fsf@gnu.org> <83a9bz92h2.fsf@gnu.org> <534517A5.1070306@binary-island.eu> <53492567.4090303@binary-island.eu> X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 16434-done Cc: 16434-done@debbugs.gnu.org, gundaetiapo@gmail.com, monnier@IRO.UMontreal.CA, 16378-done@debbugs.gnu.org, cs.mlists+bug-gnu-emacs@mailbox.org, 16694-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: Eli Zaretskii List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) > Date: Sat, 12 Apr 2014 13:37:11 +0200 > From: Matthias Dahl > CC: gundaetiapo@gmail.com, cs.mlists+bug-gnu-emacs@mailbox.org, > 16694-done@debbugs.gnu.org, 16434-done@debbugs.gnu.org, > 16378-done@debbugs.gnu.org > > Hello Eli... > > Since the pretest is due today, if you get the time, could you apply > those pending patches? Thanks a lot in advance. Done. (Your changes to the trunk didn't compile, so I fixed them.) From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 12 14:32:21 2014 Received: (at 16434-done) by debbugs.gnu.org; 12 Apr 2014 18:32:21 +0000 Received: from localhost ([127.0.0.1]:46430 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WZ2iy-0005mT-Ic for submit@debbugs.gnu.org; Sat, 12 Apr 2014 14:32:20 -0400 Received: from hemera.binary-island.eu ([97.107.138.233]:42171) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WYwFL-0002LH-HI; Sat, 12 Apr 2014 07:37:20 -0400 Received: from [10.0.0.20] (95-90-43-88-dynip.superkabel.de [95.90.43.88]) (using TLSv1 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by hemera.binary-island.eu (Postfix) with ESMTPSA id 0218C3C335; Sat, 12 Apr 2014 07:38:50 -0400 (EDT) Message-ID: <53492567.4090303@binary-island.eu> Date: Sat, 12 Apr 2014 13:37:11 +0200 From: Matthias Dahl User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 MIME-Version: 1.0 To: Eli Zaretskii , Stefan Monnier Subject: Re: bug#16694: bugs #16694/#16378: Patches References: <52F601AE.5040309@binary-island.eu> <87k3bj40nu.fsf@cougar.home.aneadesign.com> <83wqfiz36v.fsf@gnu.org> <5331D45B.7090704@binary-island.eu> <5335920F.4030008@binary-island.eu> <533C26F3.4040600@binary-island.eu> <83lhvk8b6x.fsf@gnu.org> <83a9bz92h2.fsf@gnu.org> <534517A5.1070306@binary-island.eu> In-Reply-To: <534517A5.1070306@binary-island.eu> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Spam-Score: -0.4 (/) X-Debbugs-Envelope-To: 16434-done X-Mailman-Approved-At: Sat, 12 Apr 2014 14:32:15 -0400 Cc: gundaetiapo@gmail.com, 16434-done@debbugs.gnu.org, cs.mlists+bug-gnu-emacs@mailbox.org, 16378-done@debbugs.gnu.org, 16694-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.4 (/) Hello Eli... Since the pretest is due today, if you get the time, could you apply those pending patches? Thanks a lot in advance. Have a nice weekend, Matthias From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 12 14:32:22 2014 Received: (at 16434-done) by debbugs.gnu.org; 12 Apr 2014 18:32:22 +0000 Received: from localhost ([127.0.0.1]:46436 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WZ2j0-0005mo-Ae for submit@debbugs.gnu.org; Sat, 12 Apr 2014 14:32:22 -0400 Received: from hemera.binary-island.eu ([97.107.138.233]:42489) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WYzNT-0007wF-7Q; Sat, 12 Apr 2014 10:57:56 -0400 Received: from [10.0.0.20] (95-90-43-88-dynip.superkabel.de [95.90.43.88]) (using TLSv1 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by hemera.binary-island.eu (Postfix) with ESMTPSA id AC02D3C335; Sat, 12 Apr 2014 10:59:26 -0400 (EDT) Message-ID: <5349546A.4040500@binary-island.eu> Date: Sat, 12 Apr 2014 16:57:46 +0200 From: Matthias Dahl User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 MIME-Version: 1.0 To: Eli Zaretskii Subject: Re: bug#16694: bugs #16694/#16378: Patches References: <52F601AE.5040309@binary-island.eu> <87k3bj40nu.fsf@cougar.home.aneadesign.com> <83wqfiz36v.fsf@gnu.org> <5331D45B.7090704@binary-island.eu> <5335920F.4030008@binary-island.eu> <533C26F3.4040600@binary-island.eu> <83lhvk8b6x.fsf@gnu.org> <83a9bz92h2.fsf@gnu.org> <534517A5.1070306@binary-island.eu> <53492567.4090303@binary-island.eu> <83zjjqsjn7.fsf@gnu.org> In-Reply-To: <83zjjqsjn7.fsf@gnu.org> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Spam-Score: -0.4 (/) X-Debbugs-Envelope-To: 16434-done X-Mailman-Approved-At: Sat, 12 Apr 2014 14:32:15 -0400 Cc: 16434-done@debbugs.gnu.org, gundaetiapo@gmail.com, monnier@IRO.UMontreal.CA, 16378-done@debbugs.gnu.org, cs.mlists+bug-gnu-emacs@mailbox.org, 16694-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.4 (/) Hello Eli... > Done. Thanks. > (Your changes to the trunk didn't compile, so I fixed them.) Sorry about that. I missed a parenthesis. I see that now. I should have made the compile test before sending it but it was such a simple patch which was exactly alike what I used locally against 24.4 and I double-checked it... yeah. :( I appreciate it. And sorry for the screw-up. It won't happen again. Have a nice Sunday, Matthias -- Dipl.-Inf. (FH) Matthias Dahl | Software Engineer | binary-island.eu services: custom software [desktop, mobile, web], server administration From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 23 11:51:46 2014 Received: (at 16434) by debbugs.gnu.org; 23 Apr 2014 15:51:46 +0000 Received: from localhost ([127.0.0.1]:56307 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WczSc-0000mM-7M for submit@debbugs.gnu.org; Wed, 23 Apr 2014 11:51:46 -0400 Received: from mtaout21.012.net.il ([80.179.55.169]:37921) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WczSZ-0000mB-IX for 16434@debbugs.gnu.org; Wed, 23 Apr 2014 11:51:44 -0400 Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0N4H00D00QBVMF00@a-mtaout21.012.net.il> for 16434@debbugs.gnu.org; Wed, 23 Apr 2014 18:51:41 +0300 (IDT) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0N4H00D3AQQ5JN50@a-mtaout21.012.net.il>; Wed, 23 Apr 2014 18:51:41 +0300 (IDT) Date: Wed, 23 Apr 2014 18:51:37 +0300 From: Eli Zaretskii Subject: Re: bug#16694: bugs #16694/#16378: Patches In-reply-to: <5349546A.4040500@binary-island.eu> X-012-Sender: halo1@inter.net.il To: Matthias Dahl Message-id: <83zjjc82nq.fsf@gnu.org> References: <52F601AE.5040309@binary-island.eu> <87k3bj40nu.fsf@cougar.home.aneadesign.com> <83wqfiz36v.fsf@gnu.org> <5331D45B.7090704@binary-island.eu> <5335920F.4030008@binary-island.eu> <533C26F3.4040600@binary-island.eu> <83lhvk8b6x.fsf@gnu.org> <83a9bz92h2.fsf@gnu.org> <534517A5.1070306@binary-island.eu> <53492567.4090303@binary-island.eu> <83zjjqsjn7.fsf@gnu.org> <5349546A.4040500@binary-island.eu> X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 16434 Cc: gundaetiapo@gmail.com, 16434@debbugs.gnu.org, monnier@IRO.UMontreal.CA X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: Eli Zaretskii List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) > Date: Sat, 12 Apr 2014 16:57:46 +0200 > From: Matthias Dahl > Cc: 16434-done@debbugs.gnu.org, gundaetiapo@gmail.com, monnier@IRO.UMontreal.CA, > 16378-done@debbugs.gnu.org, cs.mlists+bug-gnu-emacs@mailbox.org, > 16694-done@debbugs.gnu.org > > Hello Eli... > > > Done. > > Thanks. I'm sorry, but now I see that the fix of this bug caused an adverse side effect: face attributes that are defined in the X resources are now overridden by the face defaults. At least that's what happens on MS-Windows, where we simulate the X resources in w32reg.c. Specifically, in Emacs 24.3, the tool bar has its foreground and background colors set to SystemButtonText and SystemButtonFace, accordingly, as specified in SYSTEM_DEFAULT_RESOURCES defined by w32reg.c. By contrast, in the current pretest, this face has the default foreground and background colors defined by faces.el: (defface tool-bar '((default :box (:line-width 1 :style released-button) :foreground "black") <<<<<<<<<<<<<<<<<<<<<<<<<< (((type x w32 ns) (class color)) :background "grey75") <<<<<<<<<<<<<<<<<<<<<<<<<< This is clearly seen if one tries to customize this face in an Emacs that was started without -Q. I looked at the code, and it seems that the problem is in face-spec-recalc, and the doc string explicitly says that it is the intended behavior: (defun face-spec-recalc (face frame) "Reset the face attributes of FACE on FRAME according to its specs. After the reset, the specs are applied from the following sources in this order: X resources (if applicable) | (theme and user customization) or, if nonexistent or does not match the current frame, (defface default spec) | defface override spec" The code indeed follows the doc string: it first resets the face, then applies the X resources, and then applies either the theme or the default face spec: (face-spec-reset-face face frame) (make-face-x-resource-internal face frame) ;; If FACE is customized or themed, set the custom spec from ;; `theme-face' records. (let ((theme-faces (get face 'theme-face)) (no-match-found 0) spec theme-face-applied) (if theme-faces (dolist (elt (reverse theme-faces)) (setq spec (face-spec-choose (cadr elt) frame no-match-found)) (unless (eq spec no-match-found) (face-spec-set-2 face frame spec) (setq theme-face-applied t)))) ;; If there was a spec applicable to FRAME, that overrides the ;; defface spec entirely (rather than inheriting from it). If ;; there was no spec applicable to FRAME, apply the defface spec. (unless theme-face-applied (setq spec (face-spec-choose (face-default-spec face) frame)) (face-spec-set-2 face frame spec)) (setq spec (face-spec-choose (get face 'face-override-spec) frame)) (face-spec-set-2 face frame spec))) What happens on Windows is that make-face-x-resource-internal indeed picks up the colors specified bu w32reg.c, but then face-spec-set-2 resets the colors to what the defface spec says. Can you or someone else see if setting the colors of the tool-bar face in the X resources on Unix is similarly overridden? I don't understand this logic: resources are a kind of customization, so they should override the default face spec, not the other way around. Am I missing something? This change was done because --reverse-video didn't work, but what does --reverse-video have to do with X resources and their priority in determining the face attributes? Thanks. From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 23 14:11:43 2014 Received: (at 16434) by debbugs.gnu.org; 23 Apr 2014 18:11:43 +0000 Received: from localhost ([127.0.0.1]:56415 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Wd1e2-0005DE-Mo for submit@debbugs.gnu.org; Wed, 23 Apr 2014 14:11:43 -0400 Received: from hemera.binary-island.eu ([97.107.138.233]:58489) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Wd1e0-0005D6-EO for 16434@debbugs.gnu.org; Wed, 23 Apr 2014 14:11:41 -0400 Received: from [10.0.0.20] (95-90-43-88-dynip.superkabel.de [95.90.43.88]) (using TLSv1 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by hemera.binary-island.eu (Postfix) with ESMTPSA id A1FA83C51D; Wed, 23 Apr 2014 14:11:52 -0400 (EDT) Message-ID: <53580259.7010508@binary-island.eu> Date: Wed, 23 Apr 2014 20:11:37 +0200 From: Matthias Dahl User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 MIME-Version: 1.0 To: Eli Zaretskii Subject: Re: bug#16694: bugs #16694/#16378: Patches References: <52F601AE.5040309@binary-island.eu> <87k3bj40nu.fsf@cougar.home.aneadesign.com> <83wqfiz36v.fsf@gnu.org> <5331D45B.7090704@binary-island.eu> <5335920F.4030008@binary-island.eu> <533C26F3.4040600@binary-island.eu> <83lhvk8b6x.fsf@gnu.org> <83a9bz92h2.fsf@gnu.org> <534517A5.1070306@binary-island.eu> <53492567.4090303@binary-island.eu> <83zjjqsjn7.fsf@gnu.org> <5349546A.4040500@binary-island.eu> <83zjjc82nq.fsf@gnu.org> In-Reply-To: <83zjjc82nq.fsf@gnu.org> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 16434 Cc: gundaetiapo@gmail.com, 16434@debbugs.gnu.org, monnier@IRO.UMontreal.CA X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) Hello Eli... If no one else has taken care of this by the weekend, I'll happily take a look then. Right now, I'm really short on time. I'm very sorry. :( I apologize for the short answer in advance... You are right. I looked over the 24.3 sources and also based on what you described, the priority order needs fixing. If I remember correctly though, this is very delicate and simply switching positions will cause other bad side effects. :( > I don't understand this logic: resources are a kind of customization, > so they should override the default face spec, not the other way > around. Am I missing something? When I initially set out to fix those bugs, I researched and, if I do remember correctly, found an old thread where this was discussed and I believe it was settled that Emacs defaults should always prevail. But in hindsight, this makes no sense and I might have gotten things wrong. I would like to remind you that the original and fundamental changes to those functions where done by someone else. IMHO, they cleared a few things up in contrast to 24.3... but introduced several bugs-- like the ones I fixed and the one you are seeing now... unfortunately. > This change was done because --reverse-video didn't work, If you refer to my patches and explicitly moving the X resources stuff at the beginning of face-spec-recalc: Those changes were done because themes were broken. :) The changes I made for the reverse-video stuff should not have caused this side effects and actually brought everything more in line w/ 24.3... if anything else. Like I said, if no one has taken care of this by the weekend, I will gladly have a look and try to fix this as well. Sorry I couldn't be of more help at this time, though. So long, Matthias -- Dipl.-Inf. (FH) Matthias Dahl | Software Engineer | binary-island.eu services: custom software [desktop, mobile, web], server administration From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 23 20:37:02 2014 Received: (at 16434) by debbugs.gnu.org; 24 Apr 2014 00:37:02 +0000 Received: from localhost ([127.0.0.1]:56635 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Wd7ev-0007Uw-T9 for submit@debbugs.gnu.org; Wed, 23 Apr 2014 20:37:02 -0400 Received: from chene.dit.umontreal.ca ([132.204.246.20]:60378) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Wd7eu-0007UX-0K for 16434@debbugs.gnu.org; Wed, 23 Apr 2014 20:37:00 -0400 Received: from ceviche.home (lechon.iro.umontreal.ca [132.204.27.242]) by chene.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id s3O0at1X005290; Wed, 23 Apr 2014 20:36:55 -0400 Received: by ceviche.home (Postfix, from userid 20848) id 801AE66091; Wed, 23 Apr 2014 20:36:55 -0400 (EDT) From: Stefan Monnier To: Matthias Dahl Subject: Re: bug#16694: bugs #16694/#16378: Patches Message-ID: References: <52F601AE.5040309@binary-island.eu> <87k3bj40nu.fsf@cougar.home.aneadesign.com> <83wqfiz36v.fsf@gnu.org> <5331D45B.7090704@binary-island.eu> <5335920F.4030008@binary-island.eu> <533C26F3.4040600@binary-island.eu> <83lhvk8b6x.fsf@gnu.org> <83a9bz92h2.fsf@gnu.org> <534517A5.1070306@binary-island.eu> <53492567.4090303@binary-island.eu> <83zjjqsjn7.fsf@gnu.org> <5349546A.4040500@binary-island.eu> <83zjjc82nq.fsf@gnu.org> <53580259.7010508@binary-island.eu> Date: Wed, 23 Apr 2014 20:36:55 -0400 In-Reply-To: <53580259.7010508@binary-island.eu> (Matthias Dahl's message of "Wed, 23 Apr 2014 20:11:37 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV4921=0 X-NAI-Spam-Version: 2.3.0.9378 : core <4921> : inlines <764> : streams <1165651> : uri <1739023> X-Spam-Score: -2.0 (--) X-Debbugs-Envelope-To: 16434 Cc: Eli Zaretskii , gundaetiapo@gmail.com, 16434@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.0 (--) > If you refer to my patches and explicitly moving the X resources stuff > at the beginning of face-spec-recalc: Those changes were done because > themes were broken. :) The changes I made for the reverse-video stuff > should not have caused this side effects and actually brought everything > more in line w/ 24.3... if anything else. Would it help to turn the X resource settings into a theme which can then be maybe more easily stacked at the right place? Stefan From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 27 04:22:34 2014 Received: (at 16434) by debbugs.gnu.org; 27 Apr 2014 08:22:34 +0000 Received: from localhost ([127.0.0.1]:59511 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WeKM5-0005zw-GR for submit@debbugs.gnu.org; Sun, 27 Apr 2014 04:22:34 -0400 Received: from hemera.binary-island.eu ([97.107.138.233]:38381) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WeKM2-0005zk-Rq for 16434@debbugs.gnu.org; Sun, 27 Apr 2014 04:22:32 -0400 Received: from [10.0.0.20] (95-90-41-152-dynip.superkabel.de [95.90.41.152]) (using TLSv1 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by hemera.binary-island.eu (Postfix) with ESMTPSA id CC58C3C12B; Sun, 27 Apr 2014 04:22:47 -0400 (EDT) Message-ID: <535CBE43.7000803@binary-island.eu> Date: Sun, 27 Apr 2014 10:22:27 +0200 From: Matthias Dahl User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 MIME-Version: 1.0 To: Stefan Monnier Subject: Re: bug#16694: bugs #16694/#16378: Patches References: <52F601AE.5040309@binary-island.eu> <87k3bj40nu.fsf@cougar.home.aneadesign.com> <83wqfiz36v.fsf@gnu.org> <5331D45B.7090704@binary-island.eu> <5335920F.4030008@binary-island.eu> <533C26F3.4040600@binary-island.eu> <83lhvk8b6x.fsf@gnu.org> <83a9bz92h2.fsf@gnu.org> <534517A5.1070306@binary-island.eu> <53492567.4090303@binary-island.eu> <83zjjqsjn7.fsf@gnu.org> <5349546A.4040500@binary-island.eu> <83zjjc82nq.fsf@gnu.org> <53580259.7010508@binary-island.eu> In-Reply-To: Content-Type: multipart/mixed; boundary="------------040804060909020001030908" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 16434 Cc: Eli Zaretskii , gundaetiapo@gmail.com, 16434@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) This is a multi-part message in MIME format. --------------040804060909020001030908 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Hello @all... > Would it help to turn the X resource settings into a theme which can > then be maybe more easily stacked at the right place? Stefan, thanks for the idea. With the way things are currently wired, this would most certainly mess the logic up. :( Eli, could you please test the attached patches? Everything is rather self-explanatory and the fix as simplistic as possible. I tested it for all known possible regressions, but everything works just fine here. It looks like it is the right thing to do (tm). Unfortunately, I was not able to test it on win32 (yeah, I know, sorry) for obvious reasons :) but based on what you said, it should fix the toolbar coloring just fine. If there are no regressions reported from other parties and if it fixes the issues on win32, from my side just go ahead and apply it to master and emacs-24. Hoping very much for positive feedback. ;-) So long, Matthias -- Dipl.-Inf. (FH) Matthias Dahl | Software Engineer | binary-island.eu services: custom software [desktop, mobile, web], server administration --------------040804060909020001030908 Content-Type: text/x-patch; name="emacs24-0001-PATCH-lisp-faces.el-Apply-X-resources-after-defface-.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="emacs24-0001-PATCH-lisp-faces.el-Apply-X-resources-after-def"; filename*1="face-.patch" >From 829b21a2e9cbcdab8d59f9b7f3b87c112088e729 Mon Sep 17 00:00:00 2001 From: Matthias Dahl Date: Sun, 27 Apr 2014 10:03:40 +0200 Subject: [PATCH 4/4] [PATCH] lisp/faces.el: Apply X resources after defface spec Apply X resources only after the the defface spec has been applied. Thus, X resources are no longer overriden by the defface spec which also fixes issues on win32 where the toolbar coloring was wrong because it is set through X resources and was (wrongfully) overriden. --- lisp/ChangeLog | 8 ++++++++ lisp/faces.el | 18 ++++++++++++------ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bcb649f..cfe61ba 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2014-04-27 Matthias Dahl + + * faces.el (face-spec-recalc): Apply X resources only after the + the defface spec has been applied. Thus, X resources are no longer + overriden by the defface spec which also fixes issues on win32 where + the toolbar coloring was wrong because it is set through X resources + and was (wrongfully) overriden. + 2014-04-25 Nicolas Richard * battery.el (battery-update): Handle the case where battery diff --git a/lisp/faces.el b/lisp/faces.el index 88b8748..df31e0d 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -1641,18 +1641,22 @@ function for its other effects." (defun face-spec-recalc (face frame) "Reset the face attributes of FACE on FRAME according to its specs. -After the reset, the specs are applied from the following sources in this order: - X resources (if applicable) +The following sources are applied in this order: + + face reset to default values if it's the default face, otherwise set + to unspecifed (through `face-spec-reset-face`) | (theme and user customization) - or, if nonexistent or does not match the current frame, + or: if none of the above exist, do not match the current frame or + did inherit from the defface spec instead of overwriting it + entirely, the following is applied instead: (defface default spec) + (X resources (if applicable)) | defface override spec" (while (get face 'face-alias) (setq face (get face 'face-alias))) (face-spec-reset-face face frame) - (make-face-x-resource-internal face frame) ;; If FACE is customized or themed, set the custom spec from ;; `theme-face' records. (let ((theme-faces (get face 'theme-face)) @@ -1666,10 +1670,12 @@ After the reset, the specs are applied from the following sources in this order: (setq theme-face-applied t)))) ;; If there was a spec applicable to FRAME, that overrides the ;; defface spec entirely (rather than inheriting from it). If - ;; there was no spec applicable to FRAME, apply the defface spec. + ;; there was no spec applicable to FRAME, apply the defface spec + ;; as well as any applicable X resources. (unless theme-face-applied (setq spec (face-spec-choose (face-default-spec face) frame)) - (face-spec-set-2 face frame spec)) + (face-spec-set-2 face frame spec) + (make-face-x-resource-internal face frame)) (setq spec (face-spec-choose (get face 'face-override-spec) frame)) (face-spec-set-2 face frame spec))) -- 1.9.2 --------------040804060909020001030908 Content-Type: text/x-patch; name="master-0001-lisp-faces.el-Apply-X-resources-after-defface-spec.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="master-0001-lisp-faces.el-Apply-X-resources-after-defface-sp"; filename*1="ec.patch" >From 093207c4c79012615377695eb8eba31283aded5d Mon Sep 17 00:00:00 2001 From: Matthias Dahl Date: Sun, 27 Apr 2014 09:55:51 +0200 Subject: [PATCH] lisp/faces.el: Apply X resources after defface spec Apply X resources only after the the defface spec has been applied. Thus, X resources are no longer overriden by the defface spec which also fixes issues on win32 where the toolbar coloring was wrong because it is set through X resources and was (wrongfully) overriden. --- lisp/ChangeLog | 8 ++++++++ lisp/faces.el | 18 ++++++++++++------ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c81f99e..c982540 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2014-04-27 Matthias Dahl + + * faces.el (face-spec-recalc): Apply X resources only after the + the defface spec has been applied. Thus, X resources are no longer + overriden by the defface spec which also fixes issues on win32 where + the toolbar coloring was wrong because it is set through X resources + and was (wrongfully) overriden. + 2014-04-25 Stefan Monnier * progmodes/perl-mode.el (perl--syntax-exp-intro-regexp): New var. diff --git a/lisp/faces.el b/lisp/faces.el index 9c11547..b58575d 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -1652,18 +1652,22 @@ function for its other effects." (defun face-spec-recalc (face frame) "Reset the face attributes of FACE on FRAME according to its specs. -After the reset, the specs are applied from the following sources in this order: - X resources (if applicable) +The following sources are applied in this order: + + face reset to default values if it's the default face, otherwise set + to unspecifed (through `face-spec-reset-face`) | (theme and user customization) - or, if nonexistent or does not match the current frame, + or: if none of the above exist, do not match the current frame or + did inherit from the defface spec instead of overwriting it + entirely, the following is applied instead: (defface default spec) + (X resources (if applicable)) | defface override spec" (while (get face 'face-alias) (setq face (get face 'face-alias))) (face-spec-reset-face face frame) - (make-face-x-resource-internal face frame) ;; If FACE is customized or themed, set the custom spec from ;; `theme-face' records. (let ((theme-faces (get face 'theme-face)) @@ -1677,10 +1681,12 @@ After the reset, the specs are applied from the following sources in this order: (setq theme-face-applied t)))) ;; If there was a spec applicable to FRAME, that overrides the ;; defface spec entirely (rather than inheriting from it). If - ;; there was no spec applicable to FRAME, apply the defface spec. + ;; there was no spec applicable to FRAME, apply the defface spec + ;; as well as any applicable X resources. (unless theme-face-applied (setq spec (face-spec-choose (face-default-spec face) frame)) - (face-spec-set-2 face frame spec)) + (face-spec-set-2 face frame spec) + (make-face-x-resource-internal face frame)) (setq spec (face-spec-choose (get face 'face-override-spec) frame)) (face-spec-set-2 face frame spec))) -- 1.9.2 --------------040804060909020001030908-- From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 28 12:38:16 2014 Received: (at 16434) by debbugs.gnu.org; 28 Apr 2014 16:38:16 +0000 Received: from localhost ([127.0.0.1]:44054 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WeoZL-0000js-CL for submit@debbugs.gnu.org; Mon, 28 Apr 2014 12:38:15 -0400 Received: from mtaout23.012.net.il ([80.179.55.175]:56810) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WeoZF-0000jH-Q8 for 16434@debbugs.gnu.org; Mon, 28 Apr 2014 12:38:11 -0400 Received: from conversion-daemon.a-mtaout23.012.net.il by a-mtaout23.012.net.il (HyperSendmail v2007.08) id <0N4R006001W6RD00@a-mtaout23.012.net.il> for 16434@debbugs.gnu.org; Mon, 28 Apr 2014 19:38:03 +0300 (IDT) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout23.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0N4R006DT27ERR00@a-mtaout23.012.net.il>; Mon, 28 Apr 2014 19:38:03 +0300 (IDT) Date: Mon, 28 Apr 2014 19:38:08 +0300 From: Eli Zaretskii Subject: Re: bug#16694: bugs #16694/#16378: Patches In-reply-to: <535CBE43.7000803@binary-island.eu> X-012-Sender: halo1@inter.net.il To: Matthias Dahl Message-id: <83a9b5o1e7.fsf@gnu.org> References: <52F601AE.5040309@binary-island.eu> <87k3bj40nu.fsf@cougar.home.aneadesign.com> <83wqfiz36v.fsf@gnu.org> <5331D45B.7090704@binary-island.eu> <5335920F.4030008@binary-island.eu> <533C26F3.4040600@binary-island.eu> <83lhvk8b6x.fsf@gnu.org> <83a9bz92h2.fsf@gnu.org> <534517A5.1070306@binary-island.eu> <53492567.4090303@binary-island.eu> <83zjjqsjn7.fsf@gnu.org> <5349546A.4040500@binary-island.eu> <83zjjc82nq.fsf@gnu.org> <53580259.7010508@binary-island.eu> <535CBE43.7000803@binary-island.eu> X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 16434 Cc: gundaetiapo@gmail.com, monnier@IRO.UMontreal.CA, 16434@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: Eli Zaretskii List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) > Date: Sun, 27 Apr 2014 10:22:27 +0200 > From: Matthias Dahl > CC: Eli Zaretskii , 16434@debbugs.gnu.org, > gundaetiapo@gmail.com > > Eli, could you please test the attached patches? Everything is rather > self-explanatory and the fix as simplistic as possible. I tested it for > all known possible regressions, but everything works just fine here. It > looks like it is the right thing to do (tm). Unfortunately, I was not > able to test it on win32 (yeah, I know, sorry) for obvious reasons :) > but based on what you said, it should fix the toolbar coloring just fine. Unfortunately, it doesn't fix the problem. It looks like the problem is that when make-face-x-resource-internal is called near the end of face-spec-recalc, inhibit-x-resources is already set non-nil, and so make-face-x-resource-internal does nothing. Don't you see the same problem on X if you set emacs.tool-bar.attributeBackground in the X resources? That would allow you to try the change on your system. > If there are no regressions reported from other parties and if it fixes > the issues on win32, from my side just go ahead and apply it to master > and emacs-24. Btw, in the future, you don't need to submit 2 identical patches, just one to the release branch is enough: it will get merged onto the trunk soon enough after being committed to the branch. Thanks. From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 28 14:36:37 2014 Received: (at 16434) by debbugs.gnu.org; 28 Apr 2014 18:36:37 +0000 Received: from localhost ([127.0.0.1]:44121 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WeqPs-0004RN-Of for submit@debbugs.gnu.org; Mon, 28 Apr 2014 14:36:37 -0400 Received: from hemera.binary-island.eu ([97.107.138.233]:41937) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WeqPq-0004R8-B1 for 16434@debbugs.gnu.org; Mon, 28 Apr 2014 14:36:35 -0400 Received: from [10.0.0.20] (95-90-41-152-dynip.superkabel.de [95.90.41.152]) (using TLSv1 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by hemera.binary-island.eu (Postfix) with ESMTPSA id 573683C12B; Mon, 28 Apr 2014 14:36:48 -0400 (EDT) Message-ID: <535E9FAA.9050508@binary-island.eu> Date: Mon, 28 Apr 2014 20:36:26 +0200 From: Matthias Dahl User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 MIME-Version: 1.0 To: Eli Zaretskii Subject: Re: bug#16694: bugs #16694/#16378: Patches References: <52F601AE.5040309@binary-island.eu> <83wqfiz36v.fsf@gnu.org> <5331D45B.7090704@binary-island.eu> <5335920F.4030008@binary-island.eu> <533C26F3.4040600@binary-island.eu> <83lhvk8b6x.fsf@gnu.org> <83a9bz92h2.fsf@gnu.org> <534517A5.1070306@binary-island.eu> <53492567.4090303@binary-island.eu> <83zjjqsjn7.fsf@gnu.org> <5349546A.4040500@binary-island.eu> <83zjjc82nq.fsf@gnu.org> <53580259.7010508@binary-island.eu> <535CBE43.7000803@binary-island.eu> <83a9b5o1e7.fsf@gnu.org> In-Reply-To: <83a9b5o1e7.fsf@gnu.org> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 16434 Cc: gundaetiapo@gmail.com, monnier@IRO.UMontreal.CA, 16434@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) On 28/04/14 18:38, Eli Zaretskii wrote: > Unfortunately, it doesn't fix the problem. It looks like the problem > is that when make-face-x-resource-internal is called near the end of > face-spec-recalc, inhibit-x-resources is already set non-nil, and so > make-face-x-resource-internal does nothing. Ah, that little bit of information I missed. In that case, everything's actually working as intended. If you start Emacs and force it to ignore X resources, it does so entirely and as expected... even more so in 24.4 now. Programmatically "setting" an X resource behind the scenes and expecting it to work even though that very system has been asked to do nothing, is bound to cause trouble. Don't get me wrong, it is still a bug, nevertheless... only it is imho debatable what the root cause really is in this case. The fact that the X resource is not being applied (despite inhibit-x-resources == t) or that the toolbar coloring is changed this way and expected to work at all times, even if inhibit-x-resources == t. > Don't you see the same problem on X if you set > emacs.tool-bar.attributeBackground in the X resources? That would > allow you to try the change on your system. If that would work, I would consider it a bug. If an X resource was applied even though I started Emacs w/ -Q or otherwise set inhibit-... that would very much be a bug. At least imho that is. > Btw, in the future, you don't need to submit 2 identical patches, just > one to the release branch is enough: it will get merged onto the trunk > soon enough after being committed to the branch. Ah, Ok. I'll keep that in mind. Thanks... I'll have a look at this issue sometime later this week or weekend and see what is going on exactly and if there is a way to fix this without actually implementing any exceptions into make-face-x-... or anything alike. Naturally, if someone else wants to take a stab at it who knows more about all those tightly intervened and sneaky parts of the code than I do (that one shouldn't be hard :P), I absolutely won't mind. :-) So long, Matthias -- Dipl.-Inf. (FH) Matthias Dahl | Software Engineer | binary-island.eu services: custom software [desktop, mobile, web], server administration From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 28 15:18:08 2014 Received: (at 16434) by debbugs.gnu.org; 28 Apr 2014 19:18:08 +0000 Received: from localhost ([127.0.0.1]:44141 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Wer43-0005lX-8w for submit@debbugs.gnu.org; Mon, 28 Apr 2014 15:18:07 -0400 Received: from mtaout20.012.net.il ([80.179.55.166]:53916) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Wer3z-0005ku-Rj for 16434@debbugs.gnu.org; Mon, 28 Apr 2014 15:18:05 -0400 Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0N4R00I009I3MO00@a-mtaout20.012.net.il> for 16434@debbugs.gnu.org; Mon, 28 Apr 2014 22:17:56 +0300 (IDT) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0N4R00I2P9LWH440@a-mtaout20.012.net.il>; Mon, 28 Apr 2014 22:17:56 +0300 (IDT) Date: Mon, 28 Apr 2014 22:18:02 +0300 From: Eli Zaretskii Subject: Re: bug#16694: bugs #16694/#16378: Patches In-reply-to: <535E9FAA.9050508@binary-island.eu> X-012-Sender: halo1@inter.net.il To: Matthias Dahl Message-id: <83wqe9mff9.fsf@gnu.org> References: <52F601AE.5040309@binary-island.eu> <83wqfiz36v.fsf@gnu.org> <5331D45B.7090704@binary-island.eu> <5335920F.4030008@binary-island.eu> <533C26F3.4040600@binary-island.eu> <83lhvk8b6x.fsf@gnu.org> <83a9bz92h2.fsf@gnu.org> <534517A5.1070306@binary-island.eu> <53492567.4090303@binary-island.eu> <83zjjqsjn7.fsf@gnu.org> <5349546A.4040500@binary-island.eu> <83zjjc82nq.fsf@gnu.org> <53580259.7010508@binary-island.eu> <535CBE43.7000803@binary-island.eu> <83a9b5o1e7.fsf@gnu.org> <535E9FAA.9050508@binary-island.eu> X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 16434 Cc: gundaetiapo@gmail.com, monnier@IRO.UMontreal.CA, 16434@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: Eli Zaretskii List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) > Date: Mon, 28 Apr 2014 20:36:26 +0200 > From: Matthias Dahl > CC: monnier@IRO.UMontreal.CA, 16434@debbugs.gnu.org, > gundaetiapo@gmail.com > > On 28/04/14 18:38, Eli Zaretskii wrote: > > > Unfortunately, it doesn't fix the problem. It looks like the problem > > is that when make-face-x-resource-internal is called near the end of > > face-spec-recalc, inhibit-x-resources is already set non-nil, and so > > make-face-x-resource-internal does nothing. > > Ah, that little bit of information I missed. In that case, everything's > actually working as intended. If you start Emacs and force it to ignore > X resources, it does so entirely and as expected... even more so in 24.4 > now. Programmatically "setting" an X resource behind the scenes and > expecting it to work even though that very system has been asked to do > nothing, is bound to cause trouble. I'm terribly sorry, it turns out I tested your change incorrectly. I did it correctly this time, and of course the problem is solved. I committed your changes to the emacs-24 branch. Thanks. > I'll have a look at this issue sometime later this week or weekend and > see what is going on exactly and if there is a way to fix this without > actually implementing any exceptions into make-face-x-... or anything > alike. No need, the problem is solved. It was my fault. From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 30 14:34:27 2014 Received: (at 16434) by debbugs.gnu.org; 30 Apr 2014 18:34:27 +0000 Received: from localhost ([127.0.0.1]:46734 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WfZKs-0003k4-Pb for submit@debbugs.gnu.org; Wed, 30 Apr 2014 14:34:27 -0400 Received: from hemera.binary-island.eu ([97.107.138.233]:46905) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WfZKq-0003jo-3v for 16434@debbugs.gnu.org; Wed, 30 Apr 2014 14:34:24 -0400 Received: from [10.0.0.20] (95-90-41-152-dynip.superkabel.de [95.90.41.152]) (using TLSv1 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by hemera.binary-island.eu (Postfix) with ESMTPSA id EB5293C12B; Wed, 30 Apr 2014 14:34:40 -0400 (EDT) Message-ID: <53614228.9020401@binary-island.eu> Date: Wed, 30 Apr 2014 20:34:16 +0200 From: Matthias Dahl User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 MIME-Version: 1.0 To: Eli Zaretskii Subject: Re: bug#16694: bugs #16694/#16378: Patches References: <52F601AE.5040309@binary-island.eu> <83wqfiz36v.fsf@gnu.org> <5331D45B.7090704@binary-island.eu> <5335920F.4030008@binary-island.eu> <533C26F3.4040600@binary-island.eu> <83lhvk8b6x.fsf@gnu.org> <83a9bz92h2.fsf@gnu.org> <534517A5.1070306@binary-island.eu> <53492567.4090303@binary-island.eu> <83zjjqsjn7.fsf@gnu.org> <5349546A.4040500@binary-island.eu> <83zjjc82nq.fsf@gnu.org> <53580259.7010508@binary-island.eu> <535CBE43.7000803@binary-island.eu> <83a9b5o1e7.fsf@gnu.org> <535E9FAA.9050508@binary-island.eu> <83wqe9mff9.fsf@gnu.org> In-Reply-To: <83wqe9mff9.fsf@gnu.org> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 16434 Cc: gundaetiapo@gmail.com, monnier@IRO.UMontreal.CA, 16434@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) Hi Eli... > I'm terribly sorry, it turns out I tested your change incorrectly. Absolutely no need to feel sorry. :) The most important part is... > the problem is solved. ... which is a relieve since I won't have to dig deeper into this. ;-) > I committed your changes to the emacs-24 branch. Thanks. Hopefully we finally caught all the fallout from those changes that went in earlier this year. Keeping my fingers crossed. Have a nice evening, Matthias From unknown Sat Jun 14 03:48:50 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 29 May 2014 11:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator