1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-22 10:26:20 +00:00
Commit Graph

40 Commits

Author SHA1 Message Date
Dave Love
a21f0bd5b4 (ediff-region-help-echo): Bind face-help. 2000-07-24 09:44:02 +00:00
Dave Love
475de6f44d (ediff-region-help-echo): Modify to use overlay
now passed to the function.  It now works properly.
2000-07-21 19:42:57 +00:00
Dave Love
30729019be Fix last checkin. 2000-07-19 16:00:04 +00:00
Dave Love
50575ec215 (ediff-region-help-echo): Partially fix for Emacs implementation. 2000-07-19 15:56:50 +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
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
Eli Zaretskii
659cb92874 (ediff-temp-file-prefix): Use
small-temporary-file-directory if non-nil.
1999-09-02 12:33:53 +00:00
Karl Heuer
a09cfce720 (ediff-even-diff-face-A): Fix spelling. 1998-11-12 02:00:33 +00:00
Andreas Schwab
b2cd996123 (ediff-autostore-merges): Use `other' widget
type.
1998-06-24 08:58:07 +00:00
Richard M. Stallman
61d5c49207 (ediff-temp-file-prefix): Use temporary-file-directory. 1998-05-16 17:47:27 +00:00
Richard M. Stallman
4a37a5df9e (ediff-temp-file-prefix): Use system-tmp-directory. 1998-05-16 03:41:42 +00:00
Michael Kifer
d84b06effa *** empty log message *** 1998-05-06 19:54:57 +00:00
Michael Kifer
2eb4bdca8a new version 1998-05-04 22:42:59 +00:00
Andreas Schwab
0f94f94657 (ediff-autostore-merges): Doc fix. 1998-04-14 10:56: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
8e41a31c5d new version 1997-09-30 01:13:53 +00:00
Michael Kifer
985d0dad78 new version 1997-08-09 04:30:41 +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
Richard M. Stallman
cca9c6fcbb (ediff-eval-in-buffer): Add properties
such lisp-indent-function, lisp-indent-hook, edebug-form-spec.
1996-09-11 23:30:32 +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
Richard M. Stallman
36d57fa96f Make sure `facemenu-unlisted-faces' is bound. 1996-02-10 05:14:34 +00:00
Karl Heuer
d62af4649b (ediff-event-point, ediff-event-buffer): Fix error format string. 1996-01-29 23:12:01 +00:00
Erik Naggum
b578f267af Update FSF's address. 1996-01-14 07:34:30 +00:00
Karl Heuer
ceb0ea8ba6 (ediff-keep-variants): Doc fix. 1996-01-04 23:33:39 +00:00
Karl Heuer
2ff24a23f4 All faces added to facemenu-unlisted-faces list. 1995-11-10 18:58:59 +00:00
Michael Kifer
009650b3f9 Moved defsubsts up. 1995-10-14 03:14:11 +00:00
Michael Kifer
8343426b70 (ediff-abbreviate-file-name): function modified.
(ediff-truncate-string-left): new function.
(ediff-strip-last-dir,ediff-key-press-event-p,ediff-event-point,
ediff-event-buffer): new functions.
(ediff-frame-has-menubar,ediff-protect-meta-chars): functions deleted.
1995-10-06 00:55:57 +00:00
Richard M. Stallman
b35732e1e2 Delete the Emacs version error check. 1995-06-14 12:05:23 +00:00
Karl Heuer
41d25ad02e 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:43:51 +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