Hi teawater, Thanks again for doing this. I believe your patch is close to being OK. I took the liberty of adjusting it a bit, mostly re-wording a bit the comments and the documentation. I think Joel's suggestion was a good one: By gaining an "auto" setting, this is as much a maintainer command as "set breakpoint always-inserted" is. So, I believe it's time we move the command to the top level "set" command group. set can-use-displaced-stepping (auto|on|off) Eli, can I ask you to go over the help strings and the documentation in the patch below? Do they look OK-ish? -- Pedro Alves