aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/ediff-mult.el
Commit message (Collapse)AuthorAgeFilesLines
* 2000-10-29 Michael Kifer <[email protected]>Michael Kifer2000-10-291-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* 2000-05-24 Michael Kifer <[email protected]>Michael Kifer2000-05-241-4/+4
| | | | | | | | | | | | | | * 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.
* *** empty log message ***Michael Kifer1999-11-251-110/+107
|
* *** empty log message ***Michael Kifer1999-11-011-146/+202
|
* (ediff-mark-for-hiding-at-pos)Karl Heuer1998-05-301-37/+104
| | | | | | | | | (ediff-mark-for-operation-at-pos): Renamed from ediff-mark-for-hiding, ediff-mark-for-operation. (ediff-mark-session-for-hiding, ediff-mark-session-for-operation) (ediff-unmark-all-for-operation, ediff-unmark-all-for-hiding): New functions. (ediff-setup-meta-map): Changed bindings.
* new versionMichael Kifer1997-11-251-4/+8
|
* new versionMichael Kifer1997-11-011-136/+379
|
* new versionMichael Kifer1997-09-061-27/+50
|
* new versionMichael Kifer1997-08-091-1/+1
|
* new versionMichael Kifer1997-07-311-27/+27
|
* new versionMichael Kifer1997-05-311-18/+48
|
* *** empty log message ***Michael Kifer1996-12-281-1/+12
|
* *** empty log message ***Michael Kifer1996-09-201-97/+185
|
* *** empty log message ***Michael Kifer1996-06-221-119/+319
|
* *** empty log message ***Michael Kifer1996-02-161-31/+37
|
* Update FSF's address.Erik Naggum1996-01-141-5/+9
|
* Comment fixes.Karl Heuer1996-01-051-2/+2
|
* (ediff-intersect-directories): Quote symbols starting with `:'.Richard M. Stallman1995-11-241-5/+5
|
* Renamed from ediff-meta.el. Changed provide.Richard M. Stallman1995-11-201-3/+3
|
* Moved defsubsts up.Michael Kifer1995-10-141-2/+2
|
* Initial revisionMichael Kifer1995-10-061-0/+1415