GitLab

	* 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

* browse-url.el (browse-url-mozilla-new-window-is-tab): New.
(browse-url-mozilla): Use it.

properties from the reformatted line.

invalid timestamp.

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.

functionality of mac-wheel-button-is-mouse-2 to be correct.  Also
switched the default to Qnil from Qt.

There are now 3 tests which can be run in batch mode.
See the Commentary section.

functionality of mac-wheel-button-is-mouse-2 to be correct.  Also
switched the default to Qnil from Qt.

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.

Use feature names rather than file names if applicable.

(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).

rather than comparing it textually.

 cus-test-vars-with-changed-state in a different way.

ln(-1) should be i*pi, not pi.

require to avoid loops when loaddefs.el is loaded after vc-cvs.el.

(Custom-reset-saved):  Don't test for saved-value.

through to make and configure (-m, & -c,).
Added option to not copy Application into installer, the default
for X11 builds.  Does not copy CVS directories into installer.
Clarified some of the usage notes.

source directory.
Fix typo.
Require cus-load explicitly.

Revision of the 1998, 2000 code designed for Emacs 20.3 resp. 21.1.