diff options
| author | Lute Kamstra | 2008-12-03 05:48:14 +0000 |
|---|---|---|
| committer | Lute Kamstra | 2008-12-03 05:48:14 +0000 |
| commit | 9201cc281b10650e96296eda8519403e2b508fbd (patch) | |
| tree | e86a6ba2b3d0044d996036ccf8430908dca34b26 /lisp/ediff-diff.el | |
| parent | 1b17adfd3b07d24b4665ff66fd1b1dcc05f6c823 (diff) | |
| download | emacs-9201cc281b10650e96296eda8519403e2b508fbd.tar.gz emacs-9201cc281b10650e96296eda8519403e2b508fbd.zip | |
* align.el:
* allout.el:
* apropos.el:
* arc-mode.el:
* autoinsert.el:
* avoid.el:
* battery.el:
* bookmark.el:
* buff-menu.el:
* calculator.el:
* chistory.el:
* cmuscheme.el:
* comint.el:
* compare-w.el:
* dabbrev.el:
* delim-col.el:
* desktop.el:
* diff-mode.el:
* diff.el:
* dired-aux.el:
* dired-x.el:
* dired.el:
* dos-vars.el:
* ediff-diff.el:
* ediff-help.el:
* ediff-init.el:
* ediff-merg.el:
* ediff-mult.el:
* ediff-ptch.el:
* ediff-vers.el:
* ediff-wind.el:
* ediff.el:
* emerge.el:
* facemenu.el:
* faces.el:
* ffap.el:
* filecache.el:
* find-dired.el:
* font-core.el:
* font-lock.el:
* forms.el:
* fringe.el:
* help-at-pt.el:
* hippie-exp.el:
* ido.el:
* image-file.el:
* imenu.el:
* indent.el:
* info.el:
* isearchb.el:
* iswitchb.el:
* jit-lock.el:
* jka-compr.el:
* log-edit.el:
* lpr.el:
* ls-lisp.el:
* man.el:
* menu-bar.el:
* midnight.el:
* mouse-sel.el:
* mouse.el:
* msb.el:
* outline.el:
* paren.el:
* pcmpl-cvs.el:
* pcmpl-gnu.el:
* pcomplete.el:
* pcvs-info.el:
* pcvs-parse.el:
* printing.el:
* ps-mule.el:
* ps-print.el:
* replace.el:
* ruler-mode.el:
* saveplace.el:
* sb-image.el:
* scroll-bar.el:
* sha1.el:
* shadowfile.el:
* shell.el:
* sort.el:
* speedbar.el:
* strokes.el:
* tempo.el:
* term.el:
* terminal.el:
* time-stamp.el:
* time.el:
* tree-widget.el:
* type-break.el:
* vc-cvs.el:
* vc-hg.el:
* vc-mcvs.el:
* vc-rcs.el:
* vc-sccs.el:
* vc.el:
* view.el:
* w32-vars.el:
* whitespace.el:
* wid-edit.el: Remove leading * from docstrings of defcustoms,
deffaces, defconsts and defuns.
Diffstat (limited to 'lisp/ediff-diff.el')
| -rw-r--r-- | lisp/ediff-diff.el | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el index 2dd34a9f512..a03bbe1a64d 100644 --- a/lisp/ediff-diff.el +++ b/lisp/ediff-diff.el | |||
| @@ -38,11 +38,11 @@ | |||
| 38 | :group 'ediff) | 38 | :group 'ediff) |
| 39 | 39 | ||
| 40 | (defcustom ediff-diff-program "diff" | 40 | (defcustom ediff-diff-program "diff" |
| 41 | "*Program to use for generating the differential of the two files." | 41 | "Program to use for generating the differential of the two files." |
| 42 | :type 'string | 42 | :type 'string |
| 43 | :group 'ediff-diff) | 43 | :group 'ediff-diff) |
| 44 | (defcustom ediff-diff3-program "diff3" | 44 | (defcustom ediff-diff3-program "diff3" |
| 45 | "*Program to be used for three-way comparison. | 45 | "Program to be used for three-way comparison. |
| 46 | Must produce output compatible with Unix's diff3 program." | 46 | Must produce output compatible with Unix's diff3 program." |
| 47 | :type 'string | 47 | :type 'string |
| 48 | :group 'ediff-diff) | 48 | :group 'ediff-diff) |
| @@ -57,7 +57,7 @@ Must produce output compatible with Unix's diff3 program." | |||
| 57 | ((memq system-type '(ms-dos windows-nt windows-95)) | 57 | ((memq system-type '(ms-dos windows-nt windows-95)) |
| 58 | shell-file-name) ; no standard name on MS-DOS | 58 | shell-file-name) ; no standard name on MS-DOS |
| 59 | (t "sh")) ; UNIX | 59 | (t "sh")) ; UNIX |
| 60 | "*The shell used to run diff and patch. | 60 | "The shell used to run diff and patch. |
| 61 | If user's .profile or .cshrc files are set up correctly, any shell | 61 | If user's .profile or .cshrc files are set up correctly, any shell |
| 62 | will do. However, some people set $prompt or other things | 62 | will do. However, some people set $prompt or other things |
| 63 | incorrectly, which leads to undesirable output messages. These may | 63 | incorrectly, which leads to undesirable output messages. These may |
| @@ -67,13 +67,13 @@ you are not using or, better, fix your shell's startup file." | |||
| 67 | :group 'ediff-diff) | 67 | :group 'ediff-diff) |
| 68 | 68 | ||
| 69 | (defcustom ediff-cmp-program "cmp" | 69 | (defcustom ediff-cmp-program "cmp" |
| 70 | "*Utility to use to determine if two files are identical. | 70 | "Utility to use to determine if two files are identical. |
| 71 | It must return code 0, if its arguments are identical files." | 71 | It must return code 0, if its arguments are identical files." |
| 72 | :type 'string | 72 | :type 'string |
| 73 | :group 'ediff-diff) | 73 | :group 'ediff-diff) |
| 74 | 74 | ||
| 75 | (defcustom ediff-cmp-options nil | 75 | (defcustom ediff-cmp-options nil |
| 76 | "*Options to pass to `ediff-cmp-program'. | 76 | "Options to pass to `ediff-cmp-program'. |
| 77 | If GNU diff is used as `ediff-cmp-program', then the most useful options | 77 | If GNU diff is used as `ediff-cmp-program', then the most useful options |
| 78 | are `-I REGEXP', to ignore changes whose lines match the REGEXP." | 78 | are `-I REGEXP', to ignore changes whose lines match the REGEXP." |
| 79 | :type '(repeat string) | 79 | :type '(repeat string) |
| @@ -85,7 +85,7 @@ are `-I REGEXP', to ignore changes whose lines match the REGEXP." | |||
| 85 | 85 | ||
| 86 | (defcustom ediff-diff-options | 86 | (defcustom ediff-diff-options |
| 87 | (if (memq system-type '(ms-dos windows-nt windows-95)) "--binary" "") | 87 | (if (memq system-type '(ms-dos windows-nt windows-95)) "--binary" "") |
| 88 | "*Options to pass to `ediff-diff-program'. | 88 | "Options to pass to `ediff-diff-program'. |
| 89 | If Unix diff is used as `ediff-diff-program', | 89 | If Unix diff is used as `ediff-diff-program', |
| 90 | then a useful option is `-w', to ignore space. | 90 | then a useful option is `-w', to ignore space. |
| 91 | Options `-c', `-u', and `-i' are not allowed. Case sensitivity can be | 91 | Options `-c', `-u', and `-i' are not allowed. Case sensitivity can be |
| @@ -107,12 +107,12 @@ This variable can be set either in .emacs or toggled interactively. | |||
| 107 | Use `setq-default' if setting it in .emacs") | 107 | Use `setq-default' if setting it in .emacs") |
| 108 | 108 | ||
| 109 | (defcustom ediff-ignore-case-option "-i" | 109 | (defcustom ediff-ignore-case-option "-i" |
| 110 | "*Option that causes the diff program to ignore case of letters." | 110 | "Option that causes the diff program to ignore case of letters." |
| 111 | :type 'string | 111 | :type 'string |
| 112 | :group 'ediff-diff) | 112 | :group 'ediff-diff) |
| 113 | 113 | ||
| 114 | (defcustom ediff-ignore-case-option3 "" | 114 | (defcustom ediff-ignore-case-option3 "" |
| 115 | "*Option that causes the diff3 program to ignore case of letters. | 115 | "Option that causes the diff3 program to ignore case of letters. |
| 116 | GNU diff3 doesn't have such an option." | 116 | GNU diff3 doesn't have such an option." |
| 117 | :type 'string | 117 | :type 'string |
| 118 | :group 'ediff-diff) | 118 | :group 'ediff-diff) |
| @@ -121,12 +121,12 @@ GNU diff3 doesn't have such an option." | |||
| 121 | (ediff-defvar-local ediff-actual-diff-options ediff-diff-options "") | 121 | (ediff-defvar-local ediff-actual-diff-options ediff-diff-options "") |
| 122 | 122 | ||
| 123 | (defcustom ediff-custom-diff-program ediff-diff-program | 123 | (defcustom ediff-custom-diff-program ediff-diff-program |
| 124 | "*Program to use for generating custom diff output for saving it in a file. | 124 | "Program to use for generating custom diff output for saving it in a file. |
| 125 | This output is not used by Ediff internally." | 125 | This output is not used by Ediff internally." |
| 126 | :type 'string | 126 | :type 'string |
| 127 | :group 'ediff-diff) | 127 | :group 'ediff-diff) |
| 128 | (defcustom ediff-custom-diff-options "-c" | 128 | (defcustom ediff-custom-diff-options "-c" |
| 129 | "*Options to pass to `ediff-custom-diff-program'." | 129 | "Options to pass to `ediff-custom-diff-program'." |
| 130 | :type 'string | 130 | :type 'string |
| 131 | :group 'ediff-diff) | 131 | :group 'ediff-diff) |
| 132 | 132 | ||
| @@ -135,7 +135,7 @@ This output is not used by Ediff internally." | |||
| 135 | (defvar ediff-match-diff3-line "^====\\(.?\\)\C-m?$" | 135 | (defvar ediff-match-diff3-line "^====\\(.?\\)\C-m?$" |
| 136 | "Pattern to match lines produced by diff3 that describe differences.") | 136 | "Pattern to match lines produced by diff3 that describe differences.") |
| 137 | (defcustom ediff-diff3-options "" | 137 | (defcustom ediff-diff3-options "" |
| 138 | "*Options to pass to `ediff-diff3-program'." | 138 | "Options to pass to `ediff-diff3-program'." |
| 139 | :set 'ediff-set-diff-options | 139 | :set 'ediff-set-diff-options |
| 140 | :type 'string | 140 | :type 'string |
| 141 | :group 'ediff-diff) | 141 | :group 'ediff-diff) |
| @@ -145,7 +145,7 @@ This output is not used by Ediff internally." | |||
| 145 | 145 | ||
| 146 | (defcustom ediff-diff3-ok-lines-regexp | 146 | (defcustom ediff-diff3-ok-lines-regexp |
| 147 | "^\\([1-3]:\\|====\\| \\|.*Warning *:\\|.*No newline\\|.*missing newline\\|^\C-m$\\)" | 147 | "^\\([1-3]:\\|====\\| \\|.*Warning *:\\|.*No newline\\|.*missing newline\\|^\C-m$\\)" |
| 148 | "*Regexp that matches normal output lines from `ediff-diff3-program'. | 148 | "Regexp that matches normal output lines from `ediff-diff3-program'. |
| 149 | Lines that do not match are assumed to be error messages." | 149 | Lines that do not match are assumed to be error messages." |
| 150 | :type 'regexp | 150 | :type 'regexp |
| 151 | :group 'ediff-diff) | 151 | :group 'ediff-diff) |