From: Matthias Dahl <ml_emacs-lists@binary-island.eu>
To: Eli Zaretskii <eliz@gnu.org>, Stefan Monnier <monnier@IRO.UMontreal.CA>
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
Subject: bug#16434: bug#16694: bugs #16694/#16378: Patches
Date: Wed, 09 Apr 2014 11:49:25 +0200 [thread overview]
Message-ID: <534517A5.1070306@binary-island.eu> (raw)
In-Reply-To: <83a9bz92h2.fsf@gnu.org>
[-- Attachment #1: Type: text/plain, Size: 262 bytes --]
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
[-- Attachment #2: 0001-lisp-ChangeLog-Fix-mail-address-for-entry.patch --]
[-- Type: text/x-patch, Size: 748 bytes --]
From 95dd6855bf10edc770a956031c756de4d2aab0e7 Mon Sep 17 00:00:00 2001
From: Matthias Dahl <matthias.dahl@binary-island.eu>
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 <ml_emacs-lists@binary-island.eu>
+2014-04-07 Matthias Dahl <matthias.dahl@binary-island.eu>
* 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
[-- Attachment #3: 0001-lisp-faces.el-Deprecate-optional-argument-of-make-fa.patch --]
[-- Type: text/x-patch, Size: 3006 bytes --]
From 28fd5ca2188a80b18762d4b378e7fef96963615c Mon Sep 17 00:00:00 2001
From: Matthias Dahl <matthias.dahl@binary-island.eu>
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 <matthias.dahl@binary-island.eu>
+
+ * 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 <dgutov@yandex.ru>
* 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
[-- Attachment #4: 0001-lisp-faces.el-Remove-deprecated-optional-argument-of.patch --]
[-- Type: text/x-patch, Size: 2761 bytes --]
From c8848a3c73f3773bdfcc35d177b0ec0421cfbdfa Mon Sep 17 00:00:00 2001
From: Matthias Dahl <matthias.dahl@binary-island.eu>
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 <matthias.dahl@binary-island.eu>
+
+ * 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 <dancol@dancol.org>
* 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
next prev parent reply other threads:[~2014-04-09 9:49 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-08 10:06 bug#16694: Regression by commit 115663 (bzr): Theme face attributes no longer take precedence over X resources Matthias Dahl
2014-02-12 22:21 ` Glenn Morris
2014-02-14 19:17 ` Matthias Dahl
2014-02-20 18:27 ` Eli Zaretskii
2014-02-20 21:47 ` Stefan Monnier
2014-02-21 9:07 ` Eli Zaretskii
2014-02-21 17:36 ` Stefan Monnier
2014-02-23 16:46 ` Matthias Dahl
2014-02-23 17:18 ` Eli Zaretskii
2014-02-24 19:29 ` Matthias Dahl
2014-02-26 15:49 ` bug#16378: Empty face settings ignored (was bug#16694: Regression by commit 115663 (bzr): Theme face attributes no longer take precedence over X resources) Stefan Monnier
2014-02-27 19:05 ` Matthias Dahl
2014-03-02 14:26 ` Matthias Dahl
2014-03-02 16:56 ` Eli Zaretskii
2014-03-05 16:14 ` bug#16694: bugs #16694/#16378: Patches Matthias Dahl
2014-03-16 19:13 ` bug#16378: " Matthias Dahl
2014-03-17 14:33 ` Eli Zaretskii
2014-03-21 18:05 ` bug#16694: " Barry OReilly
2014-03-22 8:30 ` Eli Zaretskii
2014-03-23 17:04 ` Matthias Dahl
2014-03-24 23:42 ` Barry OReilly
2014-03-24 23:49 ` Clemens Schüller
2014-03-25 14:17 ` Barry OReilly
2014-03-25 15:51 ` Eli Zaretskii
2014-03-25 16:17 ` Barry OReilly
2014-03-25 19:09 ` Matthias Dahl
2014-03-26 23:49 ` Barry OReilly
2014-03-27 14:22 ` Stefan Monnier
2014-03-28 14:59 ` Barry OReilly
2014-03-28 15:15 ` bug#16434: " Matthias Dahl
2014-04-01 17:15 ` Barry OReilly
2014-04-01 18:17 ` Matthias Dahl
2014-04-02 15:04 ` Matthias Dahl
2014-04-02 16:47 ` Barry OReilly
2014-04-02 18:36 ` bug#16434: " Matthias Dahl
2014-04-02 19:34 ` Barry OReilly
2014-04-05 7:52 ` bug#16378: " Eli Zaretskii
2014-04-05 15:48 ` Stefan Monnier
2014-04-05 16:15 ` Eli Zaretskii
2014-04-07 9:58 ` bug#16434: " Matthias Dahl
2014-04-09 9:49 ` Matthias Dahl [this message]
2014-04-12 11:37 ` bug#16378: " Matthias Dahl
2014-04-12 14:32 ` Eli Zaretskii
2014-04-12 14:57 ` Matthias Dahl
2014-04-23 15:51 ` bug#16434: " Eli Zaretskii
2014-04-23 18:11 ` Matthias Dahl
2014-04-24 0:36 ` Stefan Monnier
2014-04-27 8:22 ` Matthias Dahl
2014-04-28 16:38 ` Eli Zaretskii
2014-04-28 18:36 ` Matthias Dahl
2014-04-28 19:18 ` Eli Zaretskii
2014-04-30 18:34 ` Matthias Dahl
2014-03-26 15:30 ` Eli Zaretskii
2014-03-26 16:03 ` Glenn Morris
2014-03-26 13:39 ` bug#16694: Strange background color problem in gentoo Linux Barry OReilly
2014-03-26 15:11 ` Joakim Tjernlund
2014-03-26 16:49 ` Barry OReilly
2014-03-26 18:12 ` bug#16694: Strange background color problem in gentoo GNU/Linux Joakim Tjernlund
2014-03-26 15:58 ` bug#16694: Strange background color problem in gentoo Linux Clemens Schüller
2014-03-26 18:18 ` Joakim Tjernlund
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=534517A5.1070306@binary-island.eu \
--to=ml_emacs-lists@binary-island.eu \
--cc=16378-done@debbugs.gnu.org \
--cc=16434-done@debbugs.gnu.org \
--cc=16694-done@debbugs.gnu.org \
--cc=cs.mlists+bug-gnu-emacs@mailbox.org \
--cc=eliz@gnu.org \
--cc=gundaetiapo@gmail.com \
--cc=monnier@IRO.UMontreal.CA \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.