(ispell-point): Delete the sit-for; it was confusing.
(ispell): Don't use save-excursion; just restore current buffer.
(ispell-next): Don't save-excursion or save-window-excursion.
(ispell-point): Don't save-excursion.
(ispell-window-configuration): New variable.
(ispell-show-choices): Set it if not nil.
(ispell-next): Initialize to nil. Restore at end.
(x-initialize-frame-faces): Explicitly invert `modeline' face.
(x-create-frame-with-faces): Simplify; do nothing special
with `default' or `modeline' face.
(set-mark-command): Explicitly do so here.
When popping, don't mind if mark is inactive.
(pop-mark): Deactivate mark. Don't mind if it's inactive.
(yank-pop): Don't mind if mark is inactive.
(keyboard-quit): Deactivate the mark.
(kill-ring-save): When bouncing cursor,
bounce the mark too, so highlighted area does not change.
Set region-face.
(invert-face): Really do use the default colors.
(x-initialize-frame-faces): Always try "gray" color for
primary-selection; always invert if that fails.
Similar changes for highlight, secondary-selection.
(make-face): Add interactive spec.
(set-default-font): Deleted.
(emerge-find-difference): New command. Now on `.'.
(emerge-diff-ok-lines-regexp): Renamed from emerge-diff-ok-lines.
(emerge-diff3-ok-lines-regexp): Renamed from emerge-diff3-ok-lines.
(emerge-command-prefix): Now C-c C-c.
emerge-shadow-key-definition): Deleted.
Callers use substitute-key-definition.
(emerge-recursively-substitute-key-definition): Deleted.
Callers use substitute-key-definition.
(emerge-unselect-hook): Renamed from emerge-unselect-hooks.
(emerge-files-internal): Use file-local-copy to handle remote files.
(emerge-files-with-ancestor-internal): Likewise.
(emerge-remote-file-p): Deleted.
(emerge-abort): New command.
(describe-mode): Deleted.
(emerge-hash-string-into-string): Renamed from hash-string-into-string.
(emerge-unslashify-name): Renamed from unslashify-name.
(emerge-write-and-delete): Don't write-file if file-out is nil.
All initialization code moved into it.
Call at end of file, if using X frames already.
(x-create-frame-with-faces): Don't use faces if not initialized.
