Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
emacs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
4
Issues
4
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
emacs
emacs
Commits
f972be09
Commit
f972be09
authored
Jul 09, 2014
by
Stefan Monnier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* lisp/faces.el (face-name): Undo last change.
(x-resolve-font-name): Don't call face-name. Fixes: debbugs:17956
parent
fded0b4a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/faces.el
lisp/faces.el
+1
-6
No files found.
lisp/ChangeLog
View file @
f972be09
2014-07-09 Stefan Monnier <monnier@iro.umontreal.ca>
* faces.el (face-name): Undo last change.
(x-resolve-font-name): Don't call face-name (bug#17956).
2014-07-09 Fabián Ezequiel Gallina <fgallina@gnu.org>
Fix dedenters and electric colon handling. (Bug#15163)
...
...
lisp/faces.el
View file @
f972be09
...
...
@@ -359,10 +359,7 @@ If `inhibit-x-resources' is non-nil, this function does nothing."
(
defun
face-name
(
face
)
"Return the name of face FACE."
(
check-face
face
)
(
if
(
symbolp
face
)
(
symbol-name
face
)
face
))
(
symbol-name
(
check-face
face
)))
(
defun
face-all-attributes
(
face
&optional
frame
)
...
...
@@ -2734,8 +2731,6 @@ If PATTERN is nil, return the name of the frame's base font, which never
contains wildcards.
Given optional arguments FACE and FRAME, return a font which is
also the same size as FACE on FRAME, or fail."
(
when
face
(
setq
face
(
face-name
face
)))
(
and
(
eq
frame
t
)
(
setq
frame
nil
))
(
if
pattern
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment