> Well, I am the only one who uses demangler_list_buffer since it only > existed in my version. Ah, that's OK then. You didn't provide diffs against the official tree, so I didn't know what was effectively a problem wrt a merge.