diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2000-11-24 08:15:11 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2000-11-24 08:15:11 +0000 |
| commit | 7d0278167b563513731e93c71d65463eadb6b89a (patch) | |
| tree | 2d16b74f5e7cc6768ffb80872d0f5d5443163eda /lisp/ediff-diff.el | |
| parent | 1862a24e48a6c85a9821c3a82441a5f5e3b94c69 (diff) | |
| download | emacs-7d0278167b563513731e93c71d65463eadb6b89a.tar.gz | |
* ediff-diff.el: Moved variables around to have it compile under NT.
* 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.
Diffstat (limited to 'lisp/ediff-diff.el')
| -rw-r--r-- | lisp/ediff-diff.el | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el index e6864bf02fe..1ba2b8df803 100644 --- a/lisp/ediff-diff.el +++ b/lisp/ediff-diff.el @@ -44,6 +44,18 @@ :prefix "ediff-" :group 'ediff) +;; these two must be here to prevent ediff-test-utility from barking +(defcustom ediff-diff-program "diff" + "*Program to use for generating the differential of the two files." + :type 'string + :group 'ediff-diff) +(defcustom ediff-diff3-program "diff3" + "*Program to be used for three-way comparison. +Must produce output compatible with Unix's diff3 program." + :type 'string + :group 'ediff-diff) + +;; The following functions must precede all defcustom-defined variables. ;; The following functions needed for setting diff/diff3 options ;; test if diff supports the --binary option @@ -108,10 +120,6 @@ ignore changes whose lines all match RE." :type '(repeat string) :group 'ediff-diff) -(defcustom ediff-diff-program "diff" - "*Program to use for generating the differential of the two files." - :type 'string - :group 'ediff-diff) (defcustom ediff-diff-options "" "*Options to pass to `ediff-diff-program'. If diff\(1\) is used as `ediff-diff-program', then the most useful options are @@ -135,11 +143,6 @@ This output is not used by Ediff internally." (defvar ediff-match-diff3-line "^====\\(.?\\)$" "Pattern to match lines produced by diff3 that describe differences.") -(defcustom ediff-diff3-program "diff3" - "*Program to be used for three-way comparison. -Must produce output compatible with Unix's diff3 program." - :type 'string - :group 'ediff-diff) (defcustom ediff-diff3-options "" "*Options to pass to `ediff-diff3-program'." :set 'ediff-reset-diff-options |