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 @@ +2013-08-18 Eli Zaretskii + + * markers.texi (The Region): Improve indexing. + 2013-08-17 Xue Fuqiao * 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}, @node The Region @section The Region -@cindex region (between point and mark) +@c The index entry must be just ``region'' to make it the first hit +@c when the user types ``i region RET'', because otherwise the Info +@c reader will present substring matches in alphabetical order, +@c putting this one near the end, with something utterly unrelated as +@c the first hit. +@cindex region The text between point and the mark is known as @dfn{the region}. 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 @@ +2013-08-18 Lars Magne Ingebrigtsen + + * image.c (imagemagick_get_animation_cache): Don't segfault when + pruning all entries. + 2013-08-18 Ken Brown * 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 * imagemagick_get_animation_cache (MagickWand *wand) { char *signature = xstrdup (MagickGetImageSignature (wand)); - struct animation_cache *cache = animation_cache; + struct animation_cache *cache; imagemagick_prune_animation_cache (); + cache = animation_cache; if (! cache) {