summaryrefslogtreecommitdiff
path: root/lisp/ediff-merg.el
Commit message (Collapse)AuthorAgeFilesLines
* Some fixes to follow coding conventions.Pavel Janík2001-07-161-1/+3
|
* (state-or-merge): Defvar when compiling.Dave Love2000-11-101-1/+2
|
* 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>Michael Kifer2000-10-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-251-44/+78
|
* *** empty log message ***Michael Kifer1999-11-011-18/+65
|
* new versionMichael Kifer1997-11-011-7/+0
|
* new versionMichael Kifer1997-09-301-0/+6
|
* new versionMichael Kifer1997-07-311-3/+3
|
* new versionMichael Kifer1997-07-171-0/+6
|
* new versionMichael Kifer1997-05-311-7/+33
|
* *** empty log message ***Michael Kifer1996-09-201-0/+6
|
* *** empty log message ***Michael Kifer1996-06-221-4/+6
|
* *** empty log message ***Michael Kifer1996-02-161-5/+7
|
* Update FSF's address.Erik Naggum1996-01-141-3/+6
|
* Comment fixes.Karl Heuer1996-01-051-1/+1
|
* Moved defsubsts up.Michael Kifer1995-10-141-8/+8
|
* *** empty log message ***Michael Kifer1995-10-061-1/+1
|
* Converted xemacs *screen* nomenclature to *frame*.Karl Heuer1995-06-091-34/+37
| | | | | Incorporated overlay strings. Ediff no longer runs under emacs 19.28 and earlier and XEmacs 19.11 and earlier.
* Update copyright.Karl Heuer1995-04-071-1/+1
|
* Initial revisionKarl Heuer1995-03-161-0/+259