diff options
| author | Karoly Lorentey | 2005-11-23 01:35:21 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2005-11-23 01:35:21 +0000 |
| commit | 950bed4bb96d2a580818bdaab64a164c7c9a1c1e (patch) | |
| tree | 131973e52125af75637cd0417215ba3c5b7d1de4 /src/image.c | |
| parent | 59e085e04d44b0331620b55a64eb94bf99cf81b1 (diff) | |
| parent | 5fdd4cf709ffb9c92cb565a60117afbd6fc43aa5 (diff) | |
| download | emacs-950bed4bb96d2a580818bdaab64a164c7c9a1c1e.tar.gz emacs-950bed4bb96d2a580818bdaab64a164c7c9a1c1e.zip | |
Merged from miles@gnu.org--gnu-2005 (patch 656-658)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-656
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-657
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-658
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-444
Diffstat (limited to 'src/image.c')
| -rw-r--r-- | src/image.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/image.c b/src/image.c index c7bc71ee909..d020b2ac394 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -3755,7 +3755,7 @@ x_create_bitmap_from_xpm_data (f, bits) | |||
| 3755 | XpmFreeAttributes (&attrs); | 3755 | XpmFreeAttributes (&attrs); |
| 3756 | return id; | 3756 | return id; |
| 3757 | } | 3757 | } |
| 3758 | #endif /* HAVE_X_WINDOWS */ | 3758 | #endif /* defined (HAVE_XPM) && defined (HAVE_X_WINDOWS) */ |
| 3759 | 3759 | ||
| 3760 | /* Load image IMG which will be displayed on frame F. Value is | 3760 | /* Load image IMG which will be displayed on frame F. Value is |
| 3761 | non-zero if successful. */ | 3761 | non-zero if successful. */ |