From 130cd70d9bea68099e9748af59fe812c248ca1f5 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Mon, 7 Feb 2022 01:38:41 +0100 Subject: [PATCH] Improve the ediff-diff-options documentation * lisp/vc/ediff-diff.el (ediff-diff-options): * doc/misc/ediff.texi (Patch and Diff Programs): Note that setting this variable directly is probably the wrong thing to do (bug#6512). --- doc/misc/ediff.texi | 3 ++- lisp/vc/ediff-diff.el | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi index d81ba158a19..39b09b29b3f 100644 --- a/doc/misc/ediff.texi +++ b/doc/misc/ediff.texi @@ -1866,7 +1866,8 @@ These variables specify the options to pass to the above utilities. In @code{ediff-diff-options}, it may be useful to specify options such as @samp{-w} that ignore certain kinds of changes. However, Ediff does not let you use the option @samp{-c}, as it doesn't recognize this -format yet. +format yet. (If you alter this variable, it should be done via the +Customize interface instead of using @code{setq} directly.) @item ediff-coding-system-for-read @vindex ediff-coding-system-for-read diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el index ca56a2851db..07b853817d1 100644 --- a/lisp/vc/ediff-diff.el +++ b/lisp/vc/ediff-diff.el @@ -85,7 +85,10 @@ options after the default ones. This variable is not for customizing the look of the differences produced by the command \\[ediff-show-diff-output]. Use the variable -`ediff-custom-diff-options' for that." +`ediff-custom-diff-options' for that. + +Setting this variable directly may not yield the expected +results. It should be set via the Customize interface instead." :set #'ediff-set-diff-options :type 'string) -- 2.39.5