aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Bockgård2008-06-28 15:38:05 +0000
committerJohan Bockgård2008-06-28 15:38:05 +0000
commit3696411eeb360f4d7b3079a93b34db7d949c3ea2 (patch)
tree89c2ff86f431b67bdd28c0b3a9c7ff40a92e35a7
parentd7ad7a5ec1727cacfdca4d626d200501c97cef4d (diff)
downloademacs-3696411eeb360f4d7b3079a93b34db7d949c3ea2.tar.gz
emacs-3696411eeb360f4d7b3079a93b34db7d949c3ea2.zip
(Other Image Types): Fix copy/paste error; say "PBM", not "XBM".
-rw-r--r--doc/lispref/ChangeLog5
-rw-r--r--doc/lispref/display.texi4
2 files changed, 7 insertions, 2 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index f604fe7a3b8..e4fa5529ac4 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
12008-06-28 Johan Bockgård <bojohan@gnu.org>
2
3 * display.texi (Other Image Types): Fix copy/paste error; say
4 "PBM", not "XBM".
5
12008-06-26 Dan Nicolaescu <dann@ics.uci.edu> 62008-06-26 Dan Nicolaescu <dann@ics.uci.edu>
2 7
3 * os.texi: Remove references to obsolete systems. 8 * os.texi: Remove references to obsolete systems.
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 93b57549f7c..b09227d3f6c 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -4222,13 +4222,13 @@ image properties are supported.
4222@item :foreground @var{foreground} 4222@item :foreground @var{foreground}
4223The value, @var{foreground}, should be a string specifying the image 4223The value, @var{foreground}, should be a string specifying the image
4224foreground color, or @code{nil} for the default color. This color is 4224foreground color, or @code{nil} for the default color. This color is
4225used for each pixel in the XBM that is 1. The default is the frame's 4225used for each pixel in the PBM that is 1. The default is the frame's
4226foreground color. 4226foreground color.
4227 4227
4228@item :background @var{background} 4228@item :background @var{background}
4229The value, @var{background}, should be a string specifying the image 4229The value, @var{background}, should be a string specifying the image
4230background color, or @code{nil} for the default color. This color is 4230background color, or @code{nil} for the default color. This color is
4231used for each pixel in the XBM that is 0. The default is the frame's 4231used for each pixel in the PBM that is 0. The default is the frame's
4232background color. 4232background color.
4233@end table 4233@end table
4234 4234