From: Paul Eggert Date: Mon, 30 May 2011 16:12:16 +0000 (-0700) Subject: Merge from trunk. X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~45^2~7 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=de677ace77fa48962be80b668662a7009498e5d6;p=emacs.git Merge from trunk. --- de677ace77fa48962be80b668662a7009498e5d6 diff --cc src/ChangeLog index 2968b2da85f,b7c1057ae7e..7b0c73adbc9 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,17 -1,7 +1,19 @@@ +2011-05-30 Paul Eggert + + * gnutls.c: Use Emacs's memory allocators. + Without this change, the gnutls library would invoke malloc etc. + directly, which causes problems on non-SYNC_INPUT hosts, and which + runs afoul of improving memory_full behavior. (Bug#8761) + (fn_gnutls_global_set_mem_functions): New macro or function pointer. + (emacs_gnutls_global_init): Use it to specify xmalloc, xrealloc, + xfree instead of the default malloc, realloc, free. + (Fgnutls_boot): No need to check for memory allocation failure, + since xmalloc does that for us. + 2011-05-30 Paul Eggert + * alloc.c (lisp_align_malloc): Omit unnecessary val==NULL tests. + * eval.c (Qdebug): Now static. * lisp.h (Qdebug): Remove decl. This reverts a part of the 2011-04-26T11:26:05Z!dan.colascione@gmail.com that inadvertently undid part of