Michael Kifer wrote:Short of fixing defcustom,defcustom does not need fixing IMO.the right solution would be to tell defvar to not zap defcustom's doc-string with an empty string,What? Why not just don't use ediff-defvar-local with defcustoms? Just write the two extra lines by hand?