merge bil-desktop general with original general.el