> For a plain scalar you can just use scoped_restore and make_scoped_restore. Nice! Thanks Tom. New patch attached. gdb/ChangeLog: * breakpoint.c (breakpoint_re_set): Temporarily force language_mode to language_mode_manual while calling breakpoint_re_set_one. gdb/testsuite/ChangeLog: * gdb.ada/bp_fun_addr: New testcase. Tested on x86_64-linux. -- Joel