procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge from trunk

Browse source
This commit is contained in:
Joakim Verona 2013-08-18 21:31:48 +02:00
commit fd4e76c279
4 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/lispref/ChangeLog
View file

@ -1,3 +1,7 @@
2013-08-18 Eli Zaretskii <eliz@gnu.org>
* markers.texi (The Region): Improve indexing.
2013-08-17 Xue Fuqiao <xfq.free@gmail.com>
* modes.texi (SMIE, SMIE Grammar, SMIE Indentation): Add some indexes.

7
doc/lispref/markers.texi
View file

@ -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

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2013-08-18 Lars Magne Ingebrigtsen <larsi@gnus.org>
* image.c (imagemagick_get_animation_cache): Don't segfault when
pruning all entries.
2013-08-18 Ken Brown <kbrown@cornell.edu>
* sheap.c (STATIC_HEAP_SIZE): Adjust to current needs; use bigger

3
src/image.c
View file

@ -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)
{