diff options
| author | Glenn Morris | 2013-02-20 22:03:02 -0800 |
|---|---|---|
| committer | Glenn Morris | 2013-02-20 22:03:02 -0800 |
| commit | f0c954fa281b31517bbab8cf82a5d81fc7caeff5 (patch) | |
| tree | 6e035f26c6fe954ca9d780912b99d609af3d1612 /doc | |
| parent | c1bf363a732b66cdbe1c28c11f4b8fe3f064098d (diff) | |
| download | emacs-f0c954fa281b31517bbab8cf82a5d81fc7caeff5.tar.gz emacs-f0c954fa281b31517bbab8cf82a5d81fc7caeff5.zip | |
More doc updates for multi-frame images
* doc/emacs/files.texi (File Conveniences): Not just GIFs can be animated.
* doc/lispref/display.texi (Multi-Frame Images): Minor rephrasing.
* etc/NEWS: Related edits.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/emacs/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/emacs/files.texi | 3 | ||||
| -rw-r--r-- | doc/lispref/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/lispref/display.texi | 8 |
4 files changed, 13 insertions, 6 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index ba6f7e323e0..83d5b1d25ed 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-02-21 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * files.texi (File Conveniences): Not just GIFs can be animated. | ||
| 4 | |||
| 1 | 2013-02-13 Glenn Morris <rgm@gnu.org> | 5 | 2013-02-13 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * ack.texi (Acknowledgments): Don't mention yow any more. | 7 | * ack.texi (Acknowledgments): Don't mention yow any more. |
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi index a85c16ee1bc..7f7ae483cd5 100644 --- a/doc/emacs/files.texi +++ b/doc/emacs/files.texi | |||
| @@ -1937,8 +1937,7 @@ or taller than the frame, the usual point motion keys (@kbd{C-f}, | |||
| 1937 | displayed. If the image can be animated, the command @kbd{RET} | 1937 | displayed. If the image can be animated, the command @kbd{RET} |
| 1938 | (@code{image-toggle-animation}) starts or stops the animation. | 1938 | (@code{image-toggle-animation}) starts or stops the animation. |
| 1939 | Animation plays once, unless the option @code{image-animate-loop} is | 1939 | Animation plays once, unless the option @code{image-animate-loop} is |
| 1940 | non-@code{nil}. Currently, Emacs only supports animation in GIF | 1940 | non-@code{nil}. |
| 1941 | files. | ||
| 1942 | 1941 | ||
| 1943 | @cindex ImageMagick support | 1942 | @cindex ImageMagick support |
| 1944 | @vindex imagemagick-enabled-types | 1943 | @vindex imagemagick-enabled-types |
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 74f2eb9312b..355d0b57be5 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-02-21 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * display.texi (Multi-Frame Images): Minor rephrasing. | ||
| 4 | |||
| 1 | 2013-02-20 Glenn Morris <rgm@gnu.org> | 5 | 2013-02-20 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * display.texi (GIF Images, TIFF Images): Delete these nodes. | 7 | * display.texi (GIF Images, TIFF Images): Delete these nodes. |
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 1e596c14233..eae6af9969d 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi | |||
| @@ -4925,10 +4925,10 @@ integer (counting from 0) that specifies which frame is being displayed. | |||
| 4925 | This function returns non-@code{nil} if @var{image} contains more than | 4925 | This function returns non-@code{nil} if @var{image} contains more than |
| 4926 | one frame. The actual return value is a cons @code{(@var{nimages} | 4926 | one frame. The actual return value is a cons @code{(@var{nimages} |
| 4927 | . @var{delay})}, where @var{nimages} is the number of frames and | 4927 | . @var{delay})}, where @var{nimages} is the number of frames and |
| 4928 | @var{delay} is the delay in seconds between them, if the image itself | 4928 | @var{delay} is the delay in seconds between them, or @code{nil} |
| 4929 | specifies a delay. Images that are intended to be animated usually | 4929 | if the image does not specify a delay. Images that are intended to be |
| 4930 | specify a frame delay, whereas ones that are intended to be treated as | 4930 | animated usually specify a frame delay, whereas ones that are intended |
| 4931 | multiple pages do not. | 4931 | to be treated as multiple pages do not. |
| 4932 | @end defun | 4932 | @end defun |
| 4933 | 4933 | ||
| 4934 | @defun image-current-frame image | 4934 | @defun image-current-frame image |