diff options
| -rw-r--r-- | doc/lispref/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/lispref/markers.texi | 7 | ||||
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/image.c | 3 |
4 files changed, 17 insertions, 2 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 7618736ee4f..995203b5109 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-08-18 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * markers.texi (The Region): Improve indexing. | ||
| 4 | |||
| 1 | 2013-08-17 Xue Fuqiao <xfq.free@gmail.com> | 5 | 2013-08-17 Xue Fuqiao <xfq.free@gmail.com> |
| 2 | 6 | ||
| 3 | * modes.texi (SMIE, SMIE Grammar, SMIE Indentation): Add some indexes. | 7 | * modes.texi (SMIE, SMIE Grammar, SMIE Indentation): Add some indexes. |
diff --git a/doc/lispref/markers.texi b/doc/lispref/markers.texi index 3863e2f980a..d94908994e9 100644 --- a/doc/lispref/markers.texi +++ b/doc/lispref/markers.texi | |||
| @@ -654,7 +654,12 @@ more marks than this are pushed onto the @code{mark-ring}, | |||
| 654 | 654 | ||
| 655 | @node The Region | 655 | @node The Region |
| 656 | @section The Region | 656 | @section The Region |
| 657 | @cindex region (between point and mark) | 657 | @c The index entry must be just ``region'' to make it the first hit |
| 658 | @c when the user types ``i region RET'', because otherwise the Info | ||
| 659 | @c reader will present substring matches in alphabetical order, | ||
| 660 | @c putting this one near the end, with something utterly unrelated as | ||
| 661 | @c the first hit. | ||
| 662 | @cindex region | ||
| 658 | 663 | ||
| 659 | The text between point and the mark is known as @dfn{the region}. | 664 | The text between point and the mark is known as @dfn{the region}. |
| 660 | Various functions operate on text delimited by point and the mark, but | 665 | Various functions operate on text delimited by point and the mark, but |
diff --git a/src/ChangeLog b/src/ChangeLog index 671f6afc722..7ee41698bad 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-08-18 Lars Magne Ingebrigtsen <larsi@gnus.org> | ||
| 2 | |||
| 3 | * image.c (imagemagick_get_animation_cache): Don't segfault when | ||
| 4 | pruning all entries. | ||
| 5 | |||
| 1 | 2013-08-18 Ken Brown <kbrown@cornell.edu> | 6 | 2013-08-18 Ken Brown <kbrown@cornell.edu> |
| 2 | 7 | ||
| 3 | * sheap.c (STATIC_HEAP_SIZE): Adjust to current needs; use bigger | 8 | * sheap.c (STATIC_HEAP_SIZE): Adjust to current needs; use bigger |
diff --git a/src/image.c b/src/image.c index 198d5545c96..1452e8659b5 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -7932,9 +7932,10 @@ struct animation_cache * | |||
| 7932 | imagemagick_get_animation_cache (MagickWand *wand) | 7932 | imagemagick_get_animation_cache (MagickWand *wand) |
| 7933 | { | 7933 | { |
| 7934 | char *signature = xstrdup (MagickGetImageSignature (wand)); | 7934 | char *signature = xstrdup (MagickGetImageSignature (wand)); |
| 7935 | struct animation_cache *cache = animation_cache; | 7935 | struct animation_cache *cache; |
| 7936 | 7936 | ||
| 7937 | imagemagick_prune_animation_cache (); | 7937 | imagemagick_prune_animation_cache (); |
| 7938 | cache = animation_cache; | ||
| 7938 | 7939 | ||
| 7939 | if (! cache) | 7940 | if (! cache) |
| 7940 | { | 7941 | { |