From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Matthias Dahl Newsgroups: gmane.emacs.bugs Subject: bug#16694: Regression by commit 115663 (bzr): Theme face attributes no longer take precedence over X resources Date: Fri, 14 Feb 2014 20:17:42 +0100 Message-ID: <52FE6BD6.7090607@binary-island.eu> References: <52F601AE.5040309@binary-island.eu> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------040300040101070504080201" X-Trace: ger.gmane.org 1392405491 28303 80.91.229.3 (14 Feb 2014 19:18:11 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 14 Feb 2014 19:18:11 +0000 (UTC) Cc: 16694@debbugs.gnu.org To: Glenn Morris Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Feb 14 20:18:19 2014 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WEOHD-0003h3-5C for geb-bug-gnu-emacs@m.gmane.org; Fri, 14 Feb 2014 20:18:19 +0100 Original-Received: from localhost ([::1]:53481 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WEOHC-0001TK-OR for geb-bug-gnu-emacs@m.gmane.org; Fri, 14 Feb 2014 14:18:18 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58946) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WEOH2-0001Mi-29 for bug-gnu-emacs@gnu.org; Fri, 14 Feb 2014 14:18:16 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WEOGw-00057m-85 for bug-gnu-emacs@gnu.org; Fri, 14 Feb 2014 14:18:08 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:51476) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WEOGw-00057h-4i for bug-gnu-emacs@gnu.org; Fri, 14 Feb 2014 14:18:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1WEOGv-0007Tz-Pa for bug-gnu-emacs@gnu.org; Fri, 14 Feb 2014 14:18:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Matthias Dahl Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 14 Feb 2014 19:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 16694 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 16694-submit@debbugs.gnu.org id=B16694.139240547228747 (code B ref 16694); Fri, 14 Feb 2014 19:18:01 +0000 Original-Received: (at 16694) by debbugs.gnu.org; 14 Feb 2014 19:17:52 +0000 Original-Received: from localhost ([127.0.0.1]:52658 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WEOGl-0007TZ-RI for submit@debbugs.gnu.org; Fri, 14 Feb 2014 14:17:52 -0500 Original-Received: from hemera.binary-island.eu ([97.107.138.233]:37746) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WEOGj-0007TB-K5 for 16694@debbugs.gnu.org; Fri, 14 Feb 2014 14:17:50 -0500 Original-Received: from [10.0.0.20] (95-89-125-72-dynip.superkabel.de [95.89.125.72]) (using TLSv1 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by hemera.binary-island.eu (Postfix) with ESMTPSA id 7AEFD3C0D5; Fri, 14 Feb 2014 14:23:04 -0500 (EST) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 In-Reply-To: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:85596 Archived-At: This is a multi-part message in MIME format. --------------040300040101070504080201 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit On 12/02/14 23:21, Glenn Morris wrote: > Then this is probably the same root issue as > http://debbugs.gnu.org/16434 (and 16440, and 16443, and maybe 16378). More than likely. > There is clearly something going on there that needs to be investigated > before 24.4. The attached patch is what I am using locally and it fixes all problems for me. I also tested bug #16434 and it works fine w/ the patch applied. Basically it puts everything from X resources back to be applied first and everything else on-top. Thus everything else is taking priority. Consider the patch a raw version and a RFC-- missing proper changes to the comments and I'd probably pull the conditional (no-init-from-x-resources) up into make-face-x-resource-internal and change the usage throughout the rest of the file. But I'm not too well versed with Emacs' deep inner workings, and even though it makes sense to me :), I might be completely off and just fixing the symptoms. If so, I'd gladly help in finding the proper root cause and learning a bit more in the process... Hope that helps... Matthias --------------040300040101070504080201 Content-Type: text/plain; charset=UTF-8; name="faces.el.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="faces.el.diff" --- a/lisp/faces.el 2014-02-11 15:36:01.122479000 +0100 +++ b/lisp/faces.el 2014-02-11 15:35:34.305796014 +0100 @@ -1624,6 +1624,8 @@ (while (get face 'face-alias) (setq face (get face 'face-alias))) (face-spec-reset-face face frame) + (unless 'no-init-from-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)) @@ -1641,8 +1643,7 @@ (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." --------------040300040101070504080201--