aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2011-07-02 23:38:19 +0200
committerLars Magne Ingebrigtsen2011-07-02 23:38:19 +0200
commitf68d76d0d46480317e9edf162ae0f095b92a2b52 (patch)
tree69550ca926315836cbbf61a90e529d849ce09547
parente83cc1f76a22efef9576097a92c9cfb32298cfbb (diff)
downloademacs-f68d76d0d46480317e9edf162ae0f095b92a2b52.tar.gz
emacs-f68d76d0d46480317e9edf162ae0f095b92a2b52.zip
* display.texi (Showing Images): Mention the point of sliced images (bug bug#7836).
-rw-r--r--doc/lispref/ChangeLog5
-rw-r--r--doc/lispref/display.texi7
2 files changed, 12 insertions, 0 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index ab17e455f75..6e7ef2bbb7d 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
12011-07-02 Lars Magne Ingebrigtsen <larsi@gnus.org>
2
3 * display.texi (Showing Images): Mention the point of sliced
4 images (bug bug#7836).
5
12011-07-02 Eli Zaretskii <eliz@gnu.org> 62011-07-02 Eli Zaretskii <eliz@gnu.org>
2 7
3 * variables.texi (Defining Variables, Void Variables) 8 * variables.texi (Defining Variables, Void Variables)
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 069b3c91d7b..6d19d73545e 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -4700,10 +4700,17 @@ it a @code{display} property which specifies @var{image}. @xref{Display
4700Property}. 4700Property}.
4701@end defun 4701@end defun
4702 4702
4703@cindex slice, image
4704@cindex image slice
4703@defun insert-sliced-image image &optional string area rows cols 4705@defun insert-sliced-image image &optional string area rows cols
4704This function inserts @var{image} in the current buffer at point, like 4706This function inserts @var{image} in the current buffer at point, like
4705@code{insert-image}, but splits the image into @var{rows}x@var{cols} 4707@code{insert-image}, but splits the image into @var{rows}x@var{cols}
4706equally sized slices. 4708equally sized slices.
4709
4710If an image is inserted ``sliced'', then the Emacs display engine will
4711treat each slice as a separate image, and allow more intuitive
4712scrolling up/down, instead of jumping up/down the entire image when
4713paging through a buffer that displays (large) images.
4707@end defun 4714@end defun
4708 4715
4709@defun put-image image pos &optional string area 4716@defun put-image image pos &optional string area