From unknown Sat Jun 21 10:26:49 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#16694 <16694@debbugs.gnu.org> To: bug#16694 <16694@debbugs.gnu.org> Subject: Status: Regression by commit 115663 (bzr): Theme face attributes no longer take precedence over X resources Reply-To: bug#16694 <16694@debbugs.gnu.org> Date: Sat, 21 Jun 2025 17:26:49 +0000 retitle 16694 Regression by commit 115663 (bzr): Theme face attributes no l= onger take precedence over X resources reassign 16694 emacs submitter 16694 Matthias Dahl severity 16694 important thanks From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 08 14:56:58 2014 Received: (at submit) by debbugs.gnu.org; 8 Feb 2014 19:56:58 +0000 Received: from localhost ([127.0.0.1]:58155 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WCE1J-0000C5-26 for submit@debbugs.gnu.org; Sat, 08 Feb 2014 14:56:58 -0500 Received: from eggs.gnu.org ([208.118.235.92]:49789) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WC4oP-00017k-8F for submit@debbugs.gnu.org; Sat, 08 Feb 2014 05:07:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WC4oH-0005qJ-Rz for submit@debbugs.gnu.org; Sat, 08 Feb 2014 05:07:00 -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 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:35698) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WC4oH-0005qF-PH for submit@debbugs.gnu.org; Sat, 08 Feb 2014 05:06:53 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51481) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WC4oB-0005pS-HC for bug-gnu-emacs@gnu.org; Sat, 08 Feb 2014 05:06:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WC4o5-0005lA-AN for bug-gnu-emacs@gnu.org; Sat, 08 Feb 2014 05:06:47 -0500 Received: from hemera.binary-island.eu ([97.107.138.233]:60511) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WC4o5-0005kz-5l for bug-gnu-emacs@gnu.org; Sat, 08 Feb 2014 05:06:41 -0500 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 2F90D3C0D5 for ; Sat, 8 Feb 2014 05:11:51 -0500 (EST) Message-ID: <52F601AE.5040309@binary-island.eu> Date: Sat, 08 Feb 2014 11:06:38 +0100 From: Matthias Dahl User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 MIME-Version: 1.0 To: bug-gnu-emacs@gnu.org Subject: Regression by commit 115663 (bzr): Theme face attributes no longer take precedence over X resources Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x 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.1 (----) X-Debbugs-Envelope-To: submit X-Mailman-Approved-At: Sat, 08 Feb 2014 14:56:54 -0500 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.1 (----) Hello @all... If a theme changes attributes from the default face for example (like :background), those will shortly flash and then revert back to the default of the current GTK theme, thus leaving the user with a mixed state of the Emacs theme and GTK theme, which is most certainly not intended. This regression was introduced by bzr commit 115663: imho in function face-spec-recalc from faces.el, make-face-x-resource-internal should not be called last, which overrides parts of the theme again with the defaults from the GTK theme. Either commenting that line, or starting emacs with inhibit-x-resources set to true, will work again. With the later though, you naturally loose some other options as well, which is not desirable. (As a side note: It is not properly documented either in the command line help, nor the man pages, that starting emacs with -Q also sets inhibit-x-resources to true.) If more information or help is required, please let me know and I will happily lend a hand or two. :-) INFO from a stripped down Emacs checked out and built moments ago, which (as expected) still has the problem: In GNU Emacs 24.3.50.1 (x86_64-pc-linux-gnu, GTK+ Version 3.10.7) of 2014-02-08 on dreamgate Repository revision: larsi@gnus.org-20140208065815-ie7d8pg17yeaagla Windowing system distributor `The X.Org Foundation', version 11.0.11500000 System Description: NAME=Gentoo Configured using: `configure --prefix=/usr --build=x86_64-pc-linux-gnu --host=x86_64-pc-linux-gnu --mandir=/usr/share/man --infodir=/usr/share/info --datadir=/usr/share --sysconfdir=/etc --localstatedir=/var/lib --libdir=/usr/lib64 --disable-silent-rules --disable-dependency-tracking --program-suffix=-emacs-24-vcs --infodir=/usr/share/info/emacs-24-vcs --enable-locallisppath=/etc/emacs:/usr/share/emacs/site-lisp --with-gameuser=games --without-compress-install --with-file-notification=inotify --enable-acl --with-dbus --without-gnutls --with-gpm --without-hesiod --without-kerberos --without-kerberos5 --with-xml2 --without-selinux --with-wide-int --with-zlib --with-sound=alsa --with-x --without-ns --without-gconf --without-gsettings --without-toolkit-scroll-bars --with-gif --with-jpeg --with-png --with-rsvg --with-tiff --with-xpm --with-imagemagick --with-xft --without-libotf --without-m17n-flt --with-x-toolkit=gtk3 GENTOO_PACKAGE=app-editors/emacs-vcs-24.3.9999 EBZR_BRANCH=trunk EBZR_REVNO=116339 'CFLAGS=-march=native -O2 -pipe' CPPFLAGS= 'LDFLAGS=-Wl,-O1 -Wl,--as-needed -Wl,-O1 -Wl,-z,combreloc -Wl,-z,now'' Important settings: value of $LC_COLLATE: de_DE.utf8 value of $LC_CTYPE: de_DE.utf8 value of $LC_MESSAGES: en_US.utf8 value of $LC_MONETARY: de_DE.utf8 value of $LC_NUMERIC: de_DE.utf8 value of $LC_TIME: en_GB.utf8 value of $LANG: en_US.utf8 locale-coding-system: utf-8-unix Major mode: Fundamental Minor modes in effect: tooltip-mode: t electric-indent-mode: t mouse-wheel-mode: t tool-bar-mode: t menu-bar-mode: t file-name-shadow-mode: t global-font-lock-mode: t blink-cursor-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t buffer-read-only: t line-number-mode: t transient-mark-mode: t Recent input: M-x s e n d - b u g r e p o r t - e Recent messages: For information about GNU Emacs and the GNU system, type C-h C-a. Making completion list... call-interactively: End of buffer [6 times] Load-path shadows: None found. Features: (shadow sort gnus-util mail-extr emacsbug message idna format-spec rfc822 mml mml-sec mm-decode mm-bodies mm-encode mail-parse rfc2231 mailabbrev gmm-utils mailheader sendmail rfc2047 rfc2045 ietf-drums mm-util help-fns mail-prsvr mail-utils help-mode easymenu package site-gentoo time-date tooltip electric uniquify ediff-hook vc-hooks lisp-float-type mwheel x-win x-dnd tool-bar dnd fontset image regexp-opt fringe tabulated-list newcomment lisp-mode prog-mode register page menu-bar rfn-eshadow timer select scroll-bar mouse jit-lock font-lock syntax facemenu font-core frame cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean japanese hebrew greek romanian slovak czech european ethiopic indian cyrillic chinese case-table epa-hook jka-cmpr-hook help simple abbrev minibuffer nadvice loaddefs button faces cus-face macroexp files text-properties overlay sha1 md5 base64 format env code-pages mule custom widget hashtable-print-readable backquote make-network-process dbusbind inotify dynamic-setting font-render-setting move-toolbar gtk x-toolkit x multi-tty emacs) From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 12 17:21:38 2014 Received: (at 16694) by debbugs.gnu.org; 12 Feb 2014 22:21:38 +0000 Received: from localhost ([127.0.0.1]:49412 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WDiBV-00024G-S2 for submit@debbugs.gnu.org; Wed, 12 Feb 2014 17:21:38 -0500 Received: from fencepost.gnu.org ([208.118.235.10]:52310 ident=Debian-exim) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WDiBT-000248-8E for 16694@debbugs.gnu.org; Wed, 12 Feb 2014 17:21:35 -0500 Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1WDiBS-0005Q0-Au; Wed, 12 Feb 2014 17:21:34 -0500 From: Glenn Morris To: Matthias Dahl Subject: Re: bug#16694: Regression by commit 115663 (bzr): Theme face attributes no longer take precedence over X resources References: <52F601AE.5040309@binary-island.eu> X-Spook: Albanian csystems passwd [Hello to all my friends and X-Ran: ,1d$~9`y[yS~Yd7_,@JX~y6N3#7o12@ib=NWf-Gn%Ar-fK0S@!e;*I$++C\"mKbpnoI"R# X-Hue: black X-Debbugs-No-Ack: yes X-Attribution: GM Date: Wed, 12 Feb 2014 17:21:34 -0500 In-Reply-To: <52F601AE.5040309@binary-island.eu> (Matthias Dahl's message of "Sat, 08 Feb 2014 11:06:38 +0100") Message-ID: User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Spam-Score: -5.7 (-----) X-Debbugs-Envelope-To: 16694 Cc: 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: -5.7 (-----) Matthias Dahl wrote: > This regression was introduced by bzr commit 115663: Then this is probably the same root issue as http://debbugs.gnu.org/16434 (and 16440, and 16443, and maybe 16378). There is clearly something going on there that needs to be investigated before 24.4. 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 Fri Feb 14 14:17:52 2014 Received: (at 16694) by debbugs.gnu.org; 14 Feb 2014 19:17:52 +0000 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 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 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) Message-ID: <52FE6BD6.7090607@binary-island.eu> Date: Fri, 14 Feb 2014 20:17:42 +0100 From: Matthias Dahl User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 MIME-Version: 1.0 To: Glenn Morris Subject: Re: bug#16694: Regression by commit 115663 (bzr): Theme face attributes no longer take precedence over X resources References: <52F601AE.5040309@binary-island.eu> In-Reply-To: Content-Type: multipart/mixed; boundary="------------040300040101070504080201" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 16694 Cc: 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 (/) 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-- From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 20 13:27:04 2014 Received: (at 16694) by debbugs.gnu.org; 20 Feb 2014 18:27:04 +0000 Received: from localhost ([127.0.0.1]:33910 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WGYKu-0004Ab-Dh for submit@debbugs.gnu.org; Thu, 20 Feb 2014 13:27:04 -0500 Received: from mtaout21.012.net.il ([80.179.55.169]:54416) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WGYKr-0004A1-Bp for 16694@debbugs.gnu.org; Thu, 20 Feb 2014 13:27:02 -0500 Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0N1B00E004C9PT00@a-mtaout21.012.net.il> for 16694@debbugs.gnu.org; Thu, 20 Feb 2014 20:26:54 +0200 (IST) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0N1B00EM24KUKN80@a-mtaout21.012.net.il>; Thu, 20 Feb 2014 20:26:54 +0200 (IST) Date: Thu, 20 Feb 2014 20:27:08 +0200 From: Eli Zaretskii Subject: Re: bug#16694: Regression by commit 115663 (bzr): Theme face attributes no longer take precedence over X resources In-reply-to: <52FE6BD6.7090607@binary-island.eu> X-012-Sender: halo1@inter.net.il To: Matthias Dahl Message-id: <83txbt4p37.fsf@gnu.org> References: <52F601AE.5040309@binary-island.eu> <52FE6BD6.7090607@binary-island.eu> X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 16694 Cc: rgm@gnu.org, 16694@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: Fri, 14 Feb 2014 20:17:42 +0100 > From: Matthias Dahl > Cc: 16694@debbugs.gnu.org > > 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... Any reasons not to install this? Anybody? From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 20 16:47:36 2014 Received: (at 16694) by debbugs.gnu.org; 20 Feb 2014 21:47:36 +0000 Received: from localhost ([127.0.0.1]:33992 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WGbSx-0001Gp-Mv for submit@debbugs.gnu.org; Thu, 20 Feb 2014 16:47:35 -0500 Received: from mercure.iro.umontreal.ca ([132.204.24.67]:58080) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WGbSv-0001Gh-FP for 16694@debbugs.gnu.org; Thu, 20 Feb 2014 16:47:33 -0500 Received: from hidalgo.iro.umontreal.ca (hidalgo.iro.umontreal.ca [132.204.27.50]) by mercure.iro.umontreal.ca (Postfix) with ESMTP id B863684DCC; Thu, 20 Feb 2014 16:47:31 -0500 (EST) Received: from lechon.iro.umontreal.ca (lechon.iro.umontreal.ca [132.204.27.242]) by hidalgo.iro.umontreal.ca (Postfix) with ESMTP id 27E3F1E5B74; Thu, 20 Feb 2014 16:47:08 -0500 (EST) Received: by lechon.iro.umontreal.ca (Postfix, from userid 20848) id EF840B40E2; Thu, 20 Feb 2014 16:47:07 -0500 (EST) From: Stefan Monnier To: Eli Zaretskii Subject: Re: bug#16694: Regression by commit 115663 (bzr): Theme face attributes no longer take precedence over X resources Message-ID: References: <52F601AE.5040309@binary-island.eu> <52FE6BD6.7090607@binary-island.eu> <83txbt4p37.fsf@gnu.org> Date: Thu, 20 Feb 2014 16:47:07 -0500 In-Reply-To: <83txbt4p37.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 20 Feb 2014 20:27:08 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-DIRO-MailScanner-Information: Please contact the ISP for more information X-DIRO-MailScanner: Found to be clean X-DIRO-MailScanner-SpamCheck: n'est pas un polluriel, SpamAssassin (score=-2.82, requis 5, autolearn=not spam, ALL_TRUSTED -2.82, MC_TSTLAST 0.00) X-DIRO-MailScanner-From: monnier@iro.umontreal.ca X-Spam-Status: No X-Spam-Score: -2.9 (--) X-Debbugs-Envelope-To: 16694 Cc: Matthias Dahl , 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: -2.9 (--) > Any reasons not to install this? Anybody? I don't understand this code nor the change that seems to have broken it, so I neither support nor oppose the change. Does it fix bug#16378 as well? Stefan From debbugs-submit-bounces@debbugs.gnu.org Fri Feb 21 04:07:43 2014 Received: (at 16694) by debbugs.gnu.org; 21 Feb 2014 09:07:43 +0000 Received: from localhost ([127.0.0.1]:34260 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WGm59-0003mi-0N for submit@debbugs.gnu.org; Fri, 21 Feb 2014 04:07:43 -0500 Received: from mtaout27.012.net.il ([80.179.55.183]:44523) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WGm55-0003mP-PO for 16694@debbugs.gnu.org; Fri, 21 Feb 2014 04:07:41 -0500 Received: from conversion-daemon.mtaout27.012.net.il by mtaout27.012.net.il (HyperSendmail v2007.08) id <0N1C00J008V60800@mtaout27.012.net.il> for 16694@debbugs.gnu.org; Fri, 21 Feb 2014 11:05:48 +0200 (IST) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout27.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0N1C00GV399O3S40@mtaout27.012.net.il>; Fri, 21 Feb 2014 11:05:48 +0200 (IST) Date: Fri, 21 Feb 2014 11:07:48 +0200 From: Eli Zaretskii Subject: Re: bug#16694: Regression by commit 115663 (bzr): Theme face attributes no longer take precedence over X resources In-reply-to: X-012-Sender: halo1@inter.net.il To: Stefan Monnier Message-id: <83ppmg4yvv.fsf@gnu.org> References: <52F601AE.5040309@binary-island.eu> <52FE6BD6.7090607@binary-island.eu> <83txbt4p37.fsf@gnu.org> X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 16694 Cc: ml_emacs-lists@binary-island.eu, 16694@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 , 16694@debbugs.gnu.org > Date: Thu, 20 Feb 2014 16:47:07 -0500 > > > Any reasons not to install this? Anybody? > > I don't understand this code nor the change that seems to have broken > it, so I neither support nor oppose the change. If no one objects in a couple of days, I think we should install it. > Does it fix bug#16378 as well? No. From debbugs-submit-bounces@debbugs.gnu.org Fri Feb 21 12:36:55 2014 Received: (at 16694) by debbugs.gnu.org; 21 Feb 2014 17:36:55 +0000 Received: from localhost ([127.0.0.1]:34975 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WGu1v-0001qW-1h for submit@debbugs.gnu.org; Fri, 21 Feb 2014 12:36:55 -0500 Received: from mercure.iro.umontreal.ca ([132.204.24.67]:54977) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WGu1r-0001qN-W4 for 16694@debbugs.gnu.org; Fri, 21 Feb 2014 12:36:52 -0500 Received: from hidalgo.iro.umontreal.ca (hidalgo.iro.umontreal.ca [132.204.27.50]) by mercure.iro.umontreal.ca (Postfix) with ESMTP id EED6B84CA0; Fri, 21 Feb 2014 12:36:50 -0500 (EST) Received: from lechon.iro.umontreal.ca (lechon.iro.umontreal.ca [132.204.27.242]) by hidalgo.iro.umontreal.ca (Postfix) with ESMTP id DA24B1E5913; Fri, 21 Feb 2014 12:36:26 -0500 (EST) Received: by lechon.iro.umontreal.ca (Postfix, from userid 20848) id A5538B40E2; Fri, 21 Feb 2014 12:36:26 -0500 (EST) From: Stefan Monnier To: Eli Zaretskii Subject: Re: bug#16694: Regression by commit 115663 (bzr): Theme face attributes no longer take precedence over X resources Message-ID: References: <52F601AE.5040309@binary-island.eu> <52FE6BD6.7090607@binary-island.eu> <83txbt4p37.fsf@gnu.org> <83ppmg4yvv.fsf@gnu.org> Date: Fri, 21 Feb 2014 12:36:26 -0500 In-Reply-To: <83ppmg4yvv.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 21 Feb 2014 11:07:48 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-DIRO-MailScanner-Information: Please contact the ISP for more information X-DIRO-MailScanner: Found to be clean X-DIRO-MailScanner-SpamCheck: n'est pas un polluriel, SpamAssassin (score=-2.82, requis 5, autolearn=not spam, ALL_TRUSTED -2.82, MC_TSTLAST 0.00) X-DIRO-MailScanner-From: monnier@iro.umontreal.ca X-Spam-Status: No X-Spam-Score: -3.3 (---) X-Debbugs-Envelope-To: 16694 Cc: ml_emacs-lists@binary-island.eu, 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: -3.3 (---) >> Does it fix bug#16378 as well? > No. Bummer! Stefan "who experiences bug#16378 all the time" From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 23 11:46:54 2014 Received: (at 16694) by debbugs.gnu.org; 23 Feb 2014 16:46:54 +0000 Received: from localhost ([127.0.0.1]:36736 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WHcCc-0002Cl-9O for submit@debbugs.gnu.org; Sun, 23 Feb 2014 11:46:54 -0500 Received: from hemera.binary-island.eu ([97.107.138.233]:33835) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WHcCV-0002CL-Fm for 16694@debbugs.gnu.org; Sun, 23 Feb 2014 11:46:48 -0500 Received: from [10.0.0.20] (95-88-237-116-dynip.superkabel.de [95.88.237.116]) (using TLSv1 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by hemera.binary-island.eu (Postfix) with ESMTPSA id BA2983C0D5; Sun, 23 Feb 2014 11:52:13 -0500 (EST) Message-ID: <530A25EF.6080306@binary-island.eu> Date: Sun, 23 Feb 2014 17:46:39 +0100 From: Matthias Dahl User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 MIME-Version: 1.0 To: Eli Zaretskii Subject: Re: bug#16694: Regression by commit 115663 (bzr): Theme face attributes no longer take precedence over X resources References: <52F601AE.5040309@binary-island.eu> <52FE6BD6.7090607@binary-island.eu> <83txbt4p37.fsf@gnu.org> <83ppmg4yvv.fsf@gnu.org> In-Reply-To: <83ppmg4yvv.fsf@gnu.org> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Spam-Score: -0.5 (/) X-Debbugs-Envelope-To: 16694 Cc: 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.5 (/) Hello... Sorry for my late reply. :( > If no one objects in a couple of days, I think we should install it. Good to hear. If you don't mind, I'd like to take a closer look again and probably revise the original comments to match the new behavior. Also, maybe add a second patch to pull the check up into the utility function itself and refactor the few bits and pieces where it is used accordingly. I'll try to get this done within the next few days. > Stefan "who experiences bug#16378 all the time" I had a look at the description of bug #16378 but unfortunately I couldn't make head or tail of it. If you don't mind filling me in, I'd try to track this one down as well. So long, Matthias From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 23 12:18:58 2014 Received: (at 16694) by debbugs.gnu.org; 23 Feb 2014 17:18:58 +0000 Received: from localhost ([127.0.0.1]:36744 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WHche-00033k-50 for submit@debbugs.gnu.org; Sun, 23 Feb 2014 12:18:58 -0500 Received: from mtaout26.012.net.il ([80.179.55.182]:35565) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WHcha-00033U-Mb for 16694@debbugs.gnu.org; Sun, 23 Feb 2014 12:18:56 -0500 Received: from conversion-daemon.mtaout26.012.net.il by mtaout26.012.net.il (HyperSendmail v2007.08) id <0N1G00800L1OHU00@mtaout26.012.net.il> for 16694@debbugs.gnu.org; Sun, 23 Feb 2014 19:16:58 +0200 (IST) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout26.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0N1G00783LCAPI20@mtaout26.012.net.il>; Sun, 23 Feb 2014 19:16:58 +0200 (IST) Date: Sun, 23 Feb 2014 19:18:35 +0200 From: Eli Zaretskii Subject: Re: bug#16694: Regression by commit 115663 (bzr): Theme face attributes no longer take precedence over X resources In-reply-to: <530A25EF.6080306@binary-island.eu> X-012-Sender: halo1@inter.net.il To: Matthias Dahl Message-id: <83zjlh21ec.fsf@gnu.org> References: <52F601AE.5040309@binary-island.eu> <52FE6BD6.7090607@binary-island.eu> <83txbt4p37.fsf@gnu.org> <83ppmg4yvv.fsf@gnu.org> <530A25EF.6080306@binary-island.eu> X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 16694 Cc: monnier@iro.umontreal.ca, 16694@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, 23 Feb 2014 17:46:39 +0100 > From: Matthias Dahl > CC: Stefan Monnier , 16694@debbugs.gnu.org > > > If no one objects in a couple of days, I think we should install it. > > Good to hear. If you don't mind, I'd like to take a closer look again > and probably revise the original comments to match the new behavior. > Also, maybe add a second patch to pull the check up into the utility > function itself and refactor the few bits and pieces where it is used > accordingly. I'll try to get this done within the next few days. Sure, please do, and thanks. > > Stefan "who experiences bug#16378 all the time" > > I had a look at the description of bug #16378 but unfortunately I > couldn't make head or tail of it. If you don't mind filling me in, I'd > try to track this one down as well. You mean, you couldn't reproduce the problem? Or do you mean something else? From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 24 14:29:12 2014 Received: (at 16694) by debbugs.gnu.org; 24 Feb 2014 19:29:13 +0000 Received: from localhost ([127.0.0.1]:38163 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WI1DE-00025b-Ek for submit@debbugs.gnu.org; Mon, 24 Feb 2014 14:29:12 -0500 Received: from hemera.binary-island.eu ([97.107.138.233]:37051) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WI1DC-00025I-N1 for 16694@debbugs.gnu.org; Mon, 24 Feb 2014 14:29:11 -0500 Received: from [10.0.0.20] (95-88-237-116-dynip.superkabel.de [95.88.237.116]) (using TLSv1 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by hemera.binary-island.eu (Postfix) with ESMTPSA id C3A923C0D5; Mon, 24 Feb 2014 14:34:38 -0500 (EST) Message-ID: <530B9D7F.20005@binary-island.eu> Date: Mon, 24 Feb 2014 20:29:03 +0100 From: Matthias Dahl User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 MIME-Version: 1.0 To: Eli Zaretskii Subject: Re: bug#16694: Regression by commit 115663 (bzr): Theme face attributes no longer take precedence over X resources References: <52F601AE.5040309@binary-island.eu> <52FE6BD6.7090607@binary-island.eu> <83txbt4p37.fsf@gnu.org> <83ppmg4yvv.fsf@gnu.org> <530A25EF.6080306@binary-island.eu> <83zjlh21ec.fsf@gnu.org> In-Reply-To: <83zjlh21ec.fsf@gnu.org> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 16694 Cc: monnier@iro.umontreal.ca, 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.0 (/) > You mean, you couldn't reproduce the problem? Or do you mean > something else? Both, actually. :) What I meant was: Since I am still "new" to emacs, I don't know all of its dark corners and functionality. Thus, when I read the bug report done by Stefan, I tried to figure out what was the desired and what was the buggy behavior, all in the context of some functionality that was rather foggy to me. When I tried to reproduce it with my current installation (which has the patch applied), I could not... but I suspect that I just didn't know what to look for or messed up along the road. To make a long story short: If someone could give me a bit more details and background, I'd be more than happy to look into that bug and try to track it down. From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 05 11:14:45 2014 Received: (at 16694) by debbugs.gnu.org; 5 Mar 2014 16:14:45 +0000 Received: from localhost ([127.0.0.1]:51874 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WLESy-0002je-VQ for submit@debbugs.gnu.org; Wed, 05 Mar 2014 11:14:45 -0500 Received: from hemera.binary-island.eu ([97.107.138.233]:34297) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WLESr-0002jI-0m; Wed, 05 Mar 2014 11:14:42 -0500 Received: from [10.0.0.20] (95-90-43-186-dynip.superkabel.de [95.90.43.186]) (using TLSv1 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by hemera.binary-island.eu (Postfix) with ESMTPSA id 972253C0D5; Wed, 5 Mar 2014 11:20:21 -0500 (EST) Message-ID: <53174D6A.7010104@binary-island.eu> Date: Wed, 05 Mar 2014 17:14:34 +0100 From: Matthias Dahl User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 MIME-Version: 1.0 To: 16694@debbugs.gnu.org Subject: bugs #16694/#16378: Patches Content-Type: multipart/mixed; boundary="------------080604090709030908070103" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 16694 Cc: Eli Zaretskii , Stefan Monnier , 16378@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.0 (/) This is a multi-part message in MIME format. --------------080604090709030908070103 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Hello @all. Since bugs #16694 and #16378 are somewhat loosely connected, I am posting this to both. The attached patches have been tested quite a bit locally and especially the fix for #16378 has gone through several revisions to cover all corner cases and side-effects. The first two patches should be quite safe to apply. Naturally I would appreciate any testing and feedback. :) The last patch is not required to fix any bugs (though it might), it just cleans up a bit but introduces a backwards incompatible change on the way which should (imho) not be a problem. That one is more a RFC but works just fine on my system as well and I think applying it to the tree shouldn't be trouble. If there are any questions or problems, please let me know. So long, Matthias --------------080604090709030908070103 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 fc76e8f48a8298c3093df353e048b9a1e996089d Mon Sep 17 00:00:00 2001 From: Matthias Dahl Date: Wed, 5 Mar 2014 10:44:41 +0100 Subject: [PATCH 1/3] 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 e008993..145ac39 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -1619,11 +1619,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 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 +1649,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.0 --------------080604090709030908070103 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 f598a7d85e683c3d99e889bf764435aac3decb80 Mon Sep 17 00:00:00 2001 From: Matthias Dahl Date: Wed, 5 Mar 2014 15:11:32 +0100 Subject: [PATCH 2/3] 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 145ac39..8225048 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -1512,13 +1512,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)) @@ -1538,9 +1540,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) @@ -1635,11 +1646,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.0 --------------080604090709030908070103 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 bc9280d9cab6bb59ad79225f729bfd0ef0d394fa Mon Sep 17 00:00:00 2001 From: Matthias Dahl Date: Wed, 5 Mar 2014 15:50:01 +0100 Subject: [PATCH 3/3] lisp/faces.el: Centralize no-init-from-x-resources check logic Centralize the check for no-init-from-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 8225048..bcb8665 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -129,13 +129,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) @@ -146,8 +143,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) @@ -155,7 +151,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. @@ -334,11 +330,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 `no-init-from-resources' is t, this will do nothing." + (unless (and (boundp 'no-init-from-resources) (no-init-from-resources)) + (if (null frame) + (dolist (frame (frame-list)) + (set-face-attributes-from-resources face frame)) + (set-face-attributes-from-resources face frame)))) @@ -1641,8 +1640,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 no-init-from-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.0 --------------080604090709030908070103-- From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 16 15:13:59 2014 Received: (at 16694) by debbugs.gnu.org; 16 Mar 2014 19:13:59 +0000 Received: from localhost ([127.0.0.1]:38357 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WPGVT-0007jx-6t for submit@debbugs.gnu.org; Sun, 16 Mar 2014 15:13:59 -0400 Received: from hemera.binary-island.eu ([97.107.138.233]:36114) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WPGVQ-0007ji-0X; Sun, 16 Mar 2014 15:13:56 -0400 Received: from [10.0.0.20] (95-90-43-186-dynip.superkabel.de [95.90.43.186]) (using TLSv1 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by hemera.binary-island.eu (Postfix) with ESMTPSA id EAD943C0D5; Sun, 16 Mar 2014 15:19:55 -0400 (EDT) Message-ID: <5325F7F1.1070209@binary-island.eu> Date: Sun, 16 Mar 2014 20:13:53 +0100 From: Matthias Dahl User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 MIME-Version: 1.0 To: 16694@debbugs.gnu.org Subject: Re: bugs #16694/#16378: Patches References: <53174D6A.7010104@binary-island.eu> In-Reply-To: <53174D6A.7010104@binary-island.eu> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 16694 Cc: Eli Zaretskii , Stefan Monnier , 16378@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.0 (/) Hello @all. It's been almost two weeks since I sent the patches with absolute and rather discouraging silence in-between. :-) So I quickly wanted to ask if there is any feedback (whether good or very bad) or something that needs improving? And if there is a chance of getting those fixes applied to the tree? Thanks in advance, Matthias From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 17 10:33:40 2014 Received: (at 16694) by debbugs.gnu.org; 17 Mar 2014 14:33:40 +0000 Received: from localhost ([127.0.0.1]:39058 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WPYbj-0002FU-LM for submit@debbugs.gnu.org; Mon, 17 Mar 2014 10:33:40 -0400 Received: from mtaout20.012.net.il ([80.179.55.166]:59229) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WPYbf-0002FA-KZ; Mon, 17 Mar 2014 10:33:36 -0400 Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0N2L00D004A7LS00@a-mtaout20.012.net.il>; Mon, 17 Mar 2014 16:33:34 +0200 (IST) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0N2L00D7Q4FXMO00@a-mtaout20.012.net.il>; Mon, 17 Mar 2014 16:33:33 +0200 (IST) Date: Mon, 17 Mar 2014 16:33:39 +0200 From: Eli Zaretskii Subject: Re: bugs #16694/#16378: Patches In-reply-to: <5325F7F1.1070209@binary-island.eu> X-012-Sender: halo1@inter.net.il To: Matthias Dahl Message-id: <83eh20c2t8.fsf@gnu.org> References: <53174D6A.7010104@binary-island.eu> <5325F7F1.1070209@binary-island.eu> X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 16694 Cc: 16694@debbugs.gnu.org, 16378@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: Sun, 16 Mar 2014 20:13:53 +0100 > From: Matthias Dahl > CC: 16378@debbugs.gnu.org, Stefan Monnier , > Eli Zaretskii > > Hello @all. > > It's been almost two weeks since I sent the patches with absolute and > rather discouraging silence in-between. :-) So I quickly wanted to ask > if there is any feedback (whether good or very bad) or something that > needs improving? And if there is a chance of getting those fixes applied > to the tree? Barring any objections, I will commit this in a few days. Thanks. From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 21 14:05:26 2014 Received: (at 16694) by debbugs.gnu.org; 21 Mar 2014 18:05:26 +0000 Received: from localhost ([127.0.0.1]:43848 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WR3os-0004Qp-3S for submit@debbugs.gnu.org; Fri, 21 Mar 2014 14:05:26 -0400 Received: from mail-oa0-f51.google.com ([209.85.219.51]:39576) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WR3op-0004Qe-4Q for 16694@debbugs.gnu.org; Fri, 21 Mar 2014 14:05:23 -0400 Received: by mail-oa0-f51.google.com with SMTP id i4so2922926oah.38 for <16694@debbugs.gnu.org>; Fri, 21 Mar 2014 11:05:22 -0700 (PDT) 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=Dy0FL3IvyqeyxOUWeqHMlQ7tDwn0m1GbaIV0MeTsbdY=; b=i9DpgIHxHDXgiJlNR5XIyXw13cTpPa3DpVnu9sGk2ZOOnJy4bRwptrWywOEj04MSy9 yMX8Q4ClxiLuiF0kaG5mIdAqk/nDuw+L0GzhRDVtHf/71KaCqFcik+DX0+sWnC/bPfAb sjcz9x7PjLSdhawJLpOFI8ECADlj6kp5h8HgKuytLLTivi7NyXQSlFHkju9yE4Jg9TNj 9iXL2en0JQabdrz5tJ6yywFnlsTx4fZfQc+kOFRSCVJLxx54k091uwnI4STJcU4ve+9G vHqkk7dEP30Am5y9Is8fAaSA2022DRKi5WO//mA3OK/yYg2xD6+wZ3/vzMznX/mPh3Ti xy+Q== MIME-Version: 1.0 X-Received: by 10.60.83.234 with SMTP id t10mr43933591oey.4.1395425122433; Fri, 21 Mar 2014 11:05:22 -0700 (PDT) Received: by 10.76.6.44 with HTTP; Fri, 21 Mar 2014 11:05:22 -0700 (PDT) Date: Fri, 21 Mar 2014 14:05:22 -0400 Message-ID: Subject: bug#16694: bugs #16694/#16378: Patches From: Barry OReilly To: ml_emacs-lists@binary-island.eu, 16694@debbugs.gnu.org Content-Type: multipart/alternative; boundary=089e0116019cbbc24604f521ba0f X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 16694 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 (/) --089e0116019cbbc24604f521ba0f Content-Type: text/plain; charset=ISO-8859-1 I tried 0001-lisp-faces.el-Fix-application-of-X-resource-attribut.patch and got: Loading /home/boreilly/l/emacs/x-resources-16434/lisp/faces.el (source)... Symbol's value as variable is void: no-init-from-resources make[2]: *** [bootstrap-emacs] Error 1 --089e0116019cbbc24604f521ba0f Content-Type: text/html; charset=ISO-8859-1
I tried 0001-lisp-faces.el-Fix-application-of-X-resource-attribut.patch and got:

