diff options
| author | Miles Bader | 2007-06-11 01:00:07 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-06-11 01:00:07 +0000 |
| commit | 67f3ad67ee317226cb5d1bb139de0cfd883fdc5e (patch) | |
| tree | 58a0e1bea7a1d8728fd32e6127a44434e7eac006 /src/xfaces.c | |
| parent | d17cf4eb2024cf54e4a216312184665094ee3df4 (diff) | |
| parent | 2d715b39ea1c89066f469405d065dd1a6631d28e (diff) | |
| download | emacs-67f3ad67ee317226cb5d1bb139de0cfd883fdc5e.tar.gz emacs-67f3ad67ee317226cb5d1bb139de0cfd883fdc5e.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 781-792)
- Update from CVS
- Merge from gnus--rel--5.10
- Merge from emacs--rel--22
* emacs--rel--22 (patch 33-41)
* gnus--rel--5.10 (patch 226-228)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-21
Diffstat (limited to 'src/xfaces.c')
| -rw-r--r-- | src/xfaces.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/xfaces.c b/src/xfaces.c index 86a40078919..75c8b3c7f49 100644 --- a/src/xfaces.c +++ b/src/xfaces.c | |||
| @@ -3952,6 +3952,8 @@ Otherwise check for the existence of a global face. */) | |||
| 3952 | { | 3952 | { |
| 3953 | Lisp_Object lface; | 3953 | Lisp_Object lface; |
| 3954 | 3954 | ||
| 3955 | face = resolve_face_name (face, 1); | ||
| 3956 | |||
| 3955 | if (!NILP (frame)) | 3957 | if (!NILP (frame)) |
| 3956 | { | 3958 | { |
| 3957 | CHECK_LIVE_FRAME (frame); | 3959 | CHECK_LIVE_FRAME (frame); |