summaryrefslogtreecommitdiff
path: root/lisp/ediff-util.el
Commit message (Collapse)AuthorAgeFilesLines
* *** empty log message ***Michael Kifer1999-11-011-174/+291
|
* Use make-temp-file.Stefan Monnier1999-10-151-2/+2
|
* (ediff-make-temp-file): Run the prefix throughEli Zaretskii1998-11-101-10/+14
| | | | | | | 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.
* (ediff-arrange-auto-save-in-merge-jobs): RenamedKarl Heuer1998-10-061-2/+2
| | | | from ediff-arrange-autosave-in-merge-jobs. Callers changed.
* (ediff-next-difference, ediff-previous-difference): Handle nil as arg.Richard M. Stallman1998-08-141-2/+2
|
* new versionMichael Kifer1998-05-041-43/+47
|
* new versionMichael Kifer1997-11-011-15/+55
|
* new versionMichael Kifer1997-09-301-8/+12
|
* new versionMichael Kifer1997-09-111-4/+19
|
* new versionMichael Kifer1997-09-061-13/+29
|
* new versionMichael Kifer1997-07-311-137/+126
|
* (ediff-update-diffs): Change error message.Richard M. Stallman1997-07-241-1/+1
|
* new versionMichael Kifer1997-07-171-0/+9
|
* new versionMichael Kifer1997-05-311-117/+214
|
* *** empty log message ***Michael Kifer1996-12-281-41/+139
|
* *** empty log message ***Michael Kifer1996-09-201-190/+222
|
* *** empty log message ***Michael Kifer1996-06-221-93/+182
|
* *** empty log message ***Michael Kifer1996-02-161-281/+284
|
* Update FSF's address.Erik Naggum1996-01-141-4/+5
|
* Comment fixes.Karl Heuer1996-01-051-3/+3
|
* Require ediff-mult.Richard M. Stallman1995-11-201-1/+1
|
* Moved defsubsts up.Michael Kifer1995-10-141-8/+0
|
* (ediff-toggle-read-only,ediff-read-file-name):Michael Kifer1995-10-061-324/+608
| | | | | | | 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.
* (ediff-profile): Use make-local-hook and add and remove hooks locally.Richard M. Stallman1995-08-221-6/+6
|
* (ediff-setup-keymap): Bind f1 and help like C-h.Richard M. Stallman1995-06-291-0/+4
|
* Converted xemacs *screen* nomenclature to *frame*.Karl Heuer1995-06-051-658/+360
| | | | | Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
* (ediff-setup): Don't make default-minibuffer-frameKarl Heuer1995-05-291-5/+1
| | | | a buffer-local variable.
* Update copyright.Karl Heuer1995-04-071-1/+1
|
* Initial revisionKarl Heuer1995-03-161-0/+3398