Loading /home/boreilly/l/emacs/x-resources-16434/lisp/faces.el (source)...
Symbol's value as variable is void: no-init-from-resources
make[2]: *** [bootstrap-emacs] Error 1


--089e0116019cbbc24604f521ba0f-- From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 22 04:29:56 2014 Received: (at 16694) by debbugs.gnu.org; 22 Mar 2014 08:29:57 +0000 Received: from localhost ([127.0.0.1]:44151 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WRHJT-0004Dr-TT for submit@debbugs.gnu.org; Sat, 22 Mar 2014 04:29:56 -0400 Received: from mtaout22.012.net.il ([80.179.55.172]:50873) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WRHJQ-0004De-Ln for 16694@debbugs.gnu.org; Sat, 22 Mar 2014 04:29:54 -0400 Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0N2T00A00WS3Z500@a-mtaout22.012.net.il> for 16694@debbugs.gnu.org; Sat, 22 Mar 2014 10:29:50 +0200 (IST) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0N2T00A3GWXQXW20@a-mtaout22.012.net.il>; Sat, 22 Mar 2014 10:29:50 +0200 (IST) Date: Sat, 22 Mar 2014 10:30:08 +0200 From: Eli Zaretskii Subject: Re: bug#16694: bugs #16694/#16378: Patches In-reply-to: X-012-Sender: halo1@inter.net.il To: Barry OReilly Message-id: <83siqa4ovj.fsf@gnu.org> References: <52F601AE.5040309@binary-island.eu> X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 16694 Cc: ml_emacs-lists@binary-island.eu, 16694@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: Fri, 21 Mar 2014 14:05:22 -0400 > From: Barry OReilly > > I tried 0001-lisp-faces.el-Fix-application-of-X-resource-attribut.patch and > got: > > Loading /home/boreilly/l/emacs/x-resources-16434/lisp/faces.el (source)... > Symbol's value as variable is void: no-init-from-resources > make[2]: *** [bootstrap-emacs] Error 1 Mathias, it looks something is indeed missing in your patches. Should face-spec-recalc somehow accept an additional argument? From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 23 13:04:53 2014 Received: (at 16694) by debbugs.gnu.org; 23 Mar 2014 17:04:53 +0000 Received: from localhost ([127.0.0.1]:46060 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WRlpM-0002im-Ot for submit@debbugs.gnu.org; Sun, 23 Mar 2014 13:04:53 -0400 Received: from hemera.binary-island.eu ([97.107.138.233]:54797) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WRlpJ-0002ib-T1 for 16694@debbugs.gnu.org; Sun, 23 Mar 2014 13:04:51 -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 347E13C0D5; Sun, 23 Mar 2014 13:10:59 -0400 (EDT) Message-ID: <532F142F.6010803@binary-island.eu> Date: Sun, 23 Mar 2014 18:04:47 +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: Eli Zaretskii , Barry OReilly Subject: Re: bug#16694: bugs #16694/#16378: Patches References: <52F601AE.5040309@binary-island.eu> <83siqa4ovj.fsf@gnu.org> In-Reply-To: <83siqa4ovj.fsf@gnu.org> Content-Type: multipart/mixed; boundary="------------070805000709090603070505" X-Spam-Score: -0.5 (/) X-Debbugs-Envelope-To: 16694 Cc: 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.5 (/) This is a multi-part message in MIME format. --------------070805000709090603070505 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Hello Eli and Barry, sorry for my brain fart on this one. It was actually a rather late edit which, even though I tested it and deemed harmless but useful, slipped through my fingers. By the way: no-init-from-resources is a global variable set by Emacs during startup if (and only if) "-Q" is given, thus X resources should not be applied. In patch 3 I accounted for that but simply forgot to do the same in patch 1. Oh well. Attached are the updated patches which should all work just fine now. Thanks for the feedback and testing btw. Very much appreciated. So long, Matthias --------------070805000709090603070505 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 d20fd8cb26c11248ee0e88f8234c000e6c951638 Mon Sep 17 00:00:00 2001 From: Matthias Dahl Date: Wed, 5 Mar 2014 10:44:41 +0100 Subject: [PATCH 1/3] 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 e008993..bffc787 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -1619,11 +1619,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 (and (boundp 'no-init-from-resources) (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 +1649,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 --------------070805000709090603070505 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 377e9fa696f74548bb198f3305734017daee523b Mon Sep 17 00:00:00 2001 From: Matthias Dahl Date: Wed, 5 Mar 2014 15:11:32 +0100 Subject: [PATCH 2/3] 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 bffc787..699f2af 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -1512,13 +1512,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)) @@ -1538,9 +1540,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) @@ -1635,11 +1646,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 --------------070805000709090603070505 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 2f71ebf50944397ea3b4f05abcb3a37e8b309698 Mon Sep 17 00:00:00 2001 From: Matthias Dahl Date: Wed, 5 Mar 2014 15:50:01 +0100 Subject: [PATCH 3/3] lisp/faces.el: Centralize no-init-from-x-resources check logic Centralize the check for no-init-from-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 699f2af..bcb8665 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -129,13 +129,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) @@ -146,8 +143,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) @@ -155,7 +151,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. @@ -334,11 +330,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 `no-init-from-resources' is t, this will do nothing." + (unless (and (boundp 'no-init-from-resources) (no-init-from-resources)) + (if (null frame) + (dolist (frame (frame-list)) + (set-face-attributes-from-resources face frame)) + (set-face-attributes-from-resources face frame)))) @@ -1641,8 +1640,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 (and (boundp 'no-init-from-resources) (no-init-from-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 --------------070805000709090603070505-- 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 Mon Mar 24 19:42:39 2014 Received: (at 16694) by debbugs.gnu.org; 24 Mar 2014 23:42:39 +0000 Received: from localhost ([127.0.0.1]:48192 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WSEVr-0007Em-3e for submit@debbugs.gnu.org; Mon, 24 Mar 2014 19:42:39 -0400 Received: from mail-ob0-f171.google.com ([209.85.214.171]:46976) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WSEVn-0007EW-W3 for 16694@debbugs.gnu.org; Mon, 24 Mar 2014 19:42:36 -0400 Received: by mail-ob0-f171.google.com with SMTP id wn1so6661408obc.16 for <16694@debbugs.gnu.org>; Mon, 24 Mar 2014 16:42:35 -0700 (PDT) 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=e6YoRO50K9YW56HqFgjClYZFvj4W2e0zpFTaFm8zHuc=; b=k6Sl1/u6w9vUwxdheOMVFw61b2zVVA6F5xuN8Tunr5JPgWRd4M81g49wlEXrSD81B6 aT80F4BtCl8K3gah1z1D5okHY3vzyfdtSUwqxI02TD6gRp+OcmP5nFbNkGJw8vp+Pua8 eGVMzv/KIQ8M1EvVUHdYHKmxCTjKBqJLCQopSc1+JrqugTQdp9TCnDmQbwGRIYNLsLcT mcYz90NJswlk7WXvmPtxAZKKRpI3pKhHIFXP6+/EzWmPZW+a7arwFscycknKvy3c/xzO QaNNuejNtc1Q3jXEMCHKmgN5Ljk6CBX3M9qvbZDxQgGyH7Y9slQuPUF3S852tgXbCifR R5sw== MIME-Version: 1.0 X-Received: by 10.60.103.162 with SMTP id fx2mr25608079oeb.32.1395704554977; Mon, 24 Mar 2014 16:42:34 -0700 (PDT) Received: by 10.76.6.44 with HTTP; Mon, 24 Mar 2014 16:42:34 -0700 (PDT) Date: Mon, 24 Mar 2014 19:42:34 -0400 Message-ID: Subject: bug#16694: bugs #16694/#16378: Patches From: Barry OReilly To: ml_emacs-lists@binary-island.eu, 16694@debbugs.gnu.org Content-Type: multipart/alternative; boundary=089e0115e86635fe5c04f562cadf X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 16694 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 (/) --089e0115e86635fe5c04f562cadf Content-Type: text/plain; charset=ISO-8859-1 > By the way: no-init-from-resources is a global variable set by Emacs > during startup if (and only if) "-Q" is given, thus X resources should > not be applied. I built fine with the 0001-lisp-faces.el-Fix-application-of-X-resource-attribut.patch . ./src/emacs -Q -r works as expected. However, commenting out my entire init.el, ./src/emacs -r still starts Emacs with a white background, contrary to expectation. So the patch doesn't fix 16434. --089e0115e86635fe5c04f562cadf Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable
> By the way: no-init-from-resources is a global variab= le set by Emacs
> during startup if (and only if) "-Q" is g= iven, thus X resources should
> not be applied.

I built fine w= ith the
0001-lisp-faces.el-Fix-application-of-X-resource-attribut.patch .

= =A0 ./src/emacs -Q -r

works as expected. However, commenting out my = entire init.el,

=A0 ./src/emacs -r

still starts Emacs with a = white background, contrary to expectation.
So the patch doesn't fix 16434.

--089e0115e86635fe5c04f562cadf-- From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 24 20:00:06 2014 Received: (at submit) by debbugs.gnu.org; 25 Mar 2014 00:00:07 +0000 Received: from localhost ([127.0.0.1]:48209 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WSEmi-0007ia-C7 for submit@debbugs.gnu.org; Mon, 24 Mar 2014 20:00:05 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52583) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WSEmd-0007hk-LR for submit@debbugs.gnu.org; Mon, 24 Mar 2014 20:00:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WSEdJ-00061g-Bh for submit@debbugs.gnu.org; Mon, 24 Mar 2014 19:50:37 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_20,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:42080) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSEdJ-00061Y-7y for submit@debbugs.gnu.org; Mon, 24 Mar 2014 19:50:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51357) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSEd5-0005VX-FZ for bug-gnu-emacs@gnu.org; Mon, 24 Mar 2014 19:50:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WSEcz-0005XP-AL for bug-gnu-emacs@gnu.org; Mon, 24 Mar 2014 19:50:07 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:55969) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSEcz-0005X0-1H for bug-gnu-emacs@gnu.org; Mon, 24 Mar 2014 19:50:01 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id 822684001F; Tue, 25 Mar 2014 00:49:59 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mailbox.org; h= content-transfer-encoding:content-type:content-type:mime-version :user-agent:message-id:in-reply-to:date:date:references:subject :subject:from:from:received; s=mail20140220; t=1395704998; bh=YL pmHXbtBeXjzZG04oCPIPFD4682pMA3VQcTz3zmnR4=; b=klAZ5GuBnyGxA4xu5z zJ72389y2ZgxmyT+Ft7T5SXU/vSZA8NcxRt49b9yiAtxaKJqxY8o1u4wiFant88N dpXFr6QC43R2cTNtk+nvvzLskv39KXIvyf1gLJOTXNc5x0lkQa/fss6m497wCTqb i6pRaJZnm/6ZtzjpM/8ygxzAqQTs3oApG3gXcRcrgTPFi0WkZWD5PdebW3u0/f/A yqHPuRVmNZ0GM4o6IshxYaip2zJJamhu7UhB+ZA+DOuu+ABqBe6PSv0kd6GcD5Bm 9obzEDlKzL5L9heb/zGapunTC7Gq9JDnEHrikhatdan6Lv0RBZCRQi0D1WuIm7J/ iFGvZepQyQ5kX8EppizbQ5MWNlbZNf7rffNI2HleWqDrUZiMe2081Q4kVE72z/rD LheZ0iBbc04YsccMAEMw7pBlZ1sWUXXePv2ZujrEWvexsww2m9cMyePBClvtyAly +xEjcd5hlFabKkJlvmYS2DDLKCDWUbkNwQteg83/mFu8QR2QPNODfUmMPe4NP0Tm 7cdhZjiv6dVSsUd8WosXrjGbuLwItH6sjGWF98osfT1R1fxog5I0wZsMElJYIUSE R5BeU1SHlE/mOP7KxjuF6CKdP4BPqBAsvW/8D25ozJAN3GtRCKq97UTIf/CbKGwl 9nZ2Di2QgX+T6oUicTY1xHsQU= X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by gerste.heinlein-support.de (gerste.heinlein-support.de [91.198.250.173]) (amavisd-new, port 10030) with ESMTP id S2EOZT0-NVzO; Tue, 25 Mar 2014 00:49:58 +0100 (CET) From: Clemens =?utf-8?Q?Sch=C3=BCller?= To: emacs bugs Subject: Re: bug#16694: bugs #16694/#16378: Patches References: <52F601AE.5040309@binary-island.eu> Date: Tue, 25 Mar 2014 00:49:57 +0100 In-Reply-To: (Barry OReilly's message of "Mon, 24 Mar 2014 19:42:34 -0400") Message-ID: <87k3bj40nu.fsf@cougar.home.aneadesign.com> User-Agent: Gnus/5.13001 (Ma Gnus v0.10) Emacs/24.4.50 (gnu/linux) X-Operating-System: Linux cougar 3.13.0-sabayon #1 SMP Thu Feb 27 15:27:16 UTC 2014 x86_64 Intel(R) Core(TM)2 Quad CPU Q9550 @ 2.83GHz GenuineIntel GNU/Linux MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] 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.3 (----) X-Debbugs-Envelope-To: submit Cc: gundaetiapo@gmail.com, ml_emacs-lists@binary-island.eu 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.3 (----) Hello! >> By the way: no-init-from-resources is a global variable set by Emacs >> during startup if (and only if) "-Q" is given, thus X resources should >> not be applied. > > I built fine with the > 0001-lisp-faces.el-Fix-application-of-X-resource-attribut.patch . > > ./Src/emacs -Q -r > > Works as expected. However, commenting out my entire init.el, > > ./Src/emacs -r > > Still starts Emacs with a white background, contrary to expectation. > So the patch doesn't fix 16434. I had the same problem with the white background: After the integration of _all_ three patches the problem was gone. --=20 Best Regards, Clemens Sch=C3=BCller From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 25 10:18:09 2014 Received: (at submit) by debbugs.gnu.org; 25 Mar 2014 14:18:09 +0000 Received: from localhost ([127.0.0.1]:49360 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WSSB7-0001jQ-4l for submit@debbugs.gnu.org; Tue, 25 Mar 2014 10:18:09 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38470) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WSSB4-0001jE-6J for submit@debbugs.gnu.org; Tue, 25 Mar 2014 10:18:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WSSAz-0005Xq-Pz for submit@debbugs.gnu.org; Tue, 25 Mar 2014 10:18:05 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_20,FREEMAIL_FROM, HTML_MESSAGE,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:52375) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSSAz-0005Xe-Mr for submit@debbugs.gnu.org; Tue, 25 Mar 2014 10:18:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40147) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSSAy-0005YI-UG for bug-gnu-emacs@gnu.org; Tue, 25 Mar 2014 10:18:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WSSAx-0005X8-RJ for bug-gnu-emacs@gnu.org; Tue, 25 Mar 2014 10:18:00 -0400 Received: from mail-oa0-x22c.google.com ([2607:f8b0:4003:c02::22c]:49219) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSSAx-0005Wt-ML for bug-gnu-emacs@gnu.org; Tue, 25 Mar 2014 10:17:59 -0400 Received: by mail-oa0-f44.google.com with SMTP id n16so642834oag.31 for ; Tue, 25 Mar 2014 07:17: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=CohzthvGV/6b3qCP2/RXXPZWnONir79kkrDzmw7BWks=; b=rOheiOIeI2xhmobkiuPmRJO9CC1hlVCS84ehmZb8EmSLTjvGydS5Ay9PNXr8RdajAR uhob/k4WN/dB2Ed7zXQV4WExmS40DlXnPJwlDGD/zakZ1dMtNBLhqYitOOl3dcg7vtoA vwn3QVMIgmk1LIphQuvG9v+5uqCI6U0+uVsdmNWeMjx7PJd+7eQOu+xItxt99N2QQqmr hz5zFFySPW6PfsYoU3HpnTLogsrFGM34WBS4z4dVrUKW+q1A7iXD6ixxgHT1RIL+weod lBY/fZQko/OXyBYEaBOGl0YlmTo2NTxvec6mnAcF94rmARQh6emvLooltEWalv3XEaXG 5eZA== MIME-Version: 1.0 X-Received: by 10.182.16.131 with SMTP id g3mr2246015obd.46.1395757079121; Tue, 25 Mar 2014 07:17:59 -0700 (PDT) Received: by 10.76.6.44 with HTTP; Tue, 25 Mar 2014 07:17:58 -0700 (PDT) In-Reply-To: <87k3bj40nu.fsf@cougar.home.aneadesign.com> References: <52F601AE.5040309@binary-island.eu> <87k3bj40nu.fsf@cougar.home.aneadesign.com> Date: Tue, 25 Mar 2014 10:17:58 -0400 Message-ID: Subject: Re: bug#16694: bugs #16694/#16378: Patches From: Barry OReilly To: =?ISO-8859-1?Q?Clemens_Sch=FCller?= Content-Type: multipart/alternative; boundary=001a11c2d6f8e4d7c304f56f042c 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 Cc: emacs bugs , ml_emacs-lists@binary-island.eu 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 (----) --001a11c2d6f8e4d7c304f56f042c Content-Type: text/plain; charset=ISO-8859-1 > After the integration of _all_ three patches the problem was gone. I applied all three patches, but './src/emacs -r' with commented out init.el still starts Emacs with unexpected white background. --001a11c2d6f8e4d7c304f56f042c Content-Type: text/html; charset=ISO-8859-1
> After the integration of _all_ three patches the problem was gone.

