summaryrefslogtreecommitdiff
path: root/lisp/ediff-diff.el
Commit message (Collapse)AuthorAgeFilesLines
* 2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>Michael Kifer2001-03-171-11/+16
| | | | | | | | | | | | | | | | | | | | | | | | | * ediff-util.el: Copyright years. (ediff-choose-syntax-table): New function. (ediff-setup): Use ediff-choose-syntax-table. * ediff-init.el (ediff-with-syntax-table): New macro, uses with-syntax-table. * ediff.el: Date of last update, copyright years. * ediff-wind (ediff-setup-control-frame): Nill->nil. * viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy of Scott Bronson. (ex-cmd-assoc,ex-cmd-one-letr): New functions. (viper-check-sub,viper-get-ex-command,viper-execute-ex-command): Deleted functions. (viper-get-ex-com-subr,viper-ex,ex-mark): Changed to use the new ex-token-list. * viper-util.el: Spaces, indentation. * viper.el: Changed version, modification time.
* 2001-02-12 Michael Kifer <kifer@cs.sunysb.edu>Michael Kifer2001-02-121-14/+12
| | | | | | | | | | | | * ediff-diff.el (ediff-make-diff2-buffer): Removed bogus checks for remote files. (ediff-coding-system-for-read): replaced the no-conversion default with raw-text. * ediff-init.el: Removed :version from defcustom vars. * ediff-util.el (ediff-compute-custom-diffs-maybe): Better handling of the diff mode * ediff.texi: Added ediff-coding-system-for-read. * viper.texi: typos
* * ediff-diff.el: Moved variables around to have it compile under NT.Michael Kifer2000-11-241-9/+12
| | | | | | | | | | | | | | | | | | | | | * ediff-help.el (ediff-use-long-help-message): made it customizable. * ediff-init.el (ediff-abbrev-jobname): use capitalize. * ediff-wind.el (ediff-skip-unsuitable-frames): deleted the redundant skip-small-frames test. * viper-cmd.el (viper-change-state-to-vi): disable overwrite mode. (viper-downgrade-to-insert): protect against errors in hooks. * viper-init.el (viper-vi-state-hook,viper-insert-state-hook, viper-replace-state-hook,viper-emacs-state-hook): do cursor handling. (viper-restore-cursor-type,viper-set-insert-cursor-type): new functions. * viper-util.el (viper-memq-char): bug fixes * viper.el (viper-mode): fix cursor handling.
* 2000-07-05 Michael Kifer <kifer@cs.sunysb.edu>Michael Kifer2000-07-061-3/+10
| | | | | | | | | | | * ediff-diff.el (ediff-wordify): use syntax table. * ediff-init.el (ediff-has-face-support-p): use ediff-color-display-p. (ediff-color-display-p): use display-color-p, changed to defun from defsubst. Got rid of special cases for NeXT and OS/2. * ediff-wind.el (ediff-setup-control-frame): set proper modeline face.
* 2000-06-05 Michael Kifer <kifer@cs.sunysb.edu>Michael Kifer2000-06-051-0/+2
| | | | | | | | | | * ediff-init.el (ediff-has-face-support-p): make it paint faces on tty's. * ediff-diff.el (ediff-exec-process): use --binary for fine differences whenever apropriate. * viper-cmd.el (viper-smart-suffix-list): rearranged list members. * viper.el (find-file,find-file-other-window): get viper to do wildcards.
* 2000-05-25 Michael Kifer <kifer@cs.sunysb.edu>Michael Kifer2000-05-251-0/+3
| | | | | * ediff-diff.el (ediff-exec-process): delete --binary option from non-buffer ediff jobs.
* 2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>Michael Kifer2000-05-241-6/+45
| | | | | | | | | | | | | | * 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-13/+17
|
* *** empty log message ***Michael Kifer1999-11-011-26/+38
|
* Comment fix.Karl Heuer1999-06-221-1/+1
|
* new versionMichael Kifer1998-05-041-1/+1
|
* (ediff-exec-process): store-match-data => set-match-data.Richard M. Stallman1998-03-141-1/+1
|
* new versionMichael Kifer1997-11-251-3/+13
|
* new versionMichael Kifer1997-11-011-0/+10
|
* new versionMichael Kifer1997-09-061-11/+3
|
* new versionMichael Kifer1997-07-311-45/+46
|
* new versionMichael Kifer1997-05-311-30/+73
|
* *** empty log message ***Michael Kifer1996-09-201-24/+39
|
* *** empty log message ***Michael Kifer1996-06-221-3/+2
|
* *** empty log message ***Michael Kifer1996-06-221-38/+64
|
* (ediff-setup-fine-diff-regions):Richard M. Stallman1996-05-061-1/+3
| | | | Use ediff-diff3-options or ediff-diff-options.
* *** empty log message ***Michael Kifer1996-02-161-28/+29
|
* Update FSF's address.Erik Naggum1996-01-141-5/+7
|
* (ediff-exec-process): Fix local var misspelling.Karl Heuer1996-01-041-4/+4
|
* Moved defsubsts up.Michael Kifer1995-10-141-4/+0
|
* (ediff-setup-diff-regions,ediff-setup-diff-regions3,Michael Kifer1995-10-061-199/+213
| | | | | | | ediff-setup-fine-diff-regions): functions modified. (ediff-shell-command,ediff-shell-command-sentinel, ediff-shell-command-filter): deleted. (ediff-exec-process,ediff-process-sentinel,ediff-process-filter): new.
* Changed window-system to ediff-window-display.Karl Heuer1995-06-051-10/+11
| | | | | | 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.
* Update copyright.Karl Heuer1995-04-071-1/+1
|
* Initial revisionKarl Heuer1995-03-161-0/+1154
View Lorry Controller Status