Commit graph

27 commits

Author SHA1 Message Date
Michael Kifer
7d0278167b * ediff-diff.el: Moved variables around to have it compile under NT.
* ediff-help.el (ediff-use-long-help-message): made it customizable.

	* ediff-init.el (ediff-abbrev-jobname): use capitalize.

	* ediff-wind.el (ediff-skip-unsuitable-frames): deleted the
	redundant skip-small-frames test.

	* viper-cmd.el (viper-change-state-to-vi): disable overwrite mode.
	(viper-downgrade-to-insert): protect against errors in hooks.

	* viper-init.el (viper-vi-state-hook,viper-insert-state-hook,
	viper-replace-state-hook,viper-emacs-state-hook): do cursor handling.
	(viper-restore-cursor-type,viper-set-insert-cursor-type): new
	functions.

	* viper-util.el (viper-memq-char): bug fixes

	* viper.el (viper-mode): fix cursor handling.
2000-11-24 08:15:11 +00:00
Dave Love
fc794f13b3 (ediff-control-frame-parameters): Zero
tool-bar-lines.
2000-11-08 18:04:14 +00:00
Michael Kifer
fda2ce246a 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
* ediff-wind.el (ediff-setup-control-frame): enclose
	face-attribute in condition-case to avoid errors in older emacsen.
2000-10-30 02:16:11 +00:00
Michael Kifer
657f9cb8b7 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
* viper-cmd.el (viper-preserve-cursor-color): new test that avoids
	rewrawing the screen when changing cursor color.
	(viper-insert-state-pre-command-sentinel,
	viper-replace-state-pre-command-sentinel,
	viper-replace-state-post-command-sentinel): use
	viper-preserve-cursor-color.
	Many functions changed to use viper= instead of = when comparing
	characters.
	* viper-util.el (viper-memq-char,viper=): new functions for
	working with characters.
	(viper-change-cursor-color): fixed buglet.
	Many functions changed to use viper= instead of = when comparing
	characters.
	* viper.el (viper-insert-state-mode-list): added eshell.

	* ediff-init.el (ediff-before-setup-hook): new hook.
	Several typos fixed in various docstrings.
	* ediff-merg.el (ediff-show-clashes-only): docstring typo fixed.
	* ediff-nult.el (ediff-before-session-group-setup-hooks): new
	hook.
	(ediff-show-meta-buffer): run ediff-before-session-group-setup-hooks.
	* ediff-util.el (ediff-setup): run ediff-before-setup-hook.
	(ediff-other-buffer): use selected buffers if in Buffer-menu buffer.
	(ediff-get-selected-buffers): new function.
	* ediff-vers.el (ediff-vc-internal,ediff-rcs-internal,
	ediff-vc-merge-internal,ediff-rcs-merge-internal): use
	save-window-excursion.
	* ediff-wind.el (ediff-skip-unsuitable-frames): more robust
	termination check in while loop.
	* ediff.el (ediff-get-default-file-name): better defaults when in
	dired buffer.
	(ediff-files,ediff-merge-files,ediff-files3,
	ediff-merge-files-with-ancestor): use ediff-get-default-file-name.
2000-10-29 04:56:45 +00:00
Gerd Moellmann
4b47289bb8 (ediff-control-frame-parameters): Add zero
tool-bar-lines.
2000-09-27 11:29:23 +00:00
Gerd Moellmann
bbe14ff422 (ediff-setup-control-frame): Remove :box
attribute from mode-line face of Ediff control frame.
2000-06-28 20:19:18 +00:00
Michael Kifer
55d7ff38f1 * viper-cmd.el (viper-envelop-ESC-key): added the option to
translate all ESC key sequences.
	(viper-goto-mark-subr): restore markers for files for which
	they were saved.
	* viper-init.el (viper-translate-all-ESC-keysequences): new variable.
	* viper-util.el (viper-set-replace-overlay-glyphs,
	viper-set-replace-overlay): always check if the replacement
	overlay is live.
	* viper.el (viper-vi-state-mode-list): added major modes.
	* ediff-wind.el: minor comment changes.
	* ediff.el: copyright notice date fix.
2000-02-28 06:16:44 +00:00
Dave Love
6628e7f806 dummy 1999-12-18 16:14:32 +00:00
Michael Kifer
3af0304a61 *** empty log message *** 1999-11-01 07:16:15 +00:00
Michael Kifer
2eb4bdca8a new version 1998-05-04 22:42:59 +00:00
Michael Kifer
e756eb9faf new version 1997-07-31 04:04:23 +00:00
Michael Kifer
1e70790f2f new version 1997-07-17 19:37:07 +00:00
Michael Kifer
ddc90f39b0 new version 1997-05-31 01:10:39 +00:00
Michael Kifer
bf5d92c5e3 *** empty log message *** 1996-12-28 02:53:04 +00:00
Michael Kifer
92c51e075e *** empty log message *** 1996-09-20 01:10:05 +00:00
Michael Kifer
bbe6126cba *** empty log message *** 1996-06-22 01:54:34 +00:00
Michael Kifer
4ae69eaccf *** empty log message *** 1996-02-16 06:36:35 +00:00
Erik Naggum
b578f267af Update FSF's address. 1996-01-14 07:34:30 +00:00
Karl Heuer
50893fe933 (ediff-mouse-pixel-threshold): Renamed from
ediff-mouse-pixel-threshhold.
1996-01-04 23:07:38 +00:00
Michael Kifer
6853a93735 (ediff-make-frame-position): fixed bugs.
(ediff-control-frame-parameters): fixed defaults.
1995-10-06 01:00:10 +00:00
Karl Heuer
f9d5a20f45 (ediff-skip-unsuitable-frames): Use make-frame,
not ediff-make-frame.
1995-07-17 22:51:48 +00:00
Richard M. Stallman
9cb2482e93 (ediff-control-frame-parameters): Specify user-position. 1995-06-27 17:05:29 +00:00
Karl Heuer
18b5607fcd (ediff-make-control-frame): optimized for display.
Commented out (redraw-display), to improve speed.

Got rid of toolbars in control frame in xemacs

Changed window-min-height from 1 to 2

(ediff-diff-at-point,ediff-toggle-multiframe): bug fixes.
(ediff-destroy-control-frame,ediff-window-display-p): new functions.

Converted xemacs *screen* nomenclature to *frame*.
Incorporated overlay strings. Ediff no longer runs under emacs
19.28 and earlier and XEmacs 19.11 and earlier.

Changed window-system to ediff-window-display.

(ediff-toggle-multiframe): fixed.
(ediff-destroy-control-frame): new function.
1995-06-05 23:42:53 +00:00
Karl Heuer
8485d210e5 (ediff-setup-control-frame): Make
Ediff delete the old control frame before creating a new one.
1995-05-30 19:20:47 +00:00
Karl Heuer
a0f4808873 (ediff-setup-control-frame): Use
designated-minibuffer-frame while making the new frame.
And delete the old frame if its minibuffer is not in that frame.
(ediff-setup-windows-multiframe-compare)
(ediff-setup-windows-multiframe-merge): Don't mess with
default-minibuffer-frame here and don't kill the old control frame.
1995-05-29 06:27:50 +00:00
Karl Heuer
732be46569 Update copyright. 1995-04-07 01:20:53 +00:00
Karl Heuer
475f903199 Initial revision 1995-03-16 22:34:51 +00:00