Hi Carsten, herewith a first patch continuing command-name insertion (should be sent already but seems not). As the remaining has to be done manually, several patches will result. Maybe consider granting write-access. Cheers Andreas -- https://code.launchpad.net/~a-roehler/python-mode/python-mode-components https://code.launchpad.net/s-x-emacs-werkstatt/