Mercurial > emacs
comparison lisp/ediff-diff.el @ 90732:bc10a33dd40b
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 563-582)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 177-185)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-158
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Mon, 01 Jan 2007 03:21:06 +0000 |
| parents | f1d13e615070 2e5f946f7726 |
| children | 95d0cdf160ea |
comparison
equal
deleted
inserted
replaced
| 90731:a6c97c25a666 | 90732:bc10a33dd40b |
|---|---|
| 131 :group 'ediff-diff) | 131 :group 'ediff-diff) |
| 132 | 132 |
| 133 (defcustom ediff-diff-options "" | 133 (defcustom ediff-diff-options "" |
| 134 "*Options to pass to `ediff-diff-program'. | 134 "*Options to pass to `ediff-diff-program'. |
| 135 If Unix diff is used as `ediff-diff-program', | 135 If Unix diff is used as `ediff-diff-program', |
| 136 then a useful option is `-w', to ignore space. | 136 then a useful option is `-w', to ignore space. |
| 137 Options `-c' and `-i' are not allowed. Case sensitivity can be | 137 Options `-c', `-u', and `-i' are not allowed. Case sensitivity can be |
| 138 toggled interactively using \\[ediff-toggle-ignore-case]." | 138 toggled interactively using \\[ediff-toggle-ignore-case]. |
| 139 | |
| 140 This variable is not for customizing the look of the differences produced by | |
| 141 the command \\[ediff-show-diff-output]. Use the variable | |
| 142 `ediff-custom-diff-options' for that." | |
| 139 :set 'ediff-reset-diff-options | 143 :set 'ediff-reset-diff-options |
| 140 :type 'string | 144 :type 'string |
| 141 :group 'ediff-diff) | 145 :group 'ediff-diff) |
| 142 | 146 |
| 143 (ediff-defvar-local ediff-ignore-case nil | 147 (ediff-defvar-local ediff-ignore-case nil |
| 252 ;; File-C argument is not used here. It is there just because | 256 ;; File-C argument is not used here. It is there just because |
| 253 ;; ediff-setup-diff-regions is called via a funcall to | 257 ;; ediff-setup-diff-regions is called via a funcall to |
| 254 ;; ediff-setup-diff-regions-function, which can also have the value | 258 ;; ediff-setup-diff-regions-function, which can also have the value |
| 255 ;; ediff-setup-diff-regions3, which takes 4 arguments. | 259 ;; ediff-setup-diff-regions3, which takes 4 arguments. |
| 256 (defun ediff-setup-diff-regions (file-A file-B file-C) | 260 (defun ediff-setup-diff-regions (file-A file-B file-C) |
| 257 ;; looking for '-c', '-i', or a 'c', 'i' among clustered non-long options | 261 ;; looking for '-c', '-i', '-u', or 'c', 'i', 'u' among clustered non-long options |
| 258 (if (string-match "^-[ci]\\| -[ci]\\|\\(^\\| \\)-[^- ]+[ci]" | 262 (if (string-match "^-[ciu]\\| -[ciu]\\|\\(^\\| \\)-[^- ]+[ciu]" |
| 259 ediff-diff-options) | 263 ediff-diff-options) |
| 260 (error "Options `-c' and `-i' are not allowed in `ediff-diff-options'")) | 264 (error "Options `-c', `-u', and `-i' are not allowed in `ediff-diff-options'")) |
| 261 | 265 |
| 262 ;; create, if it doesn't exist | 266 ;; create, if it doesn't exist |
| 263 (or (ediff-buffer-live-p ediff-diff-buffer) | 267 (or (ediff-buffer-live-p ediff-diff-buffer) |
| 264 (setq ediff-diff-buffer | 268 (setq ediff-diff-buffer |
| 265 (get-buffer-create (ediff-unique-buffer-name "*ediff-diff" "*")))) | 269 (get-buffer-create (ediff-unique-buffer-name "*ediff-diff" "*")))) |