From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#16378: bug#16694: bugs #16694/#16378: Patches Date: Sat, 05 Apr 2014 10:52:54 +0300 Message-ID: <83lhvk8b6x.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> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8BIT X-Trace: ger.gmane.org 1396684406 23172 80.91.229.3 (5 Apr 2014 07:53:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 5 Apr 2014 07:53:26 +0000 (UTC) Cc: 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 To: Matthias Dahl Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Apr 05 09:53:18 2014 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WWLPi-0008VI-Ip for geb-bug-gnu-emacs@m.gmane.org; Sat, 05 Apr 2014 09:53:18 +0200 Original-Received: from localhost ([::1]:53606 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WWLPi-0004vb-6P for geb-bug-gnu-emacs@m.gmane.org; Sat, 05 Apr 2014 03:53:18 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33272) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WWLPa-0004uK-FF for bug-gnu-emacs@gnu.org; Sat, 05 Apr 2014 03:53:15 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WWLPV-0007MI-Cc for bug-gnu-emacs@gnu.org; Sat, 05 Apr 2014 03:53:10 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:34666) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WWLPV-0007M9-9W for bug-gnu-emacs@gnu.org; Sat, 05 Apr 2014 03:53:05 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1WWLPU-0007v4-9O for bug-gnu-emacs@gnu.org; Sat, 05 Apr 2014 03:53:04 -0400 Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Sat, 05 Apr 2014 07:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 16378 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Mail-Followup-To: 16378@debbugs.gnu.org, eliz@gnu.org, monnier@iro.umontreal.ca Original-Received: via spool by 16378-done@debbugs.gnu.org id=D16378.139668436330386 (code D ref 16378); Sat, 05 Apr 2014 07:53:02 +0000 Original-Received: (at 16378-done) by debbugs.gnu.org; 5 Apr 2014 07:52:43 +0000 Original-Received: from localhost ([127.0.0.1]:35843 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WWLP7-0007u0-Kc for submit@debbugs.gnu.org; Sat, 05 Apr 2014 03:52:42 -0400 Original-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 Original-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) Original-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) In-reply-to: <533C26F3.4040600@binary-island.eu> X-012-Sender: halo1@inter.net.il X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:87761 Archived-At: > 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.