(comint-after-partial-filename-command, comint-dynamic-complete-filename-command, comint-dynamic-complete-command-command, comint-get-current-command): Deleted. (comint-input-sentinel-functions): Replaces comint-input-sentinel. (comint-input-sentinel): Deleted. (comint-send-input): Run hooks on comint-input-sentinel-functions. (comint-output-sentinel-functions): Rename from comint-output-filter-functions. (comint-dynamic-complete-functions): New variable. (comint-mode-map): Removed menu-bar for command and variable completion. (comint-exec-1): Add to environment by hand; avoids using setenv. (comint-replace-by-expanded-history-before-point): Renamed from comint-replace-by-expanded-history. (comint-replace-by-expanded-history): New wrapper definition. (comint-word): New function. (comint-match-partial-filename): Use it. (comint-after-partial-filename, comint-match-partial-variable, comint-dynamic-complete-variable): Deleted. (comint-dynamic-complete): Run hooks on comint-dynamic-complete-functions. (comint-dynamic-complete-as-filename): Renamed from function comint-dynamic-complete-filename. (comint-dynamic-complete-filename): New wrapper definition. (comint-dynamic-simple-complete): Return a symbol representing completion.