aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2007-09-19 14:55:52 +0000
committerRichard M. Stallman2007-09-19 14:55:52 +0000
commit14b4fdfb2133be58fdb8dc88a8f97aac24a9486d (patch)
treeb6dfd05e2fde9d8718603799139f5556484c5245
parentaabc29c88d4d6c55acabb1988e44fc3a907d4622 (diff)
downloademacs-14b4fdfb2133be58fdb8dc88a8f97aac24a9486d.tar.gz
emacs-14b4fdfb2133be58fdb8dc88a8f97aac24a9486d.zip
(Display Property): Explain multiple display specs.
-rw-r--r--lispref/ChangeLog4
-rw-r--r--lispref/display.texi2
2 files changed, 5 insertions, 1 deletions
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 08a8dc4b0a7..b1eb12699fc 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,7 @@
12007-09-19 Richard Stallman <rms@gnu.org>
2
3 * display.texi (Display Property): Explain multiple display specs.
4
12007-08-30 Martin Rudalics <rudalics@gmx.at> 52007-08-30 Martin Rudalics <rudalics@gmx.at>
2 6
3 * commands.texi (Command Loop Info): Advise against changing 7 * commands.texi (Command Loop Info): Advise against changing
diff --git a/lispref/display.texi b/lispref/display.texi
index 1c585cf7795..f1b3b155223 100644
--- a/lispref/display.texi
+++ b/lispref/display.texi
@@ -3237,7 +3237,7 @@ to use the value specified by the frame.
3237insert images into text, and also control other aspects of how text 3237insert images into text, and also control other aspects of how text
3238displays. The value of the @code{display} property should be a 3238displays. The value of the @code{display} property should be a
3239display specification, or a list or vector containing several display 3239display specification, or a list or vector containing several display
3240specifications. 3240specifications (which apply in parallel to the text they cover).
3241 3241
3242 Some kinds of @code{display} properties specify something to display 3242 Some kinds of @code{display} properties specify something to display
3243instead of the text that has the property. In this case, ``the text'' 3243instead of the text that has the property. In this case, ``the text''