commit eacdc9eb6c89346fb72535632a1c65f6483b639f (HEAD, refs/remotes/origin/master) Author: David Reitter Date: Sat Jun 11 11:58:20 2016 +1000 Prevent compiler warning for unused arguments * lisp/international/ucs-normalize.el (ucs-normalize-hfs-nfd-pre-write-conversion): Prevent compiler warning for unused arguments, add coment. diff --git a/lisp/international/ucs-normalize.el b/lisp/international/ucs-normalize.el index 8c4f491..4b364ee 100644 --- a/lisp/international/ucs-normalize.el +++ b/lisp/international/ucs-normalize.el @@ -613,7 +613,8 @@ COMPOSITION-PREDICATE will be used to compose region." (- (point-max) (point-min))))) ;; Pre-write conversion for `utf-8-hfs'. -(defun ucs-normalize-hfs-nfd-pre-write-conversion (from to) +;; _from and _to are legacy arguments (see `define-coding-system'). +(defun ucs-normalize-hfs-nfd-pre-write-conversion (_from _to) (ucs-normalize-HFS-NFD-region (point-min) (point-max))) ;;; coding-system definition commit b4788b9394f3c9d50468607cbcf82e9490fa7c1d Author: Paul Eggert Date: Fri Jun 10 17:18:24 2016 -0700 Catch malloc_get_state, malloc_set_state failure This should help insulate Emacs better from configuration screwups. Future versions of the GNU C library are planned to deprecate these functions, but will continue to support them in already-built-and-dumped Emacs executables. * src/alloc.c (malloc_initialize_hook) [DOUG_LEA_MALLOC]: Abort if malloc_set_state fails. (alloc_unexec_pre) [DOUG_LEA_MALLOC]: Report malloc_get_state failure, and exit. diff --git a/src/alloc.c b/src/alloc.c index 054e1ca..3feed51 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -20,6 +20,7 @@ along with GNU Emacs. If not, see . */ #include +#include #include #include /* For CHAR_BIT. */ #include /* For SIGABRT, SIGDANGER. */ @@ -150,7 +151,8 @@ malloc_initialize_hook (void) } } - malloc_set_state (malloc_state_ptr); + if (malloc_set_state (malloc_state_ptr) != 0) + emacs_abort (); # ifndef XMALLOC_OVERRUN_CHECK alloc_unexec_post (); # endif @@ -174,6 +176,8 @@ alloc_unexec_pre (void) { #ifdef DOUG_LEA_MALLOC malloc_state_ptr = malloc_get_state (); + if (!malloc_state_ptr) + fatal ("malloc_get_state: %s", strerror (errno)); #endif #ifdef HYBRID_MALLOC bss_sbrk_did_unexec = true; commit c803af788d4140c7253b1d091e6f7fb63b5a214a Author: Eli Zaretskii Date: Fri Jun 10 11:57:17 2016 +0300 Show returned value after gdb-mi "finish" command * lisp/progmodes/gdb-mi.el (gdb-stopped): Display the expected "Value returned" message in response to "finish", when not produced by GDB/MI. (Bug#23720) diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el index 5ad101d..b2c0614 100644 --- a/lisp/progmodes/gdb-mi.el +++ b/lisp/progmodes/gdb-mi.el @@ -2488,7 +2488,9 @@ current thread and update GDB buffers." ;; Reason is available with target-async only (let* ((result (gdb-json-string output-field)) (reason (bindat-get-field result 'reason)) - (thread-id (bindat-get-field result 'thread-id))) + (thread-id (bindat-get-field result 'thread-id)) + (retval (bindat-get-field result 'return-value)) + (varnum (bindat-get-field result 'gdb-result-var))) ;; -data-list-register-names needs to be issued for any stopped ;; thread @@ -2514,6 +2516,15 @@ current thread and update GDB buffers." (if (string-equal reason "exited-normally") (setq gdb-active-process nil)) + (when (and retval varnum + ;; When the user typed CLI commands, GDB/MI helpfully + ;; includes the "Value returned" response in the "~" + ;; record; here we avoid displaying it twice. + (not (string-match "^Value returned is " gdb-filter-output))) + (setq gdb-filter-output + (concat gdb-filter-output + (format "Value returned is %s = %s\n" varnum retval)))) + ;; Select new current thread. ;; Don't switch if we have no reasons selected