diff options
| author | Karoly Lorentey | 2005-02-20 18:47:54 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2005-02-20 18:47:54 +0000 |
| commit | b5d78df397f8cdcd20f3bcfbed2eb71d522abddd (patch) | |
| tree | cedfc1db69595526c12da068ea7ff5bdf3b806f2 /src/xfaces.c | |
| parent | 60c73d2ed638e5d51643c65a0fc6dea618fc72c8 (diff) | |
| parent | eedeacb3074baad8ce752a506f9f435c98e42ff4 (diff) | |
| download | emacs-b5d78df397f8cdcd20f3bcfbed2eb71d522abddd.tar.gz emacs-b5d78df397f8cdcd20f3bcfbed2eb71d522abddd.zip | |
Merged from miles@gnu.org--gnu-2005 (patch 17-26, 107-116)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-107
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-108
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-109
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-110
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-112
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-113
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-114
<no summary provided>
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-115
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-116
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-17
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-18
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-19
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-20
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-21
More work on moving images to etc/images
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-22
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-23
Fix errors with image-file installation
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-24
etc/Makefile.in (install): Put gnus-tut.txt in the right place.
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-25
etc/Makefile.in (install, uninstall): Fix installed image dirs.
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-26
etc/Makefile.in (install): Create $(etcdir)/images/gnus dir.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-296
Diffstat (limited to 'src/xfaces.c')
| -rw-r--r-- | src/xfaces.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xfaces.c b/src/xfaces.c index 9b2d5731508..025139377aa 100644 --- a/src/xfaces.c +++ b/src/xfaces.c | |||
| @@ -4151,7 +4151,7 @@ FRAME 0 means change the face on all frames, and change the default | |||
| 4151 | } | 4151 | } |
| 4152 | else if (EQ (k, QCcolor)) | 4152 | else if (EQ (k, QCcolor)) |
| 4153 | { | 4153 | { |
| 4154 | if (!STRINGP (v) || SCHARS (v) == 0) | 4154 | if (!NILP (v) && (!STRINGP (v) || SCHARS (v) == 0)) |
| 4155 | break; | 4155 | break; |
| 4156 | } | 4156 | } |
| 4157 | else if (EQ (k, QCstyle)) | 4157 | else if (EQ (k, QCstyle)) |