[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 r117361: * lisp/faces.el (face-name): Return inpu
From: |
Juri Linkov |
Subject: |
[Emacs-diffs] emacs-24 r117361: * lisp/faces.el (face-name): Return input arg `face' as is |
Date: |
Tue, 08 Jul 2014 09:03:30 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117361
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17956
committer: Juri Linkov <address@hidden>
branch nick: emacs-24
timestamp: Tue 2014-07-08 12:03:23 +0300
message:
* lisp/faces.el (face-name): Return input arg `face' as is
when it's not a symbol.
(x-resolve-font-name): Don't check if the face is a symbol.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/faces.el faces.el-20091113204419-o5vbwnq5f7feedwu-562
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-07-08 08:55:00 +0000
+++ b/lisp/ChangeLog 2014-07-08 09:03:23 +0000
@@ -1,5 +1,12 @@
2014-07-08 Juri Linkov <address@hidden>
+ * faces.el (face-name): Return input arg `face' as is
+ when it's not a symbol.
+ (x-resolve-font-name): Don't check if the face is a symbol.
+ (Bug#17956)
+
+2014-07-08 Juri Linkov <address@hidden>
+
* facemenu.el (list-colors-print): In help-echo format use %.2f
instead of %d because now HSV values are floating-point components
between 0.0 and 1.0.
=== modified file 'lisp/faces.el'
--- a/lisp/faces.el 2014-04-30 18:01:36 +0000
+++ b/lisp/faces.el 2014-07-08 09:03:23 +0000
@@ -359,7 +359,10 @@
(defun face-name (face)
"Return the name of face FACE."
- (symbol-name (check-face face)))
+ (check-face face)
+ (if (symbolp face)
+ (symbol-name face)
+ face))
(defun face-all-attributes (face &optional frame)
@@ -2731,8 +2734,8 @@
contains wildcards.
Given optional arguments FACE and FRAME, return a font which is
also the same size as FACE on FRAME, or fail."
- (or (symbolp face)
- (setq face (face-name face)))
+ (when face
+ (setq face (face-name face)))
(and (eq frame t)
(setq frame nil))
(if pattern
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 r117361: * lisp/faces.el (face-name): Return input arg `face' as is,
Juri Linkov <=