1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-12 09:28:24 +00:00
Commit Graph

29 Commits

Author SHA1 Message Date
Michael Kifer
3af0304a61 *** empty log message *** 1999-11-01 07:16:15 +00:00
Stefan Monnier
767d12f23e Use make-temp-file. 1999-10-15 16:03:59 +00:00
Eli Zaretskii
daafb0e383 (ediff-make-temp-file): Run the prefix through
convert-standard-file-name, but leave the results of
make-temp-name unaltered.  For MS-DOS, truncate the prefix to 2
characters if the original name already exists, or has a special
handler.
1998-11-10 11:26:34 +00:00
Karl Heuer
4a08d192a7 (ediff-arrange-auto-save-in-merge-jobs): Renamed
from ediff-arrange-autosave-in-merge-jobs.  Callers changed.
1998-10-06 23:21:47 +00:00
Richard M. Stallman
138b07c857 (ediff-next-difference, ediff-previous-difference): Handle nil as arg. 1998-08-14 04:12:01 +00:00
Michael Kifer
2eb4bdca8a new version 1998-05-04 22:42:59 +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
28650cf112 new version 1997-09-11 16:08:19 +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
Richard M. Stallman
b1cba2ee77 (ediff-update-diffs): Change error message. 1997-07-24 21:39:26 +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
a7acbbe4d4 Comment fixes. 1996-01-05 22:21:28 +00:00
Richard M. Stallman
66182e61c6 Require ediff-mult. 1995-11-20 22:04:22 +00:00
Michael Kifer
009650b3f9 Moved defsubsts up. 1995-10-14 03:14:11 +00:00
Michael Kifer
651342bcb1 (ediff-toggle-read-only,ediff-read-file-name):
replaced abbreviate-file-name with ediff-abbreviate-file-name.
(ediff-documentation): bug fix.
(ediff-setup,ediff-really-quit): modified to work with Ediff session groups.
(ediff-quit,ediff-really-quit): now ask if the user wants to delete buffers.
1995-10-06 00:59:04 +00:00
Richard M. Stallman
c2bf3f2e59 (ediff-profile): Use make-local-hook and add and remove hooks locally. 1995-08-22 20:27:05 +00:00
Richard M. Stallman
ec3ea48827 (ediff-setup-keymap): Bind f1 and help like C-h. 1995-06-29 02:23:21 +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
d601f32599 (ediff-setup): Don't make default-minibuffer-frame
a buffer-local variable.
1995-05-29 06:27:18 +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