procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
34406 commits 1 branch 0 tags 940 MiB
Commit graph

28 commits

Author SHA1 Message Date
Michael Kifer
513bea4565 2001-02-12 Michael Kifer <kifer@cs.sunysb.edu> 
* ediff-diff.el (ediff-make-diff2-buffer): Removed bogus checks
	for remote files.
	(ediff-coding-system-for-read): replaced the no-conversion default
	with raw-text.
	* ediff-init.el: Removed :version from defcustom vars.
	* ediff-util.el (ediff-compute-custom-diffs-maybe): Better
	handling of the diff mode
	* ediff.texi: Added ediff-coding-system-for-read.
	* viper.texi: typos
 2001-02-12 08:47:13 +00:00
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
Michael Kifer
d396e5218f 2000-07-05 Michael Kifer <kifer@cs.sunysb.edu> 
* ediff-diff.el (ediff-wordify): use syntax table.
	* ediff-init.el (ediff-has-face-support-p): use
	ediff-color-display-p.
	(ediff-color-display-p): use display-color-p, changed to defun
	from defsubst.
	Got rid of special cases for NeXT and OS/2.
	* ediff-wind.el (ediff-setup-control-frame): set proper modeline
	face.
 2000-07-06 05:36:21 +00:00
Michael Kifer
560ef11a16 2000-06-05 Michael Kifer <kifer@cs.sunysb.edu> 
* ediff-init.el (ediff-has-face-support-p): make it paint faces on
	tty's.
	* ediff-diff.el (ediff-exec-process): use --binary for fine
	differences whenever apropriate.
	* viper-cmd.el (viper-smart-suffix-list): rearranged list members.
	* viper.el (find-file,find-file-other-window): get viper to do
	wildcards.
 2000-06-05 00:07:02 +00:00
Michael Kifer
7997f1ca36 2000-05-25 Michael Kifer <kifer@cs.sunysb.edu> 
* ediff-diff.el (ediff-exec-process): delete --binary option from
	non-buffer ediff jobs.
 2000-05-25 17:21:32 +00:00
Michael Kifer
6de3983ff8 2000-05-24 Michael Kifer <kifer@cs.sunysb.edu> 
* ediff-diff.el (ediff-forward-word): take syntactic word class into
	account.
	(ediff-test-utility,ediff-diff-mandatory-option,
	ediff-reset-diff-options): utilities for proper initialization of
	ediff-diff-options and ediff-diff3-options on Windows.

	* ediff-init.el (ediff-merge-filename-prefix): new customizable
	variable.

	* ediff-mult.el (ediff-filegroup-action): use
	ediff-merge-filename-prefix.
 2000-05-24 17:31:16 +00:00
Michael Kifer
086171bf0b *** empty log message *** 1999-11-25 04:34:23 +00:00
Michael Kifer
3af0304a61 *** empty log message *** 1999-11-01 07:16:15 +00:00
Karl Heuer
863312cda6 Comment fix. 1999-06-22 22:46:17 +00:00
Michael Kifer
2eb4bdca8a new version 1998-05-04 22:42:59 +00:00
Richard M. Stallman
e3f1bc6b8c (ediff-exec-process): store-match-data => set-match-data. 1998-03-14 04:43:46 +00:00
Michael Kifer
c004db972f new version 1997-11-25 02:10:08 +00:00
Michael Kifer
328b4b7052 new version 1997-11-01 01:46:51 +00:00
Michael Kifer
bd698e987e new version 1997-09-06 04:16:05 +00:00
Michael Kifer
e756eb9faf new version 1997-07-31 04:04:23 +00:00
Michael Kifer
ddc90f39b0 new version 1997-05-31 01:10:39 +00:00
Michael Kifer
92c51e075e *** empty log message *** 1996-09-20 01:10:05 +00:00
Michael Kifer
52fa07baf5 *** empty log message *** 1996-06-22 03:20:38 +00:00
Michael Kifer
bbe6126cba *** empty log message *** 1996-06-22 01:54:34 +00:00
Richard M. Stallman
ab8a391eec (ediff-setup-fine-diff-regions): 
Use ediff-diff3-options or ediff-diff-options.
 1996-05-06 23:17:23 +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
9b82abcce5 (ediff-exec-process): Fix local var misspelling. 1996-01-04 23:14:33 +00:00
Michael Kifer
009650b3f9 Moved defsubsts up. 1995-10-14 03:14:11 +00:00
Michael Kifer
4ad42cb56d (ediff-setup-diff-regions,ediff-setup-diff-regions3, 
ediff-setup-fine-diff-regions): functions modified.
(ediff-shell-command,ediff-shell-command-sentinel,
ediff-shell-command-filter): deleted.
(ediff-exec-process,ediff-process-sentinel,ediff-process-filter): new.
 1995-10-06 00:54:28 +00:00
Karl Heuer
996f5f0e31 Changed window-system to ediff-window-display. 
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.
 1995-06-05 23:47:44 +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