diff options
| -rw-r--r-- | lisp/ediff-diff.el | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el index 013ed9073db..57456367522 100644 --- a/lisp/ediff-diff.el +++ b/lisp/ediff-diff.el | |||
| @@ -128,10 +128,10 @@ are `-I REGEXP', to ignore changes whose lines match the REGEXP." | |||
| 128 | 128 | ||
| 129 | (defcustom ediff-diff-options "" | 129 | (defcustom ediff-diff-options "" |
| 130 | "*Options to pass to `ediff-diff-program'. | 130 | "*Options to pass to `ediff-diff-program'. |
| 131 | If Unix diff is used as `ediff-diff-program', then a useful option is | 131 | If Unix diff is used as `ediff-diff-program', |
| 132 | `-w', to ignore space, and `-i', to ignore case of letters. | 132 | then a useful option is `-w', to ignore space. |
| 133 | Options `-c' and `-i' are not allowed. Case sensitivity can be toggled | 133 | Options `-c' and `-i' are not allowed. Case sensitivity can be |
| 134 | interactively using [ediff-toggle-ignore-case]" | 134 | toggled interactively using \\[ediff-toggle-ignore-case]." |
| 135 | :set 'ediff-reset-diff-options | 135 | :set 'ediff-reset-diff-options |
| 136 | :type 'string | 136 | :type 'string |
| 137 | :group 'ediff-diff) | 137 | :group 'ediff-diff) |
| @@ -399,7 +399,7 @@ one optional arguments, diff-number to refine.") | |||
| 399 | (c-prev-pt nil) | 399 | (c-prev-pt nil) |
| 400 | diff-list shift-A shift-B | 400 | diff-list shift-A shift-B |
| 401 | ) | 401 | ) |
| 402 | 402 | ||
| 403 | ;; diff list contains word numbers, unless changed later | 403 | ;; diff list contains word numbers, unless changed later |
| 404 | (setq diff-list (cons (if word-mode 'words 'points) | 404 | (setq diff-list (cons (if word-mode 'words 'points) |
| 405 | diff-list)) | 405 | diff-list)) |
| @@ -411,7 +411,7 @@ one optional arguments, diff-number to refine.") | |||
| 411 | shift-B | 411 | shift-B |
| 412 | (ediff-overlay-start | 412 | (ediff-overlay-start |
| 413 | (ediff-get-value-according-to-buffer-type 'B bounds)))) | 413 | (ediff-get-value-according-to-buffer-type 'B bounds)))) |
| 414 | 414 | ||
| 415 | ;; reset point in buffers A/B/C | 415 | ;; reset point in buffers A/B/C |
| 416 | (ediff-with-current-buffer A-buffer | 416 | (ediff-with-current-buffer A-buffer |
| 417 | (goto-char (if shift-A shift-A (point-min)))) | 417 | (goto-char (if shift-A shift-A (point-min)))) |
| @@ -1525,7 +1525,7 @@ affects only files whose names match the expression." | |||
| 1525 | (ediff-barf-if-not-control-buffer) | 1525 | (ediff-barf-if-not-control-buffer) |
| 1526 | (setq ediff-ignore-case (not ediff-ignore-case)) | 1526 | (setq ediff-ignore-case (not ediff-ignore-case)) |
| 1527 | (cond (ediff-ignore-case | 1527 | (cond (ediff-ignore-case |
| 1528 | (setq ediff-actual-diff-options | 1528 | (setq ediff-actual-diff-options |
| 1529 | (concat ediff-diff-options " " ediff-ignore-case-option) | 1529 | (concat ediff-diff-options " " ediff-ignore-case-option) |
| 1530 | ediff-actual-diff3-options | 1530 | ediff-actual-diff3-options |
| 1531 | (concat ediff-diff3-options " " ediff-ignore-case-option3)) | 1531 | (concat ediff-diff3-options " " ediff-ignore-case-option3)) |