diff options
| -rw-r--r-- | lisp/ediff-init.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el index 3ed281f02f2..d5ac60b2a81 100644 --- a/lisp/ediff-init.el +++ b/lisp/ediff-init.el | |||
| @@ -534,7 +534,7 @@ See the documentation string of `ediff-focus-on-regexp-matches' for details.") | |||
| 534 | :group 'ediff) | 534 | :group 'ediff) |
| 535 | 535 | ||
| 536 | 536 | ||
| 537 | (ediff-defvar-local ediff-use-faces nil "") | 537 | (ediff-defvar-local ediff-use-faces t "") |
| 538 | (defcustom ediff-use-faces t | 538 | (defcustom ediff-use-faces t |
| 539 | "If t, differences are highlighted using faces, if device supports faces. | 539 | "If t, differences are highlighted using faces, if device supports faces. |
| 540 | If nil, differences are highlighted using ASCII flags, ediff-before-flag | 540 | If nil, differences are highlighted using ASCII flags, ediff-before-flag |
| @@ -578,7 +578,7 @@ meaning of this variable." | |||
| 578 | :type 'boolean | 578 | :type 'boolean |
| 579 | :group 'ediff) | 579 | :group 'ediff) |
| 580 | 580 | ||
| 581 | (ediff-defvar-local ediff-highlight-all-diffs nil "") | 581 | (ediff-defvar-local ediff-highlight-all-diffs t "") |
| 582 | (defcustom ediff-highlight-all-diffs t | 582 | (defcustom ediff-highlight-all-diffs t |
| 583 | "If nil, only the selected differences are highlighted. | 583 | "If nil, only the selected differences are highlighted. |
| 584 | Otherwise, all difference regions are highlighted, but the selected region is | 584 | Otherwise, all difference regions are highlighted, but the selected region is |