* ediff-init.el (ediff-frame-char-height): use frame-selected-window.
* ediff-util.el (ediff-file-checked-in-p): changed progn with and
* ediff-wind.el (ediff-skip-unsuitable-frames): distinguish selected
frame from frame of selected window
(ediff-frame-has-dedicated-windows): don't select any frames to avoid
changing selected windows
(ediff-setup-control-frame): make sure auto-rase is properly set for
the control frame
use RFC 2822 From: header as the envelope address.
(mail-envelope-from): New function, this should be used instead of
looking at the `mail-envelope-from' variable.
(sendmail-send-it): Use it.
* mail/smtpmail.el (smtpmail-via-smtp): Use it.
if we're already in the proper buffer.
(change-log-resolve-conflict): New fun.
(change-log-mode): Use it and use define-derived-mode.
(change-log-merge): Allow other-log to be a buffer.
Don't add a \n if there are already enough \n's.
(smerge-match-conflict): Don't assume as much about smerge-begin-re.
(smerge-resolve-function): New var.
(smerge-resolve): New command.
(smerge-basic-map): Bind it.
(custom-load-symbol): Don't use preloaded-file-list now that
load-history is always complete. Don't look up the expanded file
name in load-history (looked like an XEmacsism).
(tramp-handle-file-truename): If it's a directory,
append slash only if result doesn't end in a slash already.
(tramp-handle-file-truename): Restructure logic. If list of steps
is nil, return "/" as the real name.
(tramp-completion-mode): Add "\\(" and "\\)". Otherwise,
`match-string' doesn't make sense. From Michael Albinus.
(tramp-host-with-port-regexp): New defcustom. Equal to previous
`tramp-host-regexp'. From Michael Albinus.
(tramp-host-regexp): Taken off hashes in host names. Otherwise,
scanning files like .rhosts would take comments as host names.
From Michael Albinus.
(tramp-file-name-structure, tramp-multi-file-name-hop-structure):
Replace `tramp-host-regexp' by `tramp-host-with-port-regexp'.
From Michael Albinus.
(tramp-action-terminal): New function.
(tramp-terminal-prompt-regexp): New variable, matches "tset"
prompts.
(tramp-actions-before-shell): Use them.
(tramp-handle-shell-command): Logic error. From Ivan
Zakharyaschev <imz@altlinux.org>.
