summaryrefslogtreecommitdiff
path: root/lisp/ediff-util.el
Commit message (Collapse)AuthorAgeFilesLines
* (ediff-file-checked-out-p, ediff-file-checked-in-p): Call vc-stateAndré Spiegel2000-11-221-2/+5
| | | | instead of vc-locking-user, which no longer exists.
* (ediff-status-info, ediff-debug-info): Put tempDave Love2000-11-101-9/+15
| | | | | buffer into fundamental mode. (ediff-set-difference): Use copy-sequence if available.
* 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>Michael Kifer2000-10-291-29/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* *** 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
View Lorry Controller Status