Now on revision 113946. ------------------------------------------------------------ revno: 113946 fixes bug: http://debbugs.gnu.org/15106 committer: Paul Eggert branch nick: trunk timestamp: Sun 2013-08-18 22:46:17 -0700 message: * process.c (handle_child_signal): Fix crash; deleted pid. This was introduced by my 2013-08-12 fix for Bug#15035. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-08-19 04:24:19 +0000 +++ src/ChangeLog 2013-08-19 05:46:17 +0000 @@ -1,3 +1,8 @@ +2013-08-19 Paul Eggert + + * process.c (handle_child_signal): Fix crash; deleted pid (Bug#15106). + This was introduced by my 2013-08-12 fix for Bug#15035. + 2013-08-19 Dmitry Antipov * image.c (imagemagick_create_cache, imagemagick_get_animation_cache) === modified file 'src/process.c' --- src/process.c 2013-08-16 05:15:51 +0000 +++ src/process.c 2013-08-19 05:46:17 +0000 @@ -6153,7 +6153,10 @@ = (MOST_NEGATIVE_FIXNUM <= TYPE_MINIMUM (pid_t) && TYPE_MAXIMUM (pid_t) <= MOST_POSITIVE_FIXNUM); Lisp_Object head = XCAR (tail); - Lisp_Object xpid = XCAR (head); + Lisp_Object xpid; + if (! CONSP (head)) + continue; + xpid = XCAR (head); if (all_pids_are_fixnums ? INTEGERP (xpid) : NUMBERP (xpid)) { pid_t deleted_pid; ------------------------------------------------------------ revno: 113945 committer: Paul Eggert branch nick: trunk timestamp: Sun 2013-08-18 22:23:05 -0700 message: Merge from gnulib. This incorporates: 2013-08-15 warnings: minor optimization 2013-08-15 warnings: check -Wfoo rather than -Wno-foo diff: === modified file 'ChangeLog' --- ChangeLog 2013-08-15 16:37:15 +0000 +++ ChangeLog 2013-08-19 05:23:05 +0000 @@ -1,3 +1,9 @@ +2013-08-19 Paul Eggert + + Merge from gnulib, incorporating: + 2013-08-15 warnings: minor optimization + 2013-08-15 warnings: check -Wfoo rather than -Wno-foo + 2013-08-15 Ken Brown * configure.ac (G_SLICE_ALWAYS_MALLOC): Update comment. === modified file 'm4/warnings.m4' --- m4/warnings.m4 2013-05-16 07:10:39 +0000 +++ m4/warnings.m4 2013-08-19 05:23:05 +0000 @@ -1,4 +1,4 @@ -# warnings.m4 serial 8 +# warnings.m4 serial 10 dnl Copyright (C) 2008-2013 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -25,15 +25,24 @@ AC_DEFUN([gl_COMPILER_OPTION_IF], [AS_VAR_PUSHDEF([gl_Warn], [gl_cv_warn_[]_AC_LANG_ABBREV[]_$1])dnl AS_VAR_PUSHDEF([gl_Flags], [_AC_LANG_PREFIX[]FLAGS])dnl +AS_LITERAL_IF([$1], + [m4_pushdef([gl_Positive], m4_bpatsubst([$1], [^-Wno-], [-W]))], + [gl_positive="$1" +case $gl_positive in + -Wno-*) gl_positive=-W`expr "X$gl_positive" : 'X-Wno-\(.*\)'` ;; +esac +m4_pushdef([gl_Positive], [$gl_positive])])dnl AC_CACHE_CHECK([whether _AC_LANG compiler handles $1], m4_defn([gl_Warn]), [ gl_save_compiler_FLAGS="$gl_Flags" - gl_AS_VAR_APPEND(m4_defn([gl_Flags]), [" $gl_unknown_warnings_are_errors $1"]) + gl_AS_VAR_APPEND(m4_defn([gl_Flags]), + [" $gl_unknown_warnings_are_errors ]m4_defn([gl_Positive])["]) AC_COMPILE_IFELSE([m4_default([$4], [AC_LANG_PROGRAM([])])], [AS_VAR_SET(gl_Warn, [yes])], [AS_VAR_SET(gl_Warn, [no])]) gl_Flags="$gl_save_compiler_FLAGS" ]) AS_VAR_IF(gl_Warn, [yes], [$2], [$3]) +m4_popdef([gl_Positive])dnl AS_VAR_POPDEF([gl_Flags])dnl AS_VAR_POPDEF([gl_Warn])dnl ]) ------------------------------------------------------------ revno: 113944 committer: Katsumi Yamaoka branch nick: trunk timestamp: Mon 2013-08-19 05:10:33 +0000 message: Gnus: Exclude iso-2022-jp-2 and shift_jis from the default value set to mm-coding-system-priorities for Japanese users diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2013-08-13 07:02:00 +0000 +++ doc/misc/ChangeLog 2013-08-19 05:10:33 +0000 @@ -1,3 +1,9 @@ +2013-08-19 Katsumi Yamaoka + + * emacs-mime.texi (Encoding Customization): Exclude iso-2022-jp-2 and + shift_jis from the default value set to mm-coding-system-priorities for + Japanese users. + 2013-08-13 Glenn Morris * reftex.texi (LaTeX xr Package, Options - Table of Contents) === modified file 'doc/misc/emacs-mime.texi' --- doc/misc/emacs-mime.texi 2013-03-17 22:55:13 +0000 +++ doc/misc/emacs-mime.texi 2013-08-19 05:10:33 +0000 @@ -871,15 +871,15 @@ @vindex mm-coding-system-priorities Prioritize coding systems to use for outgoing messages. The default is @code{nil}, which means to use the defaults in Emacs, but is -@code{(iso-8859-1 iso-2022-jp iso-2022-jp-2 shift_jis utf-8)} when -running Emacs in the Japanese language environment. It is a list of -coding system symbols (aliases of coding systems are also allowed, use -@kbd{M-x describe-coding-system} to make sure you are specifying correct -coding system names). For example, if you have configured Emacs -to prefer UTF-8, but wish that outgoing messages should be sent in -ISO-8859-1 if possible, you can set this variable to -@code{(iso-8859-1)}. You can override this setting on a per-message -basis by using the @code{charset} @acronym{MML} tag (@pxref{MML Definition}). +@code{(iso-8859-1 iso-2022-jp utf-8)} when running Emacs in the Japanese +language environment. It is a list of coding system symbols (aliases of +coding systems are also allowed, use @kbd{M-x describe-coding-system} to +make sure you are specifying correct coding system names). For example, +if you have configured Emacs to prefer UTF-8, but wish that outgoing +messages should be sent in ISO-8859-1 if possible, you can set this +variable to @code{(iso-8859-1)}. You can override this setting on a +per-message basis by using the @code{charset} @acronym{MML} tag +(@pxref{MML Definition}). As different hierarchies prefer different charsets, you may want to set @code{mm-coding-system-priorities} according to the hierarchy in Gnus. @@ -904,7 +904,7 @@ (mm-coding-system-priorities '(iso-8859-15 iso-8859-1 utf-8))) ("^fj\\." ;; Japanese (mm-coding-system-priorities - '(iso-8859-1 iso-2022-jp iso-2022-jp-2 shift_jis utf-8))) + '(iso-8859-1 iso-2022-jp utf-8))) ("^ru\\." ;; Cyrillic (mm-coding-system-priorities '(koi8-r iso-8859-5 iso-8859-1 utf-8)))) === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2013-08-13 07:22:05 +0000 +++ lisp/gnus/ChangeLog 2013-08-19 05:10:33 +0000 @@ -1,3 +1,8 @@ +2013-08-19 Katsumi Yamaoka + + * mm-util.el (mm-coding-system-priorities): Exclude iso-2022-jp-2 and + shift_jis from the default value set for Japanese users. + 2013-08-13 Glenn Morris * gnus-icalendar.el (gnus-icalendar-org-capture-file): Fix type. === modified file 'lisp/gnus/mm-util.el' --- lisp/gnus/mm-util.el 2013-05-23 05:05:27 +0000 +++ lisp/gnus/mm-util.el 2013-08-19 05:10:33 +0000 @@ -845,17 +845,17 @@ (not lang) nil) ;; In XEmacs 21.5 it may be the one like "Japanese (UTF-8)". ((string-match "\\`Japanese" lang) - ;; Japanese users prefer iso-2022-jp to euc-japan or - ;; shift_jis, however iso-8859-1 should be used when - ;; there are only ASCII text and Latin-1 characters. - '(iso-8859-1 iso-2022-jp iso-2022-jp-2 shift_jis utf-8)))) + ;; Japanese users prefer iso-2022-jp to others usually used + ;; for `buffer-file-coding-system', however iso-8859-1 should + ;; be used when there are only ASCII and Latin-1 characters. + '(iso-8859-1 iso-2022-jp utf-8)))) "Preferred coding systems for encoding outgoing messages. More than one suitable coding system may be found for some text. By default, the coding system with the highest priority is used to encode outgoing messages (see `sort-coding-systems'). If this variable is set, it overrides the default priority." - :version "21.2" + :version "24.4" :type '(repeat (symbol :tag "Coding system")) :group 'mime) ------------------------------------------------------------ revno: 113943 committer: Dmitry Antipov branch nick: trunk timestamp: Mon 2013-08-19 08:24:19 +0400 message: * image.c (imagemagick_create_cache, imagemagick_get_animation_cache) (imagemagick_prune_animation_cache): Now static. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-08-18 19:18:43 +0000 +++ src/ChangeLog 2013-08-19 04:24:19 +0000 @@ -1,3 +1,8 @@ +2013-08-19 Dmitry Antipov + + * image.c (imagemagick_create_cache, imagemagick_get_animation_cache) + (imagemagick_prune_animation_cache): Now static. + 2013-08-18 Lars Magne Ingebrigtsen * image.c (imagemagick_get_animation_cache): Don't segfault when === modified file 'src/image.c' --- src/image.c 2013-08-18 19:18:43 +0000 +++ src/image.c 2013-08-19 04:24:19 +0000 @@ -7887,18 +7887,18 @@ static struct animation_cache *animation_cache = NULL; -struct animation_cache * +static struct animation_cache * imagemagick_create_cache (char *signature) { - struct animation_cache *cache = xzalloc (sizeof (struct animation_cache)); + struct animation_cache *cache = xzalloc (sizeof *cache); cache->signature = signature; cache->update_time = current_emacs_time (); return cache; } /* Discard cached images that haven't been used for a minute. */ -void -imagemagick_prune_animation_cache () +static void +imagemagick_prune_animation_cache (void) { struct animation_cache *cache = animation_cache; struct animation_cache *prev = NULL; @@ -7928,7 +7928,7 @@ } } -struct animation_cache * +static struct animation_cache * imagemagick_get_animation_cache (MagickWand *wand) { char *signature = xstrdup (MagickGetImageSignature (wand)); ------------------------------------------------------------ revno: 113942 committer: Xue Fuqiao branch nick: trunk timestamp: Mon 2013-08-19 07:12:32 +0800 message: Minor improving in indexing of buffer position. * doc/lispref/positions.texi (Positions): Improve indexing. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2013-08-18 19:25:15 +0000 +++ doc/lispref/ChangeLog 2013-08-18 23:12:32 +0000 @@ -1,3 +1,7 @@ +2013-08-18 Xue Fuqiao + + * positions.texi (Positions): Improve indexing. + 2013-08-18 Eli Zaretskii * markers.texi (The Region): Improve indexing. === modified file 'doc/lispref/positions.texi' --- doc/lispref/positions.texi 2013-08-16 00:20:56 +0000 +++ doc/lispref/positions.texi 2013-08-18 23:12:32 +0000 @@ -5,6 +5,7 @@ @node Positions @chapter Positions @cindex position (in buffer) +@cindex buffer position A @dfn{position} is the index of a character in the text of a buffer. More precisely, a position identifies the place between two characters === modified file 'doc/lispref/text.texi' --- doc/lispref/text.texi 2013-08-17 14:14:41 +0000 +++ doc/lispref/text.texi 2013-08-18 23:12:32 +0000 @@ -4028,6 +4028,7 @@ This represents a window configuration to restore in one frame, and a position to jump to in the current buffer. +@c FIXME: Mention frameset here. @item @code{(@var{frame-configuration} @var{position})} This represents a frame configuration to restore, and a position to jump to in the current buffer. ------------------------------------------------------------ revno: 113941 committer: Eli Zaretskii branch nick: trunk timestamp: Sun 2013-08-18 22:25:15 +0300 message: Minor improving in indexing of "region". doc/lispref/markers.texi (The Region): Improve indexing. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2013-08-17 14:14:41 +0000 +++ doc/lispref/ChangeLog 2013-08-18 19:25:15 +0000 @@ -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. === modified file 'doc/lispref/markers.texi' --- doc/lispref/markers.texi 2013-08-16 00:20:56 +0000 +++ doc/lispref/markers.texi 2013-08-18 19:25:15 +0000 @@ -654,7 +654,12 @@ @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 ------------------------------------------------------------ revno: 113940 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Sun 2013-08-18 21:18:43 +0200 message: * image.c (imagemagick_get_animation_cache): Don't segfault when pruning all entries. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-08-18 17:37:31 +0000 +++ src/ChangeLog 2013-08-18 19:18:43 +0000 @@ -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 === modified file 'src/image.c' --- src/image.c 2013-08-16 15:31:04 +0000 +++ src/image.c 2013-08-18 19:18:43 +0000 @@ -7932,9 +7932,10 @@ 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) { ------------------------------------------------------------ revno: 113939 committer: Ken Brown branch nick: trunk timestamp: Sun 2013-08-18 13:37:31 -0400 message: Change size of static heap on Cygwin; report maximum usage after dumping. * src/sheap.c (STATIC_HEAP_SIZE): Adjust to current needs; use bigger static heap if ENABLE_CHECKING is defined. (max_bss_sbrk_ptr): New variable. (bss_sbrk): Use it. (report_sheap_usage): Report maximum static heap usage instead of ending static heap usage. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-08-17 17:18:07 +0000 +++ src/ChangeLog 2013-08-18 17:37:31 +0000 @@ -1,3 +1,12 @@ +2013-08-18 Ken Brown + + * sheap.c (STATIC_HEAP_SIZE): Adjust to current needs; use bigger + static heap if ENABLE_CHECKING is defined. + (max_bss_sbrk_ptr): New variable. + (bss_sbrk): Use it. + (report_sheap_usage): Report maximum static heap usage instead of + ending static heap usage. + 2013-08-17 Eli Zaretskii * decompress.c (Fzlib_available_p) [WINDOWSNT]: Update the value === modified file 'src/sheap.c' --- src/sheap.c 2013-07-09 13:56:47 +0000 +++ src/sheap.c 2013-08-18 17:37:31 +0000 @@ -26,10 +26,18 @@ #include #ifdef __x86_64__ +#ifdef ENABLE_CHECKING +#define STATIC_HEAP_SIZE (28 * 1024 * 1024) +#else +#define STATIC_HEAP_SIZE (19 * 1024 * 1024) +#endif +#else /* x86 */ +#ifdef ENABLE_CHECKING #define STATIC_HEAP_SIZE (18 * 1024 * 1024) #else #define STATIC_HEAP_SIZE (13 * 1024 * 1024) #endif +#endif /* x86 */ int debug_sheap = 0; @@ -37,6 +45,7 @@ char bss_sbrk_buffer[STATIC_HEAP_SIZE]; char *bss_sbrk_ptr; +char *max_bss_sbrk_ptr; int bss_sbrk_did_unexec; void * @@ -44,7 +53,7 @@ { if (!bss_sbrk_ptr) { - bss_sbrk_ptr = bss_sbrk_buffer; + max_bss_sbrk_ptr = bss_sbrk_ptr = bss_sbrk_buffer; #ifdef CYGWIN sbrk (BLOCKSIZE); /* force space for fork to work */ #endif @@ -85,6 +94,8 @@ if (debug_sheap) printf ("allocated 0x%08x size %d\n", ret, request_size); bss_sbrk_ptr += (int) request_size; + if (bss_sbrk_ptr > max_bss_sbrk_ptr) + max_bss_sbrk_ptr = bss_sbrk_ptr; return ret; } } @@ -93,8 +104,8 @@ report_sheap_usage (int die_if_pure_storage_exceeded) { char buf[200]; - sprintf (buf, "Static heap usage: %d of %d bytes", - bss_sbrk_ptr - bss_sbrk_buffer, STATIC_HEAP_SIZE); + sprintf (buf, "Maximum static heap usage: %d of %d bytes", + max_bss_sbrk_ptr - bss_sbrk_buffer, STATIC_HEAP_SIZE); /* Don't log messages, cause at this point, we're not allowed to create buffers. */ message1_nolog (buf); ------------------------------------------------------------ revno: 113938 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2013-08-17 20:18:07 +0300 message: Fix a minor issue with loading zlib DLL on MS-Windows. src/decompress.c (Fzlib_available_p) [WINDOWSNT]: Update the value of zlib_initialized according to the results of calling init_zlib_functions. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-08-16 22:32:24 +0000 +++ src/ChangeLog 2013-08-17 17:18:07 +0000 @@ -1,3 +1,9 @@ +2013-08-17 Eli Zaretskii + + * decompress.c (Fzlib_available_p) [WINDOWSNT]: Update the value + of zlib_initialized according to the results of calling + init_zlib_functions. + 2013-08-16 Lars Magne Ingebrigtsen * image.c: Implement an ImageMagick per-image cache. === modified file 'src/decompress.c' --- src/decompress.c 2013-08-16 05:15:51 +0000 +++ src/decompress.c 2013-08-17 17:18:07 +0000 @@ -116,7 +116,8 @@ else { Lisp_Object status; - status = init_zlib_functions () ? Qt : Qnil; + zlib_initialized = init_zlib_functions (); + status = zlib_initialized ? Qt : Qnil; Vlibrary_cache = Fcons (Fcons (Qzlib_dll, status), Vlibrary_cache); return status; }