I applied all three patches, but './src/emacs -r' with commented out
init.el still starts Emacs with unexpected white background.

--001a11c2d6f8e4d7c304f56f042c-- From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 25 11:52:05 2014 Received: (at 16694) by debbugs.gnu.org; 25 Mar 2014 15:52:05 +0000 Received: from localhost ([127.0.0.1]:49509 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WSTe1-0004sL-0g for submit@debbugs.gnu.org; Tue, 25 Mar 2014 11:52:05 -0400 Received: from mtaout29.012.net.il ([80.179.55.185]:57953) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WSTdy-0004rs-C5 for 16694@debbugs.gnu.org; Tue, 25 Mar 2014 11:52:03 -0400 Received: from conversion-daemon.mtaout29.012.net.il by mtaout29.012.net.il (HyperSendmail v2007.08) id <0N3000C001IUGH00@mtaout29.012.net.il> for 16694@debbugs.gnu.org; Tue, 25 Mar 2014 17:54:45 +0200 (IST) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout29.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0N30007PR1J8SO40@mtaout29.012.net.il>; Tue, 25 Mar 2014 17:54:45 +0200 (IST) Date: Tue, 25 Mar 2014 17:51:52 +0200 From: Eli Zaretskii Subject: Re: bug#16694: bugs #16694/#16378: Patches In-reply-to: X-012-Sender: halo1@inter.net.il To: Barry OReilly Message-id: <83wqfiz36v.fsf@gnu.org> References: <52F601AE.5040309@binary-island.eu> <87k3bj40nu.fsf@cougar.home.aneadesign.com> X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 16694 Cc: ml_emacs-lists@binary-island.eu, cs.mlists+bug-gnu-emacs@mailbox.org, 16694@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: Tue, 25 Mar 2014 10:17:58 -0400 > From: Barry OReilly > Cc: ml_emacs-lists@binary-island.eu, 16694@debbugs.gnu.org > > > After the integration of _all_ three patches the problem was gone. > > I applied all three patches, but './src/emacs -r' with commented out > init.el still starts Emacs with unexpected white background. The reverse-video option was misbehaving for a long time; are you sure that issue is at all related to the bugs discussed here? When did you last see -r DTRT in this scenario? From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 25 12:17:49 2014 Received: (at 16694) by debbugs.gnu.org; 25 Mar 2014 16:17:49 +0000 Received: from localhost ([127.0.0.1]:49526 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WSU2u-0005ct-Eu for submit@debbugs.gnu.org; Tue, 25 Mar 2014 12:17:49 -0400 Received: from mail-oa0-f51.google.com ([209.85.219.51]:64336) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WSU2s-0005cl-JK for 16694@debbugs.gnu.org; Tue, 25 Mar 2014 12:17:47 -0400 Received: by mail-oa0-f51.google.com with SMTP id i4so857210oah.24 for <16694@debbugs.gnu.org>; Tue, 25 Mar 2014 09:17:46 -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=9qliaf3lB+oaPQUxW8KBJwVXPHqf/L4X92nEl5hpIkI=; b=gLIxIZfmTSBZDc3MOcUq2wZrkth4rLPlA18kuO9SXIfv8wkXAqXcS2xMcnLA2yRu0j 4VKP/WswYa/qZVBUGzasna3BJPZNeF51t6KAIjjeXuB3lLmVoPYItVnZ+I93Q4mPZmE4 EU33+FQCDWzKEXDJPYpQm8A7qVTqY38g3rOct7DYOlqlrz71v+4DWZ4BmrH+/jWocFbl uocvAzogaNdtPgUqHz7I3amSCpAeB63/z3Z2rFj3IYR+GGc2Y8N0mJ2KMhGq1Trvp9Vm 6M1DJcU+1RJUhRMbR8w2dLsFuucHzDRec2NpoO14tOW+B1tI+pmkc814E54NSbH/Hg3m VqLA== MIME-Version: 1.0 X-Received: by 10.182.87.42 with SMTP id u10mr32254356obz.22.1395764266013; Tue, 25 Mar 2014 09:17:46 -0700 (PDT) Received: by 10.76.6.44 with HTTP; Tue, 25 Mar 2014 09:17:45 -0700 (PDT) In-Reply-To: <83wqfiz36v.fsf@gnu.org> References: <52F601AE.5040309@binary-island.eu> <87k3bj40nu.fsf@cougar.home.aneadesign.com> <83wqfiz36v.fsf@gnu.org> Date: Tue, 25 Mar 2014 12:17:45 -0400 Message-ID: Subject: Re: bug#16694: bugs #16694/#16378: Patches From: Barry OReilly To: Eli Zaretskii Content-Type: multipart/alternative; boundary=089e013cba624417fa04f570b18f X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 16694 Cc: ml_emacs-lists@binary-island.eu, =?ISO-8859-1?Q?Clemens_Sch=FCller?= , 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 (/) --089e013cba624417fa04f570b18f Content-Type: text/plain; charset=ISO-8859-1 > When did you last see -r DTRT in this scenario? I Git bisected it in bug 16434. http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16434#5 --089e013cba624417fa04f570b18f Content-Type: text/html; charset=ISO-8859-1
> When did you last see -r DTRT in this scenario?

I Git bisected it in bug 16434.

http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16434#5

--089e013cba624417fa04f570b18f-- From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 25 15:09:21 2014 Received: (at 16694) by debbugs.gnu.org; 25 Mar 2014 19:09:21 +0000 Received: from localhost ([127.0.0.1]:49673 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WSWiu-0003SY-Og for submit@debbugs.gnu.org; Tue, 25 Mar 2014 15:09:21 -0400 Received: from hemera.binary-island.eu ([97.107.138.233]:60373) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WSWis-0003SP-Cb for 16694@debbugs.gnu.org; Tue, 25 Mar 2014 15:09:19 -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 375AB3C0D5; Tue, 25 Mar 2014 15:15:30 -0400 (EDT) Message-ID: <5331D45B.7090704@binary-island.eu> Date: Tue, 25 Mar 2014 20:09:15 +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 , 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> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Spam-Score: -0.4 (/) X-Debbugs-Envelope-To: 16694 Cc: =?ISO-8859-1?Q?Clemens_Sch=FCller?= , 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. I'll have a look at everything later this week and report back. I am rather busy at the moment, unfortunately. :( So long, Matthias From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 26 09:39:55 2014 Received: (at 16694) by debbugs.gnu.org; 26 Mar 2014 13:39:55 +0000 Received: from localhost ([127.0.0.1]:50184 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WSo3e-0004z3-MQ for submit@debbugs.gnu.org; Wed, 26 Mar 2014 09:39:55 -0400 Received: from mail-ob0-f172.google.com ([209.85.214.172]:64896) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WSo3c-0004yu-Hw for 16694@debbugs.gnu.org; Wed, 26 Mar 2014 09:39:53 -0400 Received: by mail-ob0-f172.google.com with SMTP id wm4so2478943obc.3 for <16694@debbugs.gnu.org>; Wed, 26 Mar 2014 06:39:51 -0700 (PDT) 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=QiGjX4/ikLneanWWrgf4dGh0xJXlLTf+kGfcRXMjfwc=; b=dS22Z1VouSrctizJlWxI0wnebN0CUXK/atdvVwha0N7ZEH6mO+EO9IooGuBzT+rqdU 5Le7UgsG5NKsBaaNh4PBjOvlCPObZ8EmkCtSmajcwowndi/l0aFG7fWgp1rVxKpj/9Cx ZrewNLf9PrPEBs83rAXesoE2SU0sCmdfftBPIpQQr0d92QAJR4BQW/mkjacxtPuWciFz Kl1tYe8VlkAN1LAND0BEMS/S+JdR/bPM8ifryliB3S0bwcfSH6CxyAINa58BD1LonNrn tXR1H1ONy5dIcFVKeht2QGaLV51ZXVBq4yF1k8JRlFUtKI74QFzG5oLjioUn5JRiKWmH vDiQ== MIME-Version: 1.0 X-Received: by 10.60.173.233 with SMTP id bn9mr68374216oec.9.1395841191561; Wed, 26 Mar 2014 06:39:51 -0700 (PDT) Received: by 10.76.6.44 with HTTP; Wed, 26 Mar 2014 06:39:51 -0700 (PDT) Date: Wed, 26 Mar 2014 09:39:51 -0400 Message-ID: Subject: Re: Strange background color problem in gentoo Linux From: Barry OReilly To: joakim.tjernlund@transmode.se, cyd@gnu.org, 16694@debbugs.gnu.org, ml_emacs-lists@binary-island.eu Content-Type: multipart/alternative; boundary=089e0118254462cecf04f5829a2f X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 16694 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 (/) --089e0118254462cecf04f5829a2f Content-Type: text/plain; charset=ISO-8859-1 > I am using Gnome2, KDE and MATE on a fresh Gentoo system. In my > .emacs I have: > > (add-to-list 'default-frame-alist '(background-color . "#333333")) > (add-to-list 'default-frame-alist '(foreground-color . "White")) > (add-to-list 'default-frame-alist '(cursor-color . "White")) > > Whenever I use MATE or KDE, emacs fails to set the background color > to Green(#333333), it becomes white instead and I end up with White > one White on White :( If I open a new Frame I get my Green > background though. > > This happens on 24.3.50_pre20140228 and 24.3.9999-r1 (top of repo > tree) Tried both gtk2 and gtk3 USE flags Sounds similar to several other bug reports since the regression was introduced in December. Most discussion is at http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16694 . Chong, it would be nice if you could opine about the problem and Matthias's patches. The offending commit was: 15e14b165dcbc6566a0459b0d5e66f89080f569e is the first bad commit commit 15e14b165dcbc6566a0459b0d5e66f89080f569e Author: Chong Yidong gnu.org> 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. --089e0118254462cecf04f5829a2f Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable
> I am using Gnome2, KDE and MATE on a fresh Gentoo sys= tem. In my
> .emacs I have:
>
> (add-to-list 'default= -frame-alist '(background-color . "#333333"))
> (add-to= -list 'default-frame-alist '(foreground-color . "White"))=
> (add-to-list 'default-frame-alist '(cursor-color . "White= "))
>
> Whenever I use MATE or KDE, emacs fails to set the= background color
> to Green(#333333), it becomes white instead and I= end up with White
> one White on White :( If I open a new Frame I get my Green
> bac= kground though.
>
> This happens on 24.3.50_pre20140228 and 24.= 3.9999-r1 (top of repo
> tree) Tried both gtk2 and gtk3 USE flags

Sounds similar to several other bug reports since the regression wasintroduced in December. Most discussion is at
http://debbugs.gnu.org/cgi/bugrepor= t.cgi?bug=3D16694 .

Chong, it would be nice if you could opine about the problem and
Mat= thias's patches. The offending commit was:

15e14b165dcbc6566a045= 9b0d5e66f89080f569e is the first bad commit
commit 15e14b165dcbc6566a045= 9b0d5e66f89080f569e
Author: Chong Yidong <cyd <at> gnu.org<= /a>>
Date:=A0=A0 Sat Dec 21 23:31:09 2013 +0800

=A0=A0=A0 Don&= #39;t make faces when loading Custom themes.

=A0=A0=A0 * custom.el (= custom-theme-recalc-face): Do nothing if the face is
=A0=A0=A0 undefined.=A0 Thus, theme settings for undefined faces do not tak= e
=A0=A0=A0 effect until the faces are defined with defface, the same as= with
=A0=A0=A0 theme variables.

=A0=A0=A0 * faces.el (face-spec-= set): Use face-spec-recalc in all cases.
=A0=A0=A0 (face-spec-reset-face): Don't assign extra properties in tema= cs.
=A0=A0=A0 (face-spec-recalc): Apply X resources too.

--089e0118254462cecf04f5829a2f-- From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 26 11:30:26 2014 Received: (at 16694) by debbugs.gnu.org; 26 Mar 2014 15:30:26 +0000 Received: from localhost ([127.0.0.1]:51073 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WSpmX-0008GJ-N3 for submit@debbugs.gnu.org; Wed, 26 Mar 2014 11:30:25 -0400 Received: from mtaout22.012.net.il ([80.179.55.172]:44748) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WSpmU-0008G9-S8 for 16694@debbugs.gnu.org; Wed, 26 Mar 2014 11:30:20 -0400 Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0N3100F00V0JXK00@a-mtaout22.012.net.il> for 16694@debbugs.gnu.org; Wed, 26 Mar 2014 17:30:17 +0200 (IST) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0N3100F5DV2GBSC0@a-mtaout22.012.net.il>; Wed, 26 Mar 2014 17:30:17 +0200 (IST) Date: Wed, 26 Mar 2014 17:30:13 +0200 From: Eli Zaretskii Subject: Re: bug#16694: bugs #16694/#16378: Patches In-reply-to: X-012-Sender: halo1@inter.net.il To: Barry OReilly Message-id: <83bnwtyo3e.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> X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 16694 Cc: ml_emacs-lists@binary-island.eu, cs.mlists+bug-gnu-emacs@mailbox.org, 16694@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: Tue, 25 Mar 2014 12:17:45 -0400 > From: Barry OReilly > Cc: Clemens Schüller , > ml_emacs-lists@binary-island.eu, 16694@debbugs.gnu.org > > > When did you last see -r DTRT in this scenario? > > I Git bisected it in bug 16434. > > http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16434#5 Thanks. So this is yet another bug to take care of. From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 26 11:49:52 2014 Received: (at 16694) by debbugs.gnu.org; 26 Mar 2014 15:49:53 +0000 Received: from localhost ([127.0.0.1]:51079 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WSq5P-0000JQ-Lx for submit@debbugs.gnu.org; Wed, 26 Mar 2014 11:49:52 -0400 Received: from gw1.transmode.se ([195.58.98.146]:50857) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WSpUM-0007iG-7I for 16694@debbugs.gnu.org; Wed, 26 Mar 2014 11:11:38 -0400 Received: from mail1.transmode.se (mail1.transmode.se [192.168.201.18]) by gw1.transmode.se (Postfix) with ESMTP id C491F484132; Wed, 26 Mar 2014 16:11:30 +0100 (CET) In-Reply-To: References: To: Barry OReilly MIME-Version: 1.0 Subject: Re: Strange background color problem in gentoo Linux X-KeepSent: 7857C9F8:E79342DB-C1257CA7:0052C57E; type=4; name=$KeepSent X-Mailer: Lotus Notes Release 8.5.3 September 15, 2011 From: Joakim Tjernlund Message-ID: Date: Wed, 26 Mar 2014 16:11:29 +0100 X-MIMETrack: Serialize by Router on mail1/Transmode(Release 8.5.3FP6|November 21, 2013) at 26/03/2014 16:11:30, Serialize complete at 26/03/2014 16:11:30 Content-Type: text/plain; charset="US-ASCII" X-Spam-Score: -0.4 (/) X-Debbugs-Envelope-To: 16694 X-Mailman-Approved-At: Wed, 26 Mar 2014 11:49:49 -0400 Cc: ml_emacs-lists@binary-island.eu, cyd@gnu.org, 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 (/) Barry OReilly wrote on 2014/03/26 14:39:51: > > > I am using Gnome2, KDE and MATE on a fresh Gentoo system. In my > > .emacs I have: > > > > (add-to-list 'default-frame-alist '(background-color . "#333333")) > > (add-to-list 'default-frame-alist '(foreground-color . "White")) > > (add-to-list 'default-frame-alist '(cursor-color . "White")) > > > > Whenever I use MATE or KDE, emacs fails to set the background color > > to Green(#333333), it becomes white instead and I end up with White > > one White on White :( If I open a new Frame I get my Green > > background though. > > > > This happens on 24.3.50_pre20140228 and 24.3.9999-r1 (top of repo > > tree) Tried both gtk2 and gtk3 USE flags > > Sounds similar to several other bug reports since the regression was > introduced in December. Most discussion is at > http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16694 . Sure looks similar, thank you One more data point, if I add (setq initial-frame-alist default-frame-alist) as in (add-to-list 'default-frame-alist '(background-color . "#333333")) (add-to-list 'default-frame-alist '(foreground-color . "White")) (add-to-list 'default-frame-alist '(cursor-color . "White")) (setq initial-frame-alist default-frame-alist) I get the correct green background in my initial Frame. May I also ask, in another Gentoo GNU/Linux system running Gnome 2 I get this after updating that install: jocke@gentoo64 ~ $ emacs (emacs:2436): GLib-GObject-WARNING **: Attempt to add property GtkSettings::gtk-button-images after class was initialised (emacs:2436): GLib-GObject-WARNING **: Attempt to add property GtkSettings::gtk-label-select-on-focus after class was initialised (emacs:2436): GLib-GObject-WARNING **: Attempt to add property GtkSettings::gtk-menu-bar-popup-delay after class was initialised (emacs:2436): GLib-GObject-WARNING **: Attempt to add property GtkSettings::gtk-can-change-accels after class was initialised (emacs:2436): GLib-GObject-WARNING **: Attempt to add property GtkSettings::gtk-menu-popup-delay after class was initialised (emacs:2436): GLib-GObject-WARNING **: Attempt to add property GtkSettings::gtk-menu-popdown-delay after class was initialised and I cannot figure out where the GLib warnings come from, any ideas? Jocke From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 26 11:58:41 2014 Received: (at submit) by debbugs.gnu.org; 26 Mar 2014 15:58:41 +0000 Received: from localhost ([127.0.0.1]:51099 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WSqDw-0000ZT-5H for submit@debbugs.gnu.org; Wed, 26 Mar 2014 11:58:40 -0400 Received: from eggs.gnu.org ([208.118.235.92]:48248) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WSqDt-0000ZK-74 for submit@debbugs.gnu.org; Wed, 26 Mar 2014 11:58:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WSqDj-0007do-Hw for submit@debbugs.gnu.org; Wed, 26 Mar 2014 11:58:35 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_40,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:57460) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSqDj-0007de-FS for submit@debbugs.gnu.org; Wed, 26 Mar 2014 11:58:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49910) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSqDe-0006F7-4u for bug-gnu-emacs@gnu.org; Wed, 26 Mar 2014 11:58:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WSqDY-0007ay-RG for bug-gnu-emacs@gnu.org; Wed, 26 Mar 2014 11:58:22 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:51360) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSqDY-0007aP-If; Wed, 26 Mar 2014 11:58:16 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id 114314024E; Wed, 26 Mar 2014 16:58:14 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mailbox.org; h= content-transfer-encoding:content-type:content-type:mime-version :user-agent:message-id:in-reply-to:date:date:references:subject :subject:from:from:received; s=mail20140220; t=1395849492; bh=ki 909RtRtVWzTOVMw/xC8EAJda2Dghp4ToMuvvRmJlE=; b=Gq5jN3ATmgYisHicfd O2ZLcMHYOX6WOzZUgNZQCFTVMLxpAqCBaU/vku/vTPhsKq68vOq711RAPUlLA+DV D4jYT6spiuZKMEyJHuAMi54p6SEatGVMnN5dNXUrPpgTy2cO8lM/DHDG3QwWk3wI AwVaUtuvYLOLtvHwA4fpHXYL/E1hVU4jWKg3PAx2LVXTvX5oVpWI+1XhZUF0D3NS A4d40MUcW6cPDuQpBXQziIwb8OgZj1rEf/6XvTJPc8C2ORdSoKH/CWHNH3pRhOrg Cd5VCnw4PHeGyMGf/qCyCGhreMRtBdA9RWzgePDCyWFZMbKEoALXUUPJ+8akPMR/ pTKGrkctG3BMYVt8wfxSfOLDQinecvVB5T17uhF0BGq2+DHHh7JXDlIFsMAysrba tWgmwjT2VUK0iWwfqGsKoLKmfyuyqT0UsWDfoEYWCR98Fsee7oql8Y2WtcTlz7vx oenYjnpAR7fF5PQbXsrvX2G2W2bVlk5ji4wViLnIFFHdxHGh4LvBfkXQ+PshfRN7 /gOeJ7XnRUL/svahqkDWjoSgMZBajtyooSoAtirOBAJI8eHvadZrfnHV8DfYFsh6 3yUIMtw5jrQjaL+6yjib9jqshE2dXenLYpRIFLBeFayGRljEqS1QUiLPC6XYHS5A LtSQ7EHIKrD2xNDlBI8zvB/TU= X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by hefe.heinlein-support.de (hefe.heinlein-support.de [91.198.250.172]) (amavisd-new, port 10030) with ESMTP id yDXHm1ED9GjD; Wed, 26 Mar 2014 16:58:12 +0100 (CET) From: Clemens =?utf-8?Q?Sch=C3=BCller?= To: emacs bugs Subject: Re: bug#16694: Strange background color problem in gentoo Linux References: <52F601AE.5040309@binary-island.eu> Date: Wed, 26 Mar 2014 16:58:11 +0100 In-Reply-To: (Barry OReilly's message of "Wed, 26 Mar 2014 09:39:51 -0400") Message-ID: <87vbv1osto.fsf@cougar.home.aneadesign.com> User-Agent: Gnus/5.13001 (Ma Gnus v0.10) Emacs/24.4.50 (gnu/linux) X-Operating-System: Linux cougar 3.13.0-sabayon #1 SMP Sun Mar 16 03:29:10 UTC 2014 x86_64 Intel(R) Core(TM)2 Quad CPU Q9550 @ 2.83GHz GenuineIntel GNU/Linux MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] 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.3 (----) X-Debbugs-Envelope-To: submit Cc: ml_emacs-lists@binary-island.eu, cyd@gnu.org, joakim.tjernlund@transmode.se, 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: -4.3 (----) Hello! > Sounds similar to several other bug reports since the regression was > introduced in December. Most discussion is at > http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D16694 . > > Chong, it would be nice if you could opine about the problem and > Matthias's patches. The offending commit was: > > 15e14b165dcbc6566a0459b0d5e66f89080f569e is the first bad commit > commit 15e14b165dcbc6566a0459b0d5e66f89080f569e > Author: Chong Yidong gnu.org> > 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. Here is my patch, after I copied the ebuild file in my local overlay: --- /usr/portage/app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild 201= 4-03-21 15:22:30.000000000 +0100 +++ emacs-vcs-24.4.9999.ebuild 2014-03-24 21:20:49.947795118 +0100 @@ -115,6 +115,9 @@ fi =20 epatch_user + epatch "${FILESDIR}/0001-lisp-faces.el-Fix-application-of-X-resourc= e-attribut.patch" + epatch "${FILESDIR}/0002-lisp-faces.el-Fix-empty-face-handling.patc= h" + epatch "${FILESDIR}/0003-lisp-faces.el-Centralize-no-init-from-x-re= sources-ch.patch" =20 # Fix filename reference in redirected man page sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \ --=20 Best Regards, Clemens Sch=C3=BCller From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 26 12:03:41 2014 Received: (at 16694) by debbugs.gnu.org; 26 Mar 2014 16:03:41 +0000 Received: from localhost ([127.0.0.1]:51109 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WSqIm-0000jX-Ci for submit@debbugs.gnu.org; Wed, 26 Mar 2014 12:03:40 -0400 Received: from fencepost.gnu.org ([208.118.235.10]:57345) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WSqIi-0000jO-Sf for 16694@debbugs.gnu.org; Wed, 26 Mar 2014 12:03:37 -0400 Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1WSqIh-0007gd-S0; Wed, 26 Mar 2014 12:03:35 -0400 From: Glenn Morris 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> <83bnwtyo3e.fsf@gnu.org> X-Spook: quiche Steve Case ASPIC cracking Rand Corporation X-Ran: !;kDO3D;v\`um]^08Z)@!j4n,@Un{,8:eTsFG:7eU/>MJts4$H[l!^0YKoe$vs(En$\Ows X-Hue: red X-Debbugs-No-Ack: yes X-Attribution: GM Date: Wed, 26 Mar 2014 12:03:35 -0400 In-Reply-To: <83bnwtyo3e.fsf@gnu.org> (Eli Zaretskii's message of "Wed, 26 Mar 2014 17:30:13 +0200") Message-ID: User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Spam-Score: -5.4 (-----) X-Debbugs-Envelope-To: 16694 Cc: Barry OReilly , 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: -5.4 (-----) Eli Zaretskii wrote: >> http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16434#5 > > Thanks. So this is yet another bug to take care of. Perhaps I merged too many bugs there. It seemed like the same commit caused all the issues. Hopefully someone has time to review the various reports and see if any should be unmerged. From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 26 12:49:43 2014 Received: (at 16694) by debbugs.gnu.org; 26 Mar 2014 16:49:43 +0000 Received: from localhost ([127.0.0.1]:51208 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WSr1L-0003E6-6V for submit@debbugs.gnu.org; Wed, 26 Mar 2014 12:49:43 -0400 Received: from mail-ob0-f173.google.com ([209.85.214.173]:61065) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WSr1J-0003Dv-9k for 16694@debbugs.gnu.org; Wed, 26 Mar 2014 12:49:41 -0400 Received: by mail-ob0-f173.google.com with SMTP id gq1so2832955obb.4 for <16694@debbugs.gnu.org>; Wed, 26 Mar 2014 09:49:39 -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=0GKC7RuBQRKqvZZinjuzdfAZ6fJbH+MunMdQmpe433s=; b=VgYvx9PNGmRuQhGSj/4DK1UTx3SqFHbsUmhCfCKe+3l09xaYvtSfrYNOmpJkRNiFDS F40dH0s1CBcWBu/gGBnj7IHL4BT2D1WVycl5IjnBru7JK0yGK2hn3E66yP0j/483n0WX w1fu98QqdOAES8PKJsB9h22n07qJP9lUi4jcWNjJqs4MxWqMD51B+IgNjUeNzKsPeCVH lmZORI6YLGO/2idvDnjhzoMVoQSEWHUzZ6WQ54iPouoDCmm2jz/PAnSAxx3f4XNsqe1k MPA4L2jPcn2MmmXVO5cJIX/tNkSiIGnBUYnsnXiKs63EbJgh3mdys5LFTRS+gZKBNEuW bHWQ== MIME-Version: 1.0 X-Received: by 10.182.243.138 with SMTP id wy10mr1646279obc.83.1395852579385; Wed, 26 Mar 2014 09:49:39 -0700 (PDT) Received: by 10.76.6.44 with HTTP; Wed, 26 Mar 2014 09:49:39 -0700 (PDT) In-Reply-To: References: Date: Wed, 26 Mar 2014 12:49:39 -0400 Message-ID: Subject: Re: Strange background color problem in gentoo Linux From: Barry OReilly To: Joakim Tjernlund Content-Type: multipart/alternative; boundary=001a11c2a12027372a04f5854126 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 16694 Cc: 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 (/) --001a11c2a12027372a04f5854126 Content-Type: text/plain; charset=ISO-8859-1 > (emacs:2436): GLib-GObject-WARNING **: Attempt to add property > GtkSettings::gtk-menu-popdown-delay after class was initialised Maybe http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16522 , though the warning is a little different. --001a11c2a12027372a04f5854126 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable --001a11c2a12027372a04f5854126-- From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 26 14:13:05 2014 Received: (at 16694) by debbugs.gnu.org; 26 Mar 2014 18:13:05 +0000 Received: from localhost ([127.0.0.1]:51285 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WSsK0-0006lN-De for submit@debbugs.gnu.org; Wed, 26 Mar 2014 14:13:04 -0400 Received: from gw1.transmode.se ([195.58.98.146]:53163) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WSsJx-0006kx-Co for 16694@debbugs.gnu.org; Wed, 26 Mar 2014 14:13:02 -0400 Received: from mail1.transmode.se (mail1.transmode.se [192.168.201.18]) by gw1.transmode.se (Postfix) with ESMTP id 6697C4840BE; Wed, 26 Mar 2014 19:12:59 +0100 (CET) In-Reply-To: References: To: Barry OReilly MIME-Version: 1.0 Subject: Re: Strange background color problem in gentoo GNU/Linux X-KeepSent: 3FC0E208:939F4719-C1257CA7:0063BE8C; type=4; name=$KeepSent X-Mailer: Lotus Notes Release 8.5.3 September 15, 2011 From: Joakim Tjernlund Message-ID: Date: Wed, 26 Mar 2014 19:12:58 +0100 X-MIMETrack: Serialize by Router on mail1/Transmode(Release 8.5.3FP6|November 21, 2013) at 26/03/2014 19:12:58, Serialize complete at 26/03/2014 19:12:58 Content-Type: text/plain; charset="US-ASCII" X-Spam-Score: -0.4 (/) X-Debbugs-Envelope-To: 16694 Cc: 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 (/) Barry OReilly wrote on 2014/03/26 17:49:39: > > > (emacs:2436): GLib-GObject-WARNING **: Attempt to add property > > GtkSettings::gtk-menu-popdown-delay after class was initialised > > Maybe http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16522 , though the warning is a little different. Ahh, that seems to be it. On this system gtk+ was at an older version( 2.24.17). I am rebuilding with 2.24.22 now, thanks :) Jocke From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 26 14:18:47 2014 Received: (at 16694) by debbugs.gnu.org; 26 Mar 2014 18:18:47 +0000 Received: from localhost ([127.0.0.1]:51296 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WSsPV-0006vv-Js for submit@debbugs.gnu.org; Wed, 26 Mar 2014 14:18:46 -0400 Received: from gw1.transmode.se ([195.58.98.146]:59207) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WSsPT-0006vn-Gc for 16694@debbugs.gnu.org; Wed, 26 Mar 2014 14:18:44 -0400 Received: from mail1.transmode.se (mail1.transmode.se [192.168.201.18]) by gw1.transmode.se (Postfix) with ESMTP id D0A034840B8; Wed, 26 Mar 2014 19:18:42 +0100 (CET) In-Reply-To: <87vbv1osto.fsf@cougar.home.aneadesign.com> References: <52F601AE.5040309@binary-island.eu> <87vbv1osto.fsf@cougar.home.aneadesign.com> To: =?ISO-8859-15?Q?Clemens_Sch=FCller?= MIME-Version: 1.0 Subject: Re: bug#16694: Strange background color problem in gentoo Linux X-KeepSent: 3CAD340D:9C92268A-C1257CA7:00641330; type=4; name=$KeepSent X-Mailer: Lotus Notes Release 8.5.3 September 15, 2011 From: Joakim Tjernlund Message-ID: Date: Wed, 26 Mar 2014 19:18:41 +0100 X-MIMETrack: Serialize by Router on mail1/Transmode(Release 8.5.3FP6|November 21, 2013) at 26/03/2014 19:18:42, Serialize complete at 26/03/2014 19:18:42 Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.4 (/) X-Debbugs-Envelope-To: 16694 Cc: ml_emacs-lists@binary-island.eu, emacs bugs , cyd@gnu.org, 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 (/) Clemens Sch=FCller wrote on 2014/03/2= 6=20 16:58:11: >=20 > Hello! >=20 >=20 > > Sounds similar to several other bug reports since the regression was > > introduced in December. Most discussion is at > > http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D16694 . > > > > Chong, it would be nice if you could opine about the problem and > > Matthias's patches. The offending commit was: > > > > 15e14b165dcbc6566a0459b0d5e66f89080f569e is the first bad commit > > commit 15e14b165dcbc6566a0459b0d5e66f89080f569e > > Author: Chong Yidong gnu.org> > > 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. >=20 > Here is my patch, after I copied the ebuild file in my local overlay: >=20 > --- /usr/portage/app-editors/emacs-vcs/emacs-vcs-24.4.9999.ebuild=20 2014-03-21 15:22:30.000000000 +0100 > +++ emacs-vcs-24.4.9999.ebuild 2014-03-24 21:20:49.947795118 +0100 > @@ -115,6 +115,9 @@ > fi >=20 > epatch=5Fuser > + epatch=20 "${FILESDIR}/0001-lisp-faces.el-Fix-application-of-X-resource-attribut.patc= h" > + epatch=20 "${FILESDIR}/0002-lisp-faces.el-Fix-empty-face-handling.patch" > + epatch=20 "${FILESDIR}/0003-lisp-faces.el-Centralize-no-init-from-x-resources-ch.patc= h" >=20 > # Fix filename reference in redirected man page > sed -i -e "/^\\.so/s/etags/&-${EMACS=5FSUFFIX}/" doc/man/ctags.1 \ If this is a local fix you are better off using epatch=5Fuser than modifyin= g=20 the ebuild. You could also try the easier: (setq initial-frame-alist default-frame-alist) Jocke From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 26 19:49:34 2014 Received: (at 16694) by debbugs.gnu.org; 26 Mar 2014 23:49:34 +0000 Received: from localhost ([127.0.0.1]:51498 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WSxZd-0007eJ-4w for submit@debbugs.gnu.org; Wed, 26 Mar 2014 19:49:33 -0400 Received: from mail-oa0-f48.google.com ([209.85.219.48]:57518) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WSxZa-0007e9-PX for 16694@debbugs.gnu.org; Wed, 26 Mar 2014 19:49:31 -0400 Received: by mail-oa0-f48.google.com with SMTP id m1so3509252oag.35 for <16694@debbugs.gnu.org>; Wed, 26 Mar 2014 16:49:30 -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=X+DengQmwnoTMBMME18JavwrbLEi67tw+sMd0lSm/oM=; b=wguwGpxjwYrdCpxDhkTvcI1Q7QLNEjnktSZ9gwoUXVqY1yy2MsZZLEFlNThlfpeH1H PA/2Z2rVCG6pTdAmiuMI9wOV9mOHxuiXyqI9Wx+QlkFWYBURSAH5GWhwD4tDTr1kXobI uJ4HfL9vkYLWLka38IXSPavHj+KaCD3OnJqPjdsAm1uibVvMbIf+vC86fKwU/4yePMvg 87RO3cmA9gshQmamZMRetkjqZ8oEoXKmGfAPbzTNNyRii/AA2fjkrbdqAco2C7ty7Abp yzQ/isCbS5YK/AJ+WGt5Ibj1O6gOUPtQPTaAz04R0oC4+m9Rcsi1QINJ8RoeURhjbhdc H+Wg== MIME-Version: 1.0 X-Received: by 10.182.16.131 with SMTP id g3mr10021835obd.46.1395877769864; Wed, 26 Mar 2014 16:49:29 -0700 (PDT) Received: by 10.76.6.44 with HTTP; Wed, 26 Mar 2014 16:49:29 -0700 (PDT) In-Reply-To: <5331D45B.7090704@binary-island.eu> References: <52F601AE.5040309@binary-island.eu> <87k3bj40nu.fsf@cougar.home.aneadesign.com> <83wqfiz36v.fsf@gnu.org> <5331D45B.7090704@binary-island.eu> Date: Wed, 26 Mar 2014 19:49:29 -0400 Message-ID: Subject: Re: bug#16694: bugs #16694/#16378: Patches From: Barry OReilly To: Matthias Dahl Content-Type: multipart/alternative; boundary=001a11c2d6f89f6ec304f58b1ef8 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 16694 Cc: Eli Zaretskii , =?ISO-8859-1?Q?Clemens_Sch=FCller?= , 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 (/) --001a11c2d6f89f6ec304f58b1ef8 Content-Type: text/plain; charset=ISO-8859-1 In face-set-after-frame-default, a function untouched in Chong's changes, there is: (let ((window-system-p (memq (window-system frame) '(x w32)))) [...] ;; 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)) But the (and (not (eq face 'default)) window-system-p ...) is completely pointless, since Chong's changes have face-spec-recalc call make-face-x-resource-internal unconditionally. On a hunch, I tried: diff --git a/lisp/faces.el b/lisp/faces.el index e008993..1150d8f 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -1642,7 +1642,9 @@ then the override spec." (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)) + (and (not (eq face 'default)) + (memq (window-system frame) '(x w32)) + (make-face-x-resource-internal face frame))) (defun face-spec-set-2 (face frame spec) "Set the face attributes of FACE on FRAME according to SPEC." with no other patches, and './src/emacs -r' worked as expected. Should face-spec-recalc take responsibility for calling make-face-x-resource-internal, or leave it to the caller as before the offending changes? A patch along those lines also allows './src/emacs -r' to work: 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." Someone who knows this code better than me should decide what's The Right Thing. --001a11c2d6f89f6ec304f58b1ef8 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable
In face-set-after-frame-default, a function untouched in C= hong's
changes, there is:

=A0 (let ((window-system-p (memq (w= indow-system frame) '(x w32))))
[...]
=A0=A0=A0 =A0=A0=A0 ;; Init= ialize faces from face spec and custom theme.
=A0=A0=A0 =A0=A0=A0 (face-spec-recalc face frame)
=A0=A0=A0 =A0=A0=A0 ;;= X resources for the default face are applied during
=A0=A0=A0 =A0=A0=A0= ;; `x-create-frame'.
=A0=A0=A0 =A0=A0=A0 (and (not (eq face 'de= fault)) window-system-p
=A0=A0=A0 =A0=A0=A0 =A0(make-face-x-resource-int= ernal face frame))

But the

=A0 (and (not (eq face 'default)) window-system-p ..= .)

is completely pointless, since Chong's changes have face-spec= -recalc
call make-face-x-resource-internal unconditionally. On a hunch, = I
tried:

diff --git a/lisp/faces.el b/lisp/faces.el
index e008993..= 1150d8f 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1642,7 = +1642,9 @@ then the override spec."
=A0=A0=A0=A0=A0=A0 (face-spec-s= et-2 face frame spec))
=A0=A0=A0=A0 (setq spec (face-spec-choose (get face 'face-override-spec= ) frame))
=A0=A0=A0=A0 (face-spec-set-2 face frame spec))
-=A0 (make-= face-x-resource-internal face frame))
+=A0 (and (not (eq face 'defau= lt))
+=A0=A0=A0=A0=A0=A0 (memq (window-system frame) '(x w32))
+=A0=A0=A0=A0=A0=A0 (make-face-x-resource-internal face frame)))
=A0
= =A0(defun face-spec-set-2 (face frame spec)
=A0=A0 "Set the face at= tributes of FACE on FRAME according to SPEC."

with no other pat= ches, and './src/emacs -r' worked as expected.

Should face-spec-recalc take responsibility for calling
make-face-x-= resource-internal, or leave it to the caller as before the
offending cha= nges? A patch along those lines also allows './src/emacs
-r' to = work:

diff --git a/lisp/faces.el b/lisp/faces.el
index e008993..2f8560a 10= 0644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1615,7 +1615,8 @@= function for its other effects."
=A0=A0 ;; Initialize the face if = it does not exist, then recalculate.
=A0=A0 (make-empty-face face)
=A0=A0 (dolist (frame (frame-list))
-= =A0=A0=A0 (face-spec-recalc face frame)))
+=A0=A0=A0 (face-spec-recalc f= ace frame)
+=A0=A0=A0 (make-face-x-resource-internal face frame)))
= =A0
=A0(defun face-spec-recalc (face frame)
=A0=A0 "Reset the face attributes of FACE on FRAME according to its sp= ecs.
@@ -1641,8 +1642,7 @@ then the override spec."
=A0=A0=A0=A0= =A0=A0 (setq spec (face-spec-choose (face-default-spec face) frame))
=A0= =A0=A0=A0=A0=A0 (face-spec-set-2 face frame spec))
=A0=A0=A0=A0 (setq spec (face-spec-choose (get face 'face-override-spec= ) frame))
-=A0=A0=A0 (face-spec-set-2 face frame spec))
-=A0 (make-fa= ce-x-resource-internal face frame))
+=A0=A0=A0 (face-spec-set-2 face fra= me spec)))
=A0
=A0(defun face-spec-set-2 (face frame spec)
=A0=A0 "Set the face at= tributes of FACE on FRAME according to SPEC."

Someone who knows= this code better than me should decide what's The
Right Thing.
<= br>
--001a11c2d6f89f6ec304f58b1ef8-- From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 27 10:23:05 2014 Received: (at 16694) by debbugs.gnu.org; 27 Mar 2014 14:23:05 +0000 Received: from localhost ([127.0.0.1]:52861 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WTBCy-00080e-Pz for submit@debbugs.gnu.org; Thu, 27 Mar 2014 10:23:05 -0400 Received: from chene.dit.umontreal.ca ([132.204.246.20]:57554) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WTBCu-000804-RJ for 16694@debbugs.gnu.org; Thu, 27 Mar 2014 10:23:01 -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 s2RENHv1024427; Thu, 27 Mar 2014 10:23:18 -0400 Received: by pastel.home (Postfix, from userid 20848) id 2768960217; Thu, 27 Mar 2014 10:22:57 -0400 (EDT) From: Stefan Monnier To: Barry OReilly 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> Date: Thu, 27 Mar 2014 10:22:57 -0400 In-Reply-To: (Barry OReilly's message of "Wed, 26 Mar 2014 19:49:29 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-NAI-Spam-Flag: NO X-NAI-Spam-Level: X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0.2 X-NAI-Spam-Rules: 2 Rules triggered GEN_SPAM_FEATRE=0.2, RV4894=0 X-NAI-Spam-Version: 2.3.0.9362 : core <4894> : inlines <652> : streams <1145573> : uri <1711555> X-Spam-Score: -1.7 (-) X-Debbugs-Envelope-To: 16694 Cc: Matthias Dahl , Clemens =?windows-1252?Q?Sch=FCller?= , 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: -1.7 (-) > Someone who knows this code better than me should decide what's The > Right Thing. Not sure if such a person exists, and she does, whether she is reading this list :-( Stefan From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 28 10:59:27 2014 Received: (at 16694) by debbugs.gnu.org; 28 Mar 2014 14:59:27 +0000 Received: from localhost ([127.0.0.1]:54984 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WTYFi-0006fN-Gk for submit@debbugs.gnu.org; Fri, 28 Mar 2014 10:59:26 -0400 Received: from mail-ob0-f175.google.com ([209.85.214.175]:43488) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WTYFg-0006fA-20 for 16694@debbugs.gnu.org; Fri, 28 Mar 2014 10:59:24 -0400 Received: by mail-ob0-f175.google.com with SMTP id uy5so6049195obc.6 for <16694@debbugs.gnu.org>; Fri, 28 Mar 2014 07:59: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=cmw61OjEmpZCtTB/kSTPPKNgBDHZu1vgOvlSAkzEdCc=; b=xGP5uEMDDkEB3VLL9IfJnH7t3ziRURWdFwqEzEW2mrTw0V0/XkkZoaQw6QmUfeZ7ru 5nM9gFkFzQ2hMmuy/wnsHaANzUU+LhuVgFWRsy3a5sb4i5S+ua3dF4lXhuRKF7FhMLbW HDWFZ0U/I+tmC7urxGdeKSxUjhOMLbqzlhAVnMTCreCJcaNYcnlOhsrvce0MNZ/ZyLhM DmKPQd0TgBvwe8m4ZijpDmvu9y2GOeYhzkJDi9ycfo6eGuKPTQcYcc4rNTPEq7e7r8gF qLSRvhPYFdcISdXKM7w2uLXZMdVVeoxkvrJrCtumjzT81qx8h+9w5qJup0+h//5z/8K3 dcyQ== MIME-Version: 1.0 X-Received: by 10.182.250.200 with SMTP id ze8mr666487obc.72.1396018763187; Fri, 28 Mar 2014 07:59:23 -0700 (PDT) Received: by 10.76.6.44 with HTTP; Fri, 28 Mar 2014 07:59:22 -0700 (PDT) In-Reply-To: References: <52F601AE.5040309@binary-island.eu> <87k3bj40nu.fsf@cougar.home.aneadesign.com> <83wqfiz36v.fsf@gnu.org> <5331D45B.7090704@binary-island.eu> Date: Fri, 28 Mar 2014 10:59:22 -0400 Message-ID: Subject: Re: bug#16694: bugs #16694/#16378: Patches From: Barry OReilly To: Matthias Dahl Content-Type: multipart/alternative; boundary=089e0160c6607b215604f5abf2ab X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 16694 Cc: =?ISO-8859-1?Q?Clemens_Sch=FCller?= , 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 (/) --089e0160c6607b215604f5abf2ab Content-Type: text/plain; charset=ISO-8859-1 The last patch I indicated is my best guess safe patch that solves the --reverse-video symptom I care about. To summarize my rationale: an unconditional call to make-face-x-resource-internal was moved down into face-spec-recalc, but at least one other caller of face-spec-recalc clearly doesn't want an unconditional call to make-face-x-resource-internal. Moving the make-face-x-resource-internal call back up one call level to the caller which the offending patch touched thus seems right. Matthias, in your patch, that same make-face-x-resource-internal call was moved to an earlier line in the same face-spec-recalc function, so it's not obvious how to reconcile your patch with mine. The concern I raised applies equally to your patch. Maybe you could give my patch a go to see if it has any effect on your ill symptom. If not, then perhaps you have an idea about reconciling the patches? --089e0160c6607b215604f5abf2ab Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable
The last patch I indicated is my best guess safe patch tha= t solves the --reverse-video symptom I care about. To summarize my rational= e: an unconditional call to make-face-x-resource-internal was moved down in= to face-spec-recalc, but at least one other caller of face-spec-recalc clea= rly doesn't want an unconditional call to make-face-x-resource-internal= . Moving the make-face-x-resource-internal call back up one call level to t= he caller which the offending patch touched thus seems right.

Matthias, in your patch, that same make-face-x-resource-internal call w= as moved to an earlier line in the same face-spec-recalc function, so it= 9;s not obvious how to reconcile your patch with mine. The concern I raised= applies equally to your patch. Maybe you could give my patch a go to see i= f it has any effect on your ill symptom. If not, then perhaps you have an i= dea about reconciling the patches?

--089e0160c6607b215604f5abf2ab-- From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 28 11:15:35 2014 Received: (at 16694) by debbugs.gnu.org; 28 Mar 2014 15:15:35 +0000 Received: from localhost ([127.0.0.1]:54995 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WTYVK-00075m-Kg 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: 16694 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:29 2014 Received: (at 16694) by debbugs.gnu.org; 1 Apr 2014 17:15:29 +0000 Received: from localhost ([127.0.0.1]:59624 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WV2HY-0005cv-GS 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: 16694 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:16 2014 Received: (at 16694) by debbugs.gnu.org; 1 Apr 2014 18:18:16 +0000 Received: from localhost ([127.0.0.1]:59684 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WV3GI-0007II-UI for submit@debbugs.gnu.org; Tue, 01 Apr 2014 14:18:15 -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: 16694 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:42 2014 Received: (at 16694) by debbugs.gnu.org; 2 Apr 2014 15:04:42 +0000 Received: from localhost ([127.0.0.1]:33071 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WVMiX-0002uY-JI for submit@debbugs.gnu.org; Wed, 02 Apr 2014 11:04:42 -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: 16694 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:48:00 2014 Received: (at 16694) by debbugs.gnu.org; 2 Apr 2014 16:48:00 +0000 Received: from localhost ([127.0.0.1]:33190 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WVOKV-0006td-RF for submit@debbugs.gnu.org; Wed, 02 Apr 2014 12:48:00 -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: 16694 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:18 2014 Received: (at 16694) by debbugs.gnu.org; 2 Apr 2014 18:36:18 +0000 Received: from localhost ([127.0.0.1]:33265 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WVQ1I-0002Qi-Q6 for submit@debbugs.gnu.org; Wed, 02 Apr 2014 14:36:17 -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: 16694 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:07 2014 Received: (at 16694) by debbugs.gnu.org; 2 Apr 2014 19:35:07 +0000 Received: from localhost ([127.0.0.1]:33295 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WVQwD-000429-Fo for submit@debbugs.gnu.org; Wed, 02 Apr 2014 15:35:05 -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: 16694 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:46 2014 Received: (at 16694-done) by debbugs.gnu.org; 5 Apr 2014 07:52:46 +0000 Received: from localhost ([127.0.0.1]:35847 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WWLPA-0007uD-RN for submit@debbugs.gnu.org; Sat, 05 Apr 2014 03:52:45 -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: 16694-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 16694-done) by debbugs.gnu.org; 5 Apr 2014 15:48:58 +0000 Received: from localhost ([127.0.0.1]:36968 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WWSq1-0006Tp-ID for submit@debbugs.gnu.org; Sat, 05 Apr 2014 11:48:57 -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: 16694-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:04 2014 Received: (at 16694-done) by debbugs.gnu.org; 5 Apr 2014 16:16:04 +0000 Received: from localhost ([127.0.0.1]:37006 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WWTGE-0008Nl-LX for submit@debbugs.gnu.org; Sat, 05 Apr 2014 12:16:03 -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: 16694-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:11 2014 Received: (at 16694-done) by debbugs.gnu.org; 7 Apr 2014 09:58:11 +0000 Received: from localhost ([127.0.0.1]:38782 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WX6Je-0000tv-Oh for submit@debbugs.gnu.org; Mon, 07 Apr 2014 05:58:11 -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: 16694-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:40 2014 Received: (at 16694-done) by debbugs.gnu.org; 9 Apr 2014 09:49:40 +0000 Received: from localhost ([127.0.0.1]:38458 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WXp8V-0003Rt-Aa for submit@debbugs.gnu.org; Wed, 09 Apr 2014 05:49:40 -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: 16694-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:33:02 2014 Received: (at 16694-done) by debbugs.gnu.org; 12 Apr 2014 14:33:02 +0000 Received: from localhost ([127.0.0.1]:46309 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WYyzN-0007DZ-DK for submit@debbugs.gnu.org; Sat, 12 Apr 2014 10:33:01 -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: 16694-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 16694-done) by debbugs.gnu.org; 12 Apr 2014 18:32:21 +0000 Received: from localhost ([127.0.0.1]:46432 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WZ2iz-0005mY-54 for submit@debbugs.gnu.org; Sat, 12 Apr 2014 14:32:21 -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: 16694-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:23 2014 Received: (at 16694-done) by debbugs.gnu.org; 12 Apr 2014 18:32:23 +0000 Received: from localhost ([127.0.0.1]:46438 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WZ2j0-0005my-PK for submit@debbugs.gnu.org; Sat, 12 Apr 2014 14:32:23 -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: 16694-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 unknown Sat Jun 21 10:26:49 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