From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Matthias Dahl Newsgroups: gmane.emacs.bugs Subject: bug#16434: bug#16694: bugs #16694/#16378: Patches Date: Wed, 09 Apr 2014 11:49:25 +0200 Message-ID: <534517A5.1070306@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> <83lhvk8b6x.fsf@gnu.org> <83a9bz92h2.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------060102080708020807030402" X-Trace: ger.gmane.org 1397037031 7905 80.91.229.3 (9 Apr 2014 09:50:31 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 9 Apr 2014 09:50:31 +0000 (UTC) Cc: 16694-done@debbugs.gnu.org, gundaetiapo@gmail.com, cs.mlists+bug-gnu-emacs@mailbox.org, 16378-done@debbugs.gnu.org, 16434-done@debbugs.gnu.org To: Eli Zaretskii , Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Apr 09 11:50:22 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 1WXp9A-0001ku-Tx for geb-bug-gnu-emacs@m.gmane.org; Wed, 09 Apr 2014 11:50:21 +0200 Original-Received: from localhost ([::1]:45194 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WXp9A-0000KU-HU for geb-bug-gnu-emacs@m.gmane.org; Wed, 09 Apr 2014 05:50:20 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36764) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WXp8z-0008W7-NW for bug-gnu-emacs@gnu.org; Wed, 09 Apr 2014 05:50:14 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WXp8u-00074S-I2 for bug-gnu-emacs@gnu.org; Wed, 09 Apr 2014 05:50:09 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:47117) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WXp8u-00074G-FX for bug-gnu-emacs@gnu.org; Wed, 09 Apr 2014 05:50:04 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1WXp8t-0003St-Ut for bug-gnu-emacs@gnu.org; Wed, 09 Apr 2014 05:50:04 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Matthias Dahl Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 09 Apr 2014 09:50:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 16434 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 16434-done@debbugs.gnu.org id=D16434.139703697913264 (code D ref 16434); Wed, 09 Apr 2014 09:50:03 +0000 Original-Received: (at 16434-done) by debbugs.gnu.org; 9 Apr 2014 09:49:39 +0000 Original-Received: from localhost ([127.0.0.1]:38456 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WXp8U-0003Rj-8n for submit@debbugs.gnu.org; Wed, 09 Apr 2014 05:49:39 -0400 Original-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 Original-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) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 In-Reply-To: <83a9bz92h2.fsf@gnu.org> 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:87905 Archived-At: 